Author: thomas.diesler(a)jboss.com Date: 2006-11-01 12:58:33 -0500 (Wed, 01 Nov 2006) New Revision: 1339 Added: trunk/src/main/resources/jbossws.deployer/META-INF/deployer-beans.xml Removed: trunk/src/main/etc/jbossws14-component-info.xml trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml trunk/src/main/resources/jbossws14.sar/ trunk/src/main/resources/org/ Modified: trunk/build.xml trunk/src/ant/build-thirdparty.xml trunk/version.properties Log: remove retro stuff Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-01 10:08:06 UTC (rev 1338) +++ trunk/build.xml 2006-11-01 17:58:33 UTC (rev 1339) @@ -258,20 +258,6 @@ </fileset> </jar> - <!-- Build jbossws.beans --> - <mkdir dir="${build.lib.dir}/jbossws.beans/META-INF"/> - <copy todir="${build.lib.dir}/jbossws.beans/META-INF" file="${build.resources.dir}/jbossws.beans/META-INF/jboss-beans.xml"/> - - <!-- Build jbossws.deployer --> - <mkdir dir="${build.lib.dir}/jbossws.deployer/META-INF"/> - <copy todir="${build.lib.dir}/jbossws.deployer/META-INF" file="${build.resources.dir}/jbossws.deployer/META-INF/jbossws-deployer-beans.xml"/> - <copy todir="${build.lib.dir}/jbossws.deployer"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss-integration.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - </copy> - <!-- Build jbossws-client.jar --> <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes.dir}"> @@ -349,133 +335,14 @@ <include name="META-INF/standard-jaxws-endpoint-config.xml"/> <include name="META-INF/jboss-service.xml"/> </fileset> - </jar> - - </target> - - <target name="module-jars14" depends="jbossretro"> - - <!-- Build jboss-jaxws14.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - </fileset> - </jar> - - <!-- Build jbossws14-core.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> - </fileset> <fileset dir="${build.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> + <include name="jbossws.beans/META-INF/jboss-beans.xml"/> + <include name="jbossws.deployer/META-INF/deployer-beans.xml"/> </fileset> </jar> - <!-- Build jbossws14-jboss-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss/**"/> - </fileset> - </jar> - - <!-- Build jbossws14-tomcat-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws14-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="org/jboss/ws/integration/tomcat/**"/> - </fileset> - </jar> - - <!-- Build jbossws14-client.jar --> - <jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/**"/> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/jboss/**"/> - <exclude name="org/jboss/ws/integration/tomcat/**"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - </fileset> - <fileset dir="${build.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <fileset dir="${build.etc.dir}"> - <include name="wstools.sh"/> - <include name="wstools.bat"/> - <include name="wstools-log4j.xml"/> - </fileset> - </jar> - - <!-- Build jbossws14.sar --> - <jar jarfile="${build.lib.dir}/jbossws14.sar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws14-jboss-integration.jar"/> - <include name="jbossws14-core.jar"/> - <include name="jbossws-context.war"/> - <include name="jboss-jaxws14.jar"/> - <include name="jbossws.beans/**"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws14.sar"> - <include name="META-INF/jboss-service.xml"/> - </fileset> - </jar> - </target> - <!-- - Retrotranslation - --> - <target name="jbossretro" depends="compile"> - - <!-- Weave the build.classes to build.classes14 --> - <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro"> - <classpath> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jbossretro.jar"/> - </classpath> - </taskdef> - - <mkdir dir="${build.classes14.dir}"/> - - <retro destdir="${build.classes14.dir}"> - <classpath> - <pathelement location="${build.lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${build.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jbossretro.jar"/> - <pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement path="${build.classes.dir}"/> - </classpath> - <classpath refid="core.classpath"/> - <classpath refid="integration.classpath"/> - <src path="${build.classes.dir}"/> - </retro> - - <copy todir="${build.classes14.dir}"> - <fileset dir="${build.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - </copy> - </target> - <!-- ================================================================== --> <!-- Documentation --> <!-- ================================================================== --> @@ -508,31 +375,11 @@ </antcall> </target> - <!-- Deploy jbossws14 to the server --> - <target name="module-jars14-assert" unless="jboss.jdk14.home"> - <echo>ERROR: 'jboss.jdk14.home' is not set. </echo> - <echo>Make sure to point it to your jboss configuration thagt should run under jdk 1.4</echo> - </target> - - <target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home"> - <antcall target="deploy-to-server"> - <param name="jboss.deploy.home" value="${jboss.jdk14.home}"/> - <param name="jbossws" value="jbossws14"/> - </antcall> - <antcall target="deploy-to-thirdparty"> - <param name="jboss.deploy.home" value="${jboss.jdk14.home}"/> - <param name="jbossws" value="jbossws14"/> - </antcall> - </target> - <!-- Deploy to jboss --> <target name="deploy-to-server"> <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws.deployer/**"/> - </copy> <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/> <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/> <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/> @@ -588,8 +435,7 @@ <!-- Deploy jbossws to the server specified like this: -Dserver=default --> <target name="release" depends="all" description="Release to jboss.local.repository"> - - <!-- jbossws --> + <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> <mkdir dir="${jbossws.dir}/lib"/> <copy todir="${jbossws.dir}/lib" overwrite="true"> @@ -606,24 +452,6 @@ <filtersfile file="version.properties"/> </filterset> </copy> - - <!-- jbossws14 --> - <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> - <mkdir dir="${jbossws14.dir}/lib"/> - <copy todir="${jbossws14.dir}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> </target> <!-- ================================================================== --> @@ -640,7 +468,7 @@ <target name="most" description="Builds almost everything." depends="jars"/> <target name="all" description="Create a distribution zip file" - depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist"> + depends="main,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist"> </target> <!-- Build the documentation --> @@ -690,11 +518,6 @@ <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> </copy> - <!-- lib/jdk1.4 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/> - </copy> - <!-- lib/tomcat --> <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> <fileset dir="${thirdparty.dir}"> Modified: trunk/src/ant/build-thirdparty.xml =================================================================== --- trunk/src/ant/build-thirdparty.xml 2006-11-01 10:08:06 UTC (rev 1338) +++ trunk/src/ant/build-thirdparty.xml 2006-11-01 17:58:33 UTC (rev 1339) @@ -34,14 +34,12 @@ <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> Deleted: trunk/src/main/etc/jbossws14-component-info.xml =================================================================== --- trunk/src/main/etc/jbossws14-component-info.xml 2006-11-01 10:08:06 UTC (rev 1338) +++ trunk/src/main/etc/jbossws14-component-info.xml 2006-11-01 17:58:33 UTC (rev 1339) @@ -1,43 +0,0 @@ -<project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws14" - licenseType="lgpl" - version=&quot;@repository.id(a)&quot; - description="JBossWS an implementation of J2EE Web Services"> - - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - <artifact id="jbossws14-client.jar"/> - <artifact id="jbossws14.sar"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting@"/> - </import> - <import componentref="jboss/jbossretro"> - <compatible version="@jboss-jbossretro@"/> - </import> - - <export> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - <include input="jbossws14-client.jar"/> - <include input="jbossws14.sar"/> - </export> - - </component> - -</project> Copied: trunk/src/main/resources/jbossws.deployer/META-INF/deployer-beans.xml (from rev 1335, trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml) Deleted: trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2006-11-01 10:08:06 UTC (rev 1338) +++ trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2006-11-01 17:58:33 UTC (rev 1339) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <bean name="WebServiceDeployerEJB3" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB3"> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>EJBRegistrationDeployer</depends> - <depends>WarDeployer</depends> - </bean> - -</deployment> \ No newline at end of file Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-11-01 10:08:06 UTC (rev 1338) +++ trunk/version.properties 2006-11-01 17:58:33 UTC (rev 1339) @@ -29,7 +29,6 @@ apache-xerces=2.7.1 hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA -jboss-jbossretro=1.0.2.GA jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4