Skip to content
Browse files

MODE-872 - Fixed the AS7 distribution across the integration and asse…

…mbly profiles
  • Loading branch information...
1 parent f302d07 commit 60d5f334e30ac443147ee8d750cea2da979cbb57 @hchiorean hchiorean committed Jun 14, 2012
View
24 deploy/jbossas/kit/jboss-as7/modules/org/modeshape/main/module.xml
@@ -29,18 +29,18 @@
<resource-root path="modeshape-schematic-${project.version}.jar" />
<resource-root path="modeshape-jbossas-subsystem-${project.version}.jar" />
<!-- Include all of the built-in sequencers -->
- <resource-root path="modeshape-sequencer-ddl-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-images-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-java-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-mp3-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-msoffice-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-sramp-${project.version}-module-with-dependencies.jar" />
- <!--resource-root path="modeshape-sequencer-teiid-${project.version}-module-with-dependencies.jar" /-->
- <resource-root path="modeshape-sequencer-text-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-wsdl-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-xml-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-xsd-${project.version}-module-with-dependencies.jar" />
- <resource-root path="modeshape-sequencer-zip-${project.version}-module-with-dependencies.jar" />
+ <resource-root path="modeshape-sequencer-ddl-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-images-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-java-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-mp3-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-msoffice-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-sramp-${project.version}.jar" />
+ <!--resource-root path="modeshape-sequencer-teiid-${project.version}.jar" /-->
+ <resource-root path="modeshape-sequencer-text-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-wsdl-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-xml-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-xsd-${project.version}.jar" />
+ <resource-root path="modeshape-sequencer-zip-${project.version}.jar" />
</resources>
<dependencies>
View
22 modeshape-assembly-descriptors/src/main/resources/assemblies/jbossas7-distribution.xml
@@ -54,7 +54,7 @@
<dependencySet>
<outputDirectory>modules/org/modeshape/jcr/api/main</outputDirectory>
<includes>
- <include>org.modeshape:modeshape-jcr-api</include>
+ <include>org.modeshape:modeshape-jcr-api:jar</include>
</includes>
<excludes>
<exclude>*:*:*:component-with-dependencies</exclude>
@@ -66,18 +66,16 @@
<dependencySet>
<outputDirectory>modules/org/modeshape/main</outputDirectory>
<includes>
- <include>org.modeshape:modeshape-jcr</include>
- <include>org.modeshape:modeshape-common</include>
- <include>org.modeshape:modeshape-schematic</include>
- <include>org.modeshape:modeshape-jbossas-subsystem</include>
+ <include>org.modeshape:modeshape-jcr:jar</include>
+ <include>org.modeshape:modeshape-common:jar</include>
+ <include>org.modeshape:modeshape-schematic:jar</include>
+ <include>org.modeshape:modeshape-jbossas-subsystem:jar</include>
<!-- Include the Sequencer JARs (with dependencies) for all the built-in sequencers -->
- <include>org.modeshape:modeshape-sequencer-*:*:module-with-dependencies</include>
+ <include>org.modeshape:modeshape-sequencer-*:jar</include>
</includes>
<excludes>
- <exclude>*:*:*:tests</exclude>
- <exclude>org.modeshape:modeshape-jcr:*:component-with-dependencies</exclude>
- <exclude>org.modeshape:modeshape-common:*:component-with-dependencies</exclude>
- <exclude>org.modeshape:modeshape-schematic:*:component-with-dependencies</exclude>
+ <exclude>*:*:*:component-with-dependencies</exclude>
+ <exclude>*:*:*:module-with-dependencies</exclude>
</excludes>
<unpack>false</unpack>
</dependencySet>
@@ -113,10 +111,10 @@
<dependencySet>
<outputDirectory>modules/org/modeshape/jdbc/main</outputDirectory>
<includes>
- <include>org.modeshape:modeshape-jdbc-local:*:</include>
+ <include>org.modeshape:modeshape-jdbc-local:jar</include>
</includes>
<excludes>
- <exclude>*:*:*:tests</exclude>
+ <exclude>*:*:*:module-with-dependencies</exclude>
</excludes>
<unpack>false</unpack>
</dependencySet>
View
279 modeshape-distribution/pom.xml
@@ -19,166 +19,100 @@
<groupId>org.modeshape</groupId>
<artifactId>modeshape-common</artifactId>
<version>${project.version}</version>
- <classifier>component-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-jcr-api</artifactId>
<version>${project.version}</version>
- <classifier>component-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-schematic</artifactId>
- <classifier>component-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-jcr</artifactId>
- <classifier>component-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-images</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-unit-test</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-mp3</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-java</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-msoffice</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<!--<dependency>-->
- <!--<groupId>org.modeshape</groupId>-->
- <!--<artifactId>modeshape-sequencer-teiid</artifactId>-->
- <!--<classifier>module-with-dependencies</classifier>-->
- <!--<version>${project.version}</version>-->
+ <!--<groupId>org.modeshape</groupId>-->
+ <!--<artifactId>modeshape-sequencer-teiid</artifactId>-->
+ <!--<version>${project.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-text</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-xml</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-xsd</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-wsdl</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-sramp</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-zip</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-ddl</artifactId>
- <classifier>module-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
- <artifactId>modeshape-web-jcr</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-web-jcr-rest</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-web-jcr-rest-client</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.modeshape</groupId>-->
- <!--<artifactId>modeshape-web-jcr-webdav</artifactId>-->
- <!--<classifier>module-with-dependencies</classifier>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.modeshape</groupId>
<artifactId>modeshape-jdbc-local</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-jdbc</artifactId>
- <classifier>module-with-dependencies</classifier>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-jdbc</artifactId>
- <classifier>jar-with-dependencies</classifier>
<version>${project.version}</version>
</dependency>
@@ -187,23 +121,6 @@
<artifactId>modeshape-jbossas-subsystem</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.modeshape.demo</groupId>
- <artifactId>modeshape-sequencers-demo</artifactId>
- <classifier>example-with-dependencies</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>org.modeshape.demo</groupId>
- <artifactId>modeshape-embedded-repo-demo</artifactId>
- <classifier>example-with-dependencies</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
-
</dependencies>
<profiles>
@@ -212,6 +129,196 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-common</artifactId>
+ <version>${project.version}</version>
+ <classifier>component-with-dependencies</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jcr-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>component-with-dependencies</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-schematic</artifactId>
+ <classifier>component-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jcr</artifactId>
+ <classifier>component-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-images</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-unit-test</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-mp3</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-java</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-msoffice</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!--<dependency>-->
+ <!--<groupId>org.modeshape</groupId>-->
+ <!--<artifactId>modeshape-sequencer-teiid</artifactId>-->
+ <!--<classifier>module-with-dependencies</classifier>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-text</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-xml</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-xsd</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-wsdl</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-sramp</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-zip</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-sequencer-ddl</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-web-jcr</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-web-jcr-rest</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-web-jcr-rest-client</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!--<dependency>-->
+ <!--<groupId>org.modeshape</groupId>-->
+ <!--<artifactId>modeshape-web-jcr-webdav</artifactId>-->
+ <!--<classifier>module-with-dependencies</classifier>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jdbc-local</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jdbc</artifactId>
+ <classifier>module-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jdbc</artifactId>
+ <classifier>jar-with-dependencies</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape</groupId>
+ <artifactId>modeshape-jbossas-subsystem</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape.demo</groupId>
+ <artifactId>modeshape-sequencers-demo</artifactId>
+ <classifier>example-with-dependencies</classifier>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.modeshape.demo</groupId>
+ <artifactId>modeshape-embedded-repo-demo</artifactId>
+ <classifier>example-with-dependencies</classifier>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>

0 comments on commit 60d5f33

Please sign in to comment.
Something went wrong with that request. Please try again.