[jbossws-commits] JBossWS SVN: r15795 - in stack/native/trunk/modules: dist/src/main/scripts and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 05:59:10 -0500 (Thu, 01 Mar 2012) New Revision: 15795 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Fix assembly plugin configuration to avoid picking the same jbossws-native-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/dist/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -63,6 +63,13 @@ </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> @@ -107,6 +114,7 @@ <scope>provided</scope> </dependency> + <!-- Container integrations --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -35,7 +35,6 @@ <include>org.jboss.ws.native:jbossws-native-client</include> <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> - <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>javax.jws:jsr181-api:jar</include> @@ -69,9 +68,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss701:jar</include> - <include>org.jboss.ws:jbossws-jboss702:jar</include> - <include>org.jboss.ws:jbossws-jboss710:jar</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -84,7 +81,7 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -95,25 +92,13 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/resources/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -41,13 +41,6 @@ <id>all</id> <goals><goal>jar</goal></goals> <phase>package</phase> - <configuration> - <excludes> - <exclude>**/jbossws-jboss701/**</exclude> - <exclude>**/jbossws-jboss702/**</exclude> - <exclude>**/jbossws-jboss710/**</exclude> - </excludes> - </configuration> </execution> <execution> <id>jboss701</id> @@ -76,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss711</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss711</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -160,7 +160,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-native-resources.jar"/> + <include name=&quot;**/jbossws-native-resources-(a){jbossid}.jar&quot;/&gt; <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy>