Author: thomas.diesler(a)jboss.com Date: 2007-07-12 10:28:16 -0400 (Thu, 12 Jul 2007) New Revision: 3858 Removed: branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native50.deployer/ Modified: branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml branches/tdiesler/trunk/integration/native/build.xml Log: Move deployer to integration-jboss50 Modified: branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml 2007-07-12 14:24:20 UTC (rev 3857) +++ branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml 2007-07-12 14:28:16 UTC (rev 3858) @@ -62,9 +62,6 @@ <!-- SERVER JARS --> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -73,7 +70,7 @@ </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){stacklibs}/jbossws-native50-deployer.zip&quot;/&gt; + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){jbosslibs}/jbossws-jboss50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -116,7 +113,6 @@ <!-- SERVER JARS --> <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss50.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> Modified: branches/tdiesler/trunk/integration/native/build.xml =================================================================== --- branches/tdiesler/trunk/integration/native/build.xml 2007-07-12 14:24:20 UTC (rev 3857) +++ branches/tdiesler/trunk/integration/native/build.xml 2007-07-12 14:28:16 UTC (rev 3858) @@ -135,6 +135,7 @@ <!-- [JBAS-4379] MC beans deployed twice because of jacc service --> <fileset dir="${native.output.lib.dir}"> <include name="jbossws-context.war/**"/> + <include name="jbossws-native.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jbossws-core.jar"/> @@ -153,15 +154,6 @@ </metainf> </jar> - <!-- Build jbossws-native50.deployer --> - <zip zipfile="${native.output.lib.dir}/jbossws-native50-deployer.zip"> - <fileset dir="${native.output.lib.dir}"> - <include name="jbossws-native.jar"/> - </fileset> - <fileset dir="${native.resources.dir}/jbossws-native50.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> </target> <target name="jars-jboss42" depends="jars-common" if="jboss42.home">