Author: thomas.diesler(a)jboss.com Date: 2008-04-29 09:42:32 -0400 (Tue, 29 Apr 2008) New Revision: 6750 Added: stack/metro/branches/tdiesler/trunk/modules/wsit/ stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml stack/metro/branches/tdiesler/trunk/modules/wsit/src/ stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/ stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/ stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml Modified: stack/metro/branches/tdiesler/trunk/ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml stack/metro/branches/tdiesler/trunk/modules/server/pom.xml stack/metro/branches/tdiesler/trunk/pom.xml stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Property changes on: stack/metro/branches/tdiesler/trunk ___________________________________________________________________ Name: svn:ignore - .settings target ant.properties + .settings target ant.properties target.properties Modified: stack/metro/branches/tdiesler/trunk/modules/client/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 12:49:18 UTC (rev 6749) +++ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -31,7 +31,31 @@ <!-- Metro dependencies --> <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </dependency> + <dependency> <groupId>com.sun.xml.ws</groupId> + <artifactId>http</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-local-transport</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr173_api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> </dependency> <dependency> @@ -39,9 +63,29 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>txnannprocessor</artifactId> </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmldsig</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmlsec</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xws-security</artifactId> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + </dependency> + <dependency> + <groupId>woodstox</groupId> + <artifactId>wstx-lgpl</artifactId> + </dependency> <!-- jboss provided --> <dependency> Modified: stack/metro/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 12:49:18 UTC (rev 6749) +++ stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -52,13 +52,61 @@ <!-- Metro dependencies --> <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </dependency> + <dependency> <groupId>com.sun.xml.ws</groupId> + <artifactId>http</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-local-transport</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr173_api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-tools</artifactId> </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>txnannprocessor</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmldsig</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmlsec</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xws-security</artifactId> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + </dependency> + <dependency> + <groupId>woodstox</groupId> + <artifactId>wstx-lgpl</artifactId> + </dependency> <!-- jboss provided --> <dependency> Property changes on: stack/metro/branches/tdiesler/trunk/modules/wsit ___________________________________________________________________ Name: svn:ignore + target Added: stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml (rev 0) +++ stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -0,0 +1,51 @@ +<project 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Stack Metro WSIT</name> + <artifactId>jbossws-metro-wsit</artifactId> + <packaging>pom</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-metro</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>wsit-rt</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>wsit-tools</artifactId> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-wsit-rt.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Property changes on: stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml (rev 0) +++ stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -0,0 +1,21 @@ +<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>wsit-rt</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:wsit-rt:jar</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> \ No newline at end of file Property changes on: stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 12:49:18 UTC (rev 6749) +++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -112,7 +112,10 @@ <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <juddi.service.version>1.2.0.GA</juddi.service.version> + <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> + <sun.wsit.version>1.1</sun.wsit.version> + <woodstox.version>3.1.1</woodstox.version> </properties> <!-- DependencyManagement --> @@ -218,12 +221,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -232,17 +229,85 @@ <!-- Metro dependencies --> <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + <version>${sun.fastinfoset.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.ws</groupId> + <artifactId>http</artifactId> + <version>${sun.jaxws.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-local-transport</artifactId> + <version>${sun.jaxws.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr173_api</artifactId> + <version>${sun.jaxws.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr181-api</artifactId> + <version>${sun.jaxws.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jsr250-api</artifactId> + <version>${sun.jaxws.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> <version>${sun.jaxws.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-tools</artifactId> <version>${sun.jaxws.version}</version> - <scope>provided</scope> </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>wsit-rt</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>wsit-tools</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>txnannprocessor</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmldsig</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xmlsec</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.wsit</groupId> + <artifactId>xws-security</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>${jaxrpc.api.version}</version> + </dependency> + <dependency> + <groupId>woodstox</groupId> + <artifactId>wstx-lgpl</artifactId> + <version>${woodstox.version}</version> + </dependency> <!-- jboss provided --> <dependency> Modified: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 12:49:18 UTC (rev 6749) +++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -26,10 +26,6 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-metro-client.jar"/> - <include name="**/jbossws-spi.jar"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> @@ -38,6 +34,10 @@ <include name="**/jaxws-api.jar"/> <include name="**/jboss-wsit-rt.jar"/> <include name="**/jboss-wsit-tools.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-spi.jar"/> <include name="**/streambuffer.jar"/> <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> @@ -83,7 +83,7 @@ <include name="**/jaxws-tools.jar"/> <include name="**/jboss-wsit-rt.jar"/> <include name="**/jboss-wsit-tools.jar"/> - <include name="**/jbossws-metro.jar"/> + <include name="**/jbossws-metro-server.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/jsr173_api.jar"/> <include name="**/jsr250-api.jar"/> @@ -108,12 +108,12 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/bin"> <patternset refid="jbossws.bin.patternset"/> </fileset> </copy> @@ -155,49 +155,6 @@ </macrodef> <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -255,6 +212,7 @@ <macrodef name="macro-deploy-jbossws-server-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -269,65 +227,104 @@ <!-- Deploy JBossWS Service --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-metro42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="resourcesdir"/> + <macrodef name="macro-deploy-jbossws-sar42"> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> <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-context.war&quot;&gt; - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-context.war"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> - <fileset dir="@{thirdpartydir}"> - <include name=&quot;**/jbossws-(a){jbossid}-beans.xml&quot;/&gt; + <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> </fileset> </copy> - <move file=&quot;@{targetdir}/jbossws.beans/META-INF/jbossws-(a){jbossid}-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir=&quot;@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-metro50-sar"> - <attribute name="thirdpartydir"/> + <macrodef name="macro-deploy-jbossws-sar50"> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> </fileset> </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-context.war"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name=&quot;**/jbossws-(a){jbossid}-beans.xml&quot;/&gt; + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> </fileset> </copy> </sequential> </macrodef> + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> @@ -336,22 +333,21 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" - jbossid="${jbossid}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> Modified: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 12:49:18 UTC (rev 6749) +++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 13:42:32 UTC (rev 6750) @@ -69,15 +69,13 @@ <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>*:jaxws-api:jar</include> - <include>*:jboss-wsit-rt:jar</include> - <include>*:jboss-wsit-tools:jar</include> - <include>*:streambuffer:jar</include> - <include>*:stax-api:jar</include> - <include>*:stax-ex:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> <include>*:jsr181-api:jar</include> <include>*:jsr173_api:jar</include> <include>*:jsr250-api:jar</include> @@ -87,16 +85,22 @@ <include>*:sjsxp:jar</include> <include>*:stax-api:jar</include> <include>*:stax-ex:jar</include> - <include>*:stax-utils:jar</include> + <!--include>*:stax-utils:jar</include--> <include>*:streambuffer:jar</include> <include>*:txnannprocessor:jar</include> <include>*:wsdl4j:jar</include> - <include>*:wstx:jar</include> <include>*:xmldsig:jar</include> <include>*:xmlsec:jar</include> <include>*:xws-security:jar</include> </includes> </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-lgpl:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>