Author: alessio.soldano(a)jboss.com Date: 2012-03-01 05:20:52 -0500 (Thu, 01 Mar 2012) New Revision: 15794 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Fix assembly plugin configuration to avoid picking the same jbossws-cxf-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -52,6 +52,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -136,6 +143,7 @@ <scope>provided</scope> </dependency> + <!-- Container integrations --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -30,7 +30,10 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws.cxf:*</include> + <include>org.jboss.ws.cxf:jbossws-cxf-client:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include> <include>org.jboss.com.sun.httpserver:httpserver:jar</include> <include>org.apache.cxf:cxf-*</include> @@ -79,53 +82,39 @@ <include>org.opensaml:xmltooling:jar</include> <include>joda-time:joda-time: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.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${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-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> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </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> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -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/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -138,7 +138,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-cxf-resources.jar"/> + <include name=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt; <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy>