Author: thomas.diesler(a)jboss.com Date: 2008-04-25 07:31:30 -0400 (Fri, 25 Apr 2008) New Revision: 6694 Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml stack/native/trunk/build.xml stack/native/trunk/version.properties Log: Add AS500 integration Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 11:28:45 UTC (rev 6693) +++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 11:31:30 UTC (rev 6694) @@ -34,8 +34,10 @@ <include name="jbossws-jboss421.jar"/> <include name="jbossws-jboss422.jar"/> <include name="jbossws-jboss423.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-jboss50-container.jar"/> + <include name="jbossws-jboss500.jar"/> + <include name="jbossws-jboss501.jar"/> + <include name="jbossws-jboss500-container.jar"/> + <include name="jbossws-jboss501-container.jar"/> <include name="juddi-service.sar"/> </fileset> <fileset dir="${core.output.lib.dir}"> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 11:28:45 UTC (rev 6693) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 11:31:30 UTC (rev 6694) @@ -74,10 +74,14 @@ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423.jar" dest="${thirdparty.dir}/jbossws-jboss423.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-src.jar" dest="${thirdparty.dir}/jbossws-jboss423-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-resources.zip" dest="${thirdparty.dir}/jbossws-jboss423-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500.jar" dest="${thirdparty.dir}/jbossws-jboss500.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-container.jar" dest="${thirdparty.dir}/jbossws-jboss500-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-src.jar" dest="${thirdparty.dir}/jbossws-jboss500-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss500/${jbossws-jboss500}/lib/jbossws-jboss500-resources.zip" dest="${thirdparty.dir}/jbossws-jboss500-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501.jar" dest="${thirdparty.dir}/jbossws-jboss501.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-container.jar" dest="${thirdparty.dir}/jbossws-jboss501-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-src.jar" dest="${thirdparty.dir}/jbossws-jboss501-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss501/${jbossws-jboss501}/lib/jbossws-jboss501-resources.zip" dest="${thirdparty.dir}/jbossws-jboss501-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 11:28:45 UTC (rev 6693) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 11:31:30 UTC (rev 6694) @@ -143,13 +143,14 @@ <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="**/jbossws-jboss50.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> @@ -167,11 +168,12 @@ <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="**/jbossws-jboss50-container.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; </fileset> </copy> </sequential> @@ -334,8 +336,8 @@ <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-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/> + <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-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-04-25 11:28:45 UTC (rev 6693) +++ stack/native/trunk/build.xml 2008-04-25 11:31:30 UTC (rev 6694) @@ -216,10 +216,20 @@ <target name="compile50-resources"> - <unzip dest="${core.output.resources.dir}" src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip"/> + <unzip dest="${core.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/> + <unzip dest="${core.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/> + <!-- Concat jbossws-jboss500-beans.xml --> + <concat destfile="${core.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + <!-- Concat jbossws-jboss501-beans.xml --> - <concat destfile="${core.output.resources.dir}/jbossws-jboss501-beans.xml"> + <concat destfile="${core.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-04-25 11:28:45 UTC (rev 6693) +++ stack/native/trunk/version.properties 2008-04-25 11:31:30 UTC (rev 6694) @@ -30,7 +30,8 @@ jbossws-jboss422=3.0.0-SNAPSHOT jbossws-jboss423=3.0.0-SNAPSHOT -jbossws-jboss501=5.0.1.DEV +jbossws-jboss500=3.0.0-SNAPSHOT +jbossws-jboss501=3.0.0-SNAPSHOT # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR7