Author: richard.opalka(a)jboss.com Date: 2008-11-14 01:28:05 -0500 (Fri, 14 Nov 2008) New Revision: 8730 Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2399] enforce full control over the jars that will be published to deploy-artifacts dir Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 18:38:02 UTC (rev 8729) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 06:28:05 UTC (rev 8730) @@ -1,12 +1,12 @@ <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - + <id>deploy-artifacts</id> <formats> <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - + <moduleSets> <moduleSet> <includes> @@ -22,40 +22,40 @@ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:FastInfoset:jar</include> - <include>*:http:jar</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxrpc-api:jar</include> - <include>*:jaxws-api:jar</include> - <include>*:jaxws-local-transport:jar</include> - <include>*:jaxws-rt:jar</include> - <include>*:jaxws-tools:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jsr181-api:jar</include> - <include>*:jsr250-api:jar</include> - <include>*:mimepull:jar</include> - <include>*:policy:jar</include> - <include>*:resolver:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> - <include>*:stax-api:jar</include> - <include>*:stax-ex:jar</include> - <include>*:streambuffer:jar</include> - <include>*:txnannprocessor:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xmlsec:jar</include> - <include>*:xws-security:jar</include> - <include>*:junit:jar</include> + <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> + <include>com.sun.xml.ws:http:jar</include> + <include>javax.xml.bind:jaxb-api:jar</include> + <include>com.sun.xml.bind:jaxb-impl:jar</include> + <include>com.sun.xml.bind:jaxb-xjc:jar</include> + <include>javax.xml:jaxrpc-api:jar</include> + <include>javax.xml.ws:jaxws-api:jar</include> + <include>com.sun.xml.ws:jaxws-local-transport:jar</include> + <include>com.sun.xml.ws:jaxws-rt:jar</include> + <include>com.sun.xml.ws:jaxws-tools:jar</include> + <include>com.sun.xml.ws:policy:jar</include> + <include>org.jboss.ws:jbossws-common:jar</include> + <include>org.jboss.ws:jbossws-spi:jar</include> + <include>javax.jws:jsr181-api:jar</include> + <include>javax.annotation:jsr250-api:jar</include> + <include>org.jvnet:mimepull:jar</include> + <include>com.sun.org.apache.xml.internal:resolver:jar</include> + <include>javax.xml.soap:saaj-api:jar</include> + <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> + <include>stax:stax-api:jar</include> + <include>org.jvnet.staxex:stax-ex:jar</include> + <include>com.sun.xml.stream.buffer:streambuffer:jar</include> + <include>com.sun.xml.wsit:txnannprocessor:jar</include> + <include>com.sun.xml.wsit:xmlsec:jar</include> + <include>com.sun.xml.wsit:xws-security:jar</include> + <include>wsdl4j:wsdl4j:jar</include> + <include>junit:junit:jar</include> </includes> </dependencySet> <dependencySet> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:wstx-lgpl:jar</include> + <include>org.codehaus.woodstox:wstx-lgpl:jar</include> </includes> </dependencySet> </dependencySets> @@ -70,7 +70,7 @@ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> - <dependencySets> + <dependencySets> <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> @@ -78,12 +78,12 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss422:jar</include> - <include>*:jbossws-jboss423:jar</include> - <include>*:juddi-service:sar</include> - <include>*:scout:jar</include> - <include>*:juddi:jar</include> + <include>org.jboss.ws:jbossws-framework:jar</include> + <include>org.jboss.ws:jbossws-jboss422:jar</include> + <include>org.jboss.ws:jbossws-jboss423:jar</include> + <include>org.jboss.jaxr:juddi-service:sar</include> + <include>apache-scout:scout:jar</include> + <include>juddi:juddi:jar</include> </includes> </dependencySet> <dependencySet> @@ -93,7 +93,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss424x:jar</include> + <include>org.jboss.ws:jbossws-jboss424x:jar</include> </includes> </dependencySet> <!-- JBWS-2263 --> @@ -105,7 +105,7 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500CR2:jar</include> + <include>org.jboss.ws:jbossws-jboss500CR2:jar</include> </includes> </dependencySet> <dependencySet> @@ -115,19 +115,19 @@ <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss500x:jar</include> + <include>org.jboss.ws:jbossws-jboss500x:jar</include> </includes> </dependencySet> <!-- END --> </dependencySets> </binaries> </moduleSet> - <!-- + <!-- Does not work with maven-2.0.9 - This should include the output from module wsit + This should include the output from module wsit <moduleSet> <includes> - <include>*:jbossws-metro-wsit:jar:*</include> + <include>org.jboss.ws.metro:jbossws-metro-wsit:jar:*</include> </includes> <binaries> <outputDirectory>lib</outputDirectory> @@ -137,7 +137,7 @@ </binaries> </moduleSet--> </moduleSets> - + <fileSets> <!-- bin --> <fileSet> @@ -149,7 +149,7 @@ </includes> </fileSet> - <!-- resources --> + <!-- resources --> <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> @@ -158,7 +158,7 @@ </includes> </fileSet> </fileSets> - + <!-- This should be a moduleSet - see above --> <files> <file>