Author: thomas.diesler(a)jboss.com Date: 2008-04-30 18:29:11 -0400 (Wed, 30 Apr 2008) New Revision: 6824 Added: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml Removed: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-config/ Modified: stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT-sources.jar stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Copied: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-client-config.xml (from rev 6822, stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-config/standard-jaxrpc-client-config.xml) =================================================================== --- stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-client-config.xml (rev 0) +++ stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + + <client-config> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + +</jaxrpc-config> \ No newline at end of file Copied: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml (from rev 6822, stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-config/standard-jaxrpc-endpoint-config.xml) =================================================================== --- stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml (rev 0) +++ stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + +</jaxrpc-config> \ No newline at end of file Copied: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml (from rev 6822, stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-config/standard-jaxws-client-config.xml) =================================================================== --- stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml (rev 0) +++ stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + <property> + <property-name>http://org.jboss.ws/http#chunksize</property-name> + <property-value>2048</property-value> + </property> + </client-config> + + <client-config> + <config-name>HTTP 1.0 Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard SOAP 1.2 WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Copied: stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml (from rev 6822, stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-config/standard-jaxws-endpoint-config.xml) =================================================================== --- stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml (rev 0) +++ stack/native/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + </endpoint-config> + + <!-- + Generates message part names 'parameters' in WSDL for document/literal/wapped. + See: [JBWS-771] Use part names that are friendly to .NET + --> + <endpoint-config> + <config-name>.NET friendly Endpoint</config-name> + <feature>http://org.jboss.ws/binding/wsdl/dotnet</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard SOAP 1.2 WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Modified: stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Modified: stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-30 22:09:00 UTC (rev 6823) +++ stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -79,7 +79,6 @@ <patternset id="jbossws.service.lib.patternset"> <include name="**/FastInfoset.jar"/> <include name="**/jboss-jaxb-intros.jar"/> - <include name="**/jbossws-native-client.jar"/> <include name="**/jbossws-native-core.jar"/> <include name="**/jettison.jar"/> <include name="**/policy.jar"/> @@ -92,12 +91,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> @@ -239,6 +238,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"> @@ -253,71 +253,107 @@ <!-- Deploy JBossWS Service --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-native42-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" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <copy todir="@{targetdir}" flatten="true"> + <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; 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-native-management.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true" overwrite="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="@{thirdpartydir}"> - <include name="**/standard-jaxrpc-*-config.xml"/> - <include name="**/standard-jaxws-*-config.xml"/> + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; + <fileset dir="@{artifactsdir}/resources"> + <include name="standard-*-config.xml"/> </fileset> - <fileset dir=&quot;@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-native50-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-native-management.war&quot; overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> <include name="**/jbossws-native-management.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/standard-jaxrpc-*-config.xml"/> - <include name="**/standard-jaxws-*-config.xml"/> - <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 --> <!-- ================================================================== --> @@ -326,22 +362,21 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-native42" 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-native42-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-native50" 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-native50-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/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-30 22:09:00 UTC (rev 6823) +++ stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-30 22:29:11 UTC (rev 6824) @@ -131,7 +131,7 @@ <!-- resources --> <fileSet> - <directory>modules/client/src/main/resources</directory> + <directory>modules/client/src/main/resources/META-INF</directory> <outputDirectory>resources</outputDirectory> <includes> <include>standard-jaxrpc-*-config.xml</include>