Author: alessio.soldano(a)jboss.com Date: 2008-11-06 10:19:44 -0500 (Thu, 06 Nov 2008) New Revision: 8665 Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf Modified: stack/native/trunk/build.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2383] Fixing deploy/undeploy macros to use common server lib on AS5 trunk Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/build.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -26,6 +26,7 @@ <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-06 15:19:44 UTC (rev 8665) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -362,7 +362,7 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed"> + <target name="deploy-jbossws-native500" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> @@ -372,6 +372,16 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native501" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client50 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}" jbossid="${jbossid}"/> <!-- Please note the ".." to use common server lib! --> + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -522,7 +522,7 @@ <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -96,9 +96,9 @@ <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <target name="deploy-structure-jboss500" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native50" inheritall="false"> + <antcall target="deploy-jbossws-native500" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -107,6 +107,17 @@ <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> + <target name="deploy-structure-jboss501" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native501" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> + <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== --> @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -138,7 +149,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -148,7 +159,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> <!-- Using AS5 default deploy.conf --> </target> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -49,7 +49,7 @@ <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.lib" value="${jboss501.home}/server/lib"/> <!-- Using AS5 common server lib --> <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/distro/build.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -22,6 +22,7 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 14:53:22 UTC (rev 8664) +++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-11-06 15:19:44 UTC (rev 8665) @@ -39,6 +39,7 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> + <include>jbossws-as5-default-deploy.conf</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes>