Author: richard.opalka(a)jboss.com Date: 2008-11-13 11:14:11 -0500 (Thu, 13 Nov 2008) New Revision: 8725 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/src/main/distro/build-project-gen.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2376] rollback Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -24,28 +24,28 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> - <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> - <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> - <include name="**/sun-jaxws/lib/jaxws-api.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> - <include name="**/com/sun/xml/ws/lib/policy.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> - <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-tools.jar"/> + <include name="**/jaxws-rt.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/policy.jar"/> + <include name="**/streambuffer.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/stax-ex.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -53,47 +53,52 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/jboss-jaxrpc.jar"/> + <include name="**/jboss-jaxws.jar"/> + <include name="**/jboss-jaxws-ext.jar"/> + <include name="**/jboss-saaj.jar"/> + <include name="**/jaxb-api.jar"/> </patternset> <patternset id="jbossws.server.lib.patternset"> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> - <include name="**/sun-jaxws/lib/jaxws-api.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/stax-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> - <include name="**/com/sun/xml/fastinfoset/lib/FastInfoset.jar"/> - <include name="**/com/sun/xml/ws/lib/http.jar"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> - <include name="**/javax/xml/lib/jaxrpc-api.jar"/> - <include name="**/com/sun/xml/ws/lib/jaxws-local-transport.jar"/> - <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> - <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-server.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/annotation/lib/jsr250-api.jar"/> - <include name="**/com/sun/xml/ws/lib/policy.jar"/> - <include name="**/org/jvnet/staxex/lib/mimepull.jar"/> - <include name="**/com/sun/org/apache/xml/internal/lib/resolver.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> - <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> - <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> - <include name="**/com/sun/xml/wsit/lib/txnannprocessor.jar"/> - <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> - <include name="**/com/sun/xml/wsit/lib/xmlsec.jar"/> - <include name="**/com/sun/xml/wsit/lib/xws-security.jar"/> + <include name="**/FastInfoset.jar"/> + <include name="**/http.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-local-transport.jar"/> + <include name="**/jaxws-rt.jar"/> + <include name="**/jaxws-tools.jar"/> + <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-metro-server.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/jsr250-api.jar"/> + <include name="**/mimepull.jar"/> + <include name="**/policy.jar"/> + <include name="**/resolver.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/stax-ex.jar"/> + <include name="**/stax-utils.jar"/> + <include name="**/streambuffer.jar"/> + <include name="**/txnannprocessor.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xmlsec.jar"/> + <include name="**/xws-security.jar"/> </patternset> <!-- ================================================================== --> @@ -138,10 +143,10 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.lib.patternset"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> </fileset> </copy> </sequential> @@ -177,7 +182,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <include name=&quot;**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar&quot;/&gt; + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> @@ -194,7 +199,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- JBWS-2263 --> <!-- START --> - <include name=&quot;**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar&quot;/&gt; + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; <!-- END --> </fileset> </copy> @@ -214,7 +219,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> - <include name=&quot;**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar&quot;/&gt; + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> @@ -245,13 +250,13 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/jaxr/lib/juddi-service.sar"/> + <include name="**/juddi-service.sar"/> </fileset> </unzip> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/juddi/lib/juddi.jar"/> - <include name="**/apache-scout/lib/scout.jar"/> + <include name="**/juddi.jar"/> + <include name="**/scout.jar"/> </fileset> </copy> </sequential> @@ -271,15 +276,15 @@ <copy todir="@{targetdir}" flatten="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> </fileset> </copy> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; @@ -302,7 +307,7 @@ <mkdir dir="@{targetdir}"/> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> </sequential> @@ -331,11 +336,11 @@ </copy> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> <!-- JBWS-2263 --> <!-- START --> - <include name=&quot;**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar&quot;/&gt; + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; <!-- END --> </fileset> </copy> Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -22,7 +22,7 @@ </filterset> <path id="jbws-ant.path"> - <pathelement location="${jboss.client}/jbossws-common.jar" /> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> </path> <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -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> @@ -14,201 +14,50 @@ <include>org.jboss.ws.metro:jbossws-metro-server</include> </includes> <binaries> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> - <outputDirectory>lib/com/sun/xml/wsit/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> <includes> - <include>*:txnannprocessor:jar</include> - <include>*:xmlsec:jar</include> - <include>*:xws-security:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/org/apache/xml/internal/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:resolver:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/stream/buffer/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:streambuffer:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/jws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jsr181-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/annotation/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jsr250-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/xml/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jaxrpc-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/messaging/saaj/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:saaj-impl:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/xml/soap/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:policy:jar</include> - <include>*:http:jar</include> - <include>*:jaxws-local-transport:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/junit/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:junit:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/ibm-wsdl4j/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:wsdl4j:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/fastinfoset/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:FastInfoset:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/sun-jaxws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> + <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> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/stax-api/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> + <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> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/org/jvnet/staxex/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:stax-ex:jar</include> - <include>*:mimepull: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> </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-spi:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/woodstox/lib</outputDirectory> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> <includes> <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib/sun-jaxb/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - </includes> - </dependencySet> </dependencySets> </binaries> </moduleSet> @@ -217,55 +66,28 @@ <include>org.jboss.ws.metro:jbossws-metro-management</include> </includes> <binaries> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> - <dependencySets> + <dependencySets> <dependencySet> - <outputDirectory>lib/org/jboss/jaxr/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <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> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/apache-scout/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:scout:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/juddi/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:juddi:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss422:jar</include> - <include>*:jbossws-jboss423:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -277,7 +99,7 @@ <!-- JBWS-2263 --> <!-- START --> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -287,7 +109,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -300,8 +122,22 @@ </dependencySets> </binaries> </moduleSet> + <!-- + Does not work with maven-2.0.9 + This should include the output from module wsit + <moduleSet> + <includes> + <include>*:jbossws-metro-wsit:jar:*</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}-${module.classifier}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet--> </moduleSets> - + <fileSets> <!-- bin --> <fileSet> @@ -309,11 +145,12 @@ <outputDirectory>bin</outputDirectory> <includes> <include>wsconsume.*</include> - <include>wsprovide.*</include> + <include>wsprovide.*</include> </includes> </fileSet> - <!-- resources --> - <fileSet> + + <!-- resources --> + <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes> @@ -321,18 +158,18 @@ </includes> </fileSet> </fileSets> - + + <!-- This should be a moduleSet - see above --> <files> <file> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source> <destName>jbossws-metro-wsit-rt.jar</destName> </file> <file> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source> <destName>jbossws-metro-wsit-tools.jar</destName> </file> </files> - </assembly>