Author: thomas.diesler(a)jboss.com Date: 2007-03-24 19:07:59 -0400 (Sat, 24 Mar 2007) New Revision: 2679 Added: branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss40.xml branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss42.xml branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss50.xml branches/jbossws-1.2.1/build/etc/component-info/jbossws.xml branches/jbossws-1.2.1/build/etc/component-info/jbossws14.xml Removed: branches/jbossws-1.2.1/build/etc/component-info/integration-jboss40.xml branches/jbossws-1.2.1/build/etc/component-info/integration-jboss42.xml branches/jbossws-1.2.1/build/etc/component-info/integration-jboss50.xml branches/jbossws-1.2.1/build/etc/component-info/jbossws-core.xml Modified: branches/jbossws-1.2.1/build/ant-import/build-release.xml branches/jbossws-1.2.1/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.1/build/version.properties branches/jbossws-1.2.1/integration-jboss40/build.xml Log: Fix release-to-repository Modified: branches/jbossws-1.2.1/build/ant-import/build-release.xml =================================================================== --- branches/jbossws-1.2.1/build/ant-import/build-release.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/ant-import/build-release.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -45,11 +45,6 @@ <!-- jboss/jbossws --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> - <delete> - <fileset dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> - <fileset dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> - </delete> <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-integration.jar"/> @@ -60,37 +55,71 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-core.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> <!-- jboss/jbossws-jboss50 --> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws50.sar"/> <include name="jbossws50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/integration-jboss50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> <!-- jboss/jbossws-jboss42 --> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/integration-jboss42.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss42.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> + <!-- jboss/jbossws-jboss40 --> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss40.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + + <!-- jbossws14 --> + <mkdir dir="${jboss.repository.dir}/jbossws14/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws14/${repository.id}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws14/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws14.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> <!-- Release to portal content --> Modified: branches/jbossws-1.2.1/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.1/build/ant-import/build-thirdparty.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/ant-import/build-thirdparty.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -54,7 +54,7 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.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/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.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}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.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"/> Deleted: branches/jbossws-1.2.1/build/etc/component-info/integration-jboss40.xml =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/integration-jboss40.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/etc/component-info/integration-jboss40.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -1,28 +0,0 @@ -<project name="jboss/jbossws-jboss40"> - - <component id="jboss/jbossws-jboss40" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws40.sar"/> - - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss40@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer-jboss40@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss40@"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: branches/jbossws-1.2.1/build/etc/component-info/integration-jboss42.xml =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/integration-jboss42.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/etc/component-info/integration-jboss42.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-jboss42"> - - <component id="jboss/jbossws-jboss42" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws42.sar"/> - - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss42@"/> - <compatible version="@jboss-jbossxb-jboss42@-brew"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer-jboss42@"/> - <compatible version="@jboss-microcontainer-jboss42@-brew"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss42@"/> - <compatible version="@jboss-remoting-jboss42@-brew"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: branches/jbossws-1.2.1/build/etc/component-info/integration-jboss50.xml =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/integration-jboss50.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/etc/component-info/integration-jboss50.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -1,29 +0,0 @@ -<project name="jboss/jbossws-jboss50"> - - <component id="jboss/jbossws-jboss50" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@-jboss50"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@-jboss50"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting@-jboss50"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: branches/jbossws-1.2.1/build/etc/component-info/jbossws-core.xml =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws-core.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws-core.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -1,47 +0,0 @@ -<project name="jboss/jbossws"> - - <component id="jboss/jbossws" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-integration.jar"/> - <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - <compatible version="@apache-xmlsec@-brew"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - <compatible version="@ibm-wsdl4j@-brew"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="stax-api"> - <compatible version="@stax-api@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-integration.jar"/> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> Copied: branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss40.xml (from rev 2673, branches/jbossws-1.2.1/build/etc/component-info/integration-jboss40.xml) =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss40.xml (rev 0) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss40.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -0,0 +1,28 @@ +<project name="jboss/jbossws-jboss40"> + + <component id="jboss/jbossws-jboss40" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws40.sar"/> + + <import componentref="jboss/jbossws"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb-jboss40@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer-jboss40@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss40@"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss42.xml (from rev 2673, branches/jbossws-1.2.1/build/etc/component-info/integration-jboss42.xml) =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss42.xml (rev 0) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss42.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-jboss42"> + + <component id="jboss/jbossws-jboss42" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws42.sar"/> + + <import componentref="jboss/jbossws"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb-jboss42@"/> + <compatible version="@jboss-jbossxb-jboss42@-brew"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer-jboss42@"/> + <compatible version="@jboss-microcontainer-jboss42@-brew"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss42@"/> + <compatible version="@jboss-remoting-jboss42@-brew"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss50.xml (from rev 2676, branches/jbossws-1.2.1/build/etc/component-info/integration-jboss50.xml) =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss50.xml (rev 0) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws-jboss50.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -0,0 +1,29 @@ +<project name="jboss/jbossws-jboss50"> + + <component id="jboss/jbossws-jboss50" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws50.sar"/> + <artifact id="jbossws50-deployer.zip"/> + + <import componentref="jboss/jbossws"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@-jboss50"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@-jboss50"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting@-jboss50"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: branches/jbossws-1.2.1/build/etc/component-info/jbossws.xml (from rev 2672, branches/jbossws-1.2.1/build/etc/component-info/jbossws-core.xml) =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws.xml (rev 0) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -0,0 +1,50 @@ +<project name="jboss/jbossws"> + + <component id="jboss/jbossws" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-integration.jar"/> + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + <compatible version="@apache-xmlsec@-brew"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + <compatible version="@ibm-wsdl4j@-brew"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + <compatible version="@javassist@-brew"/> + </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> + <import componentref="jboss/jbossws-wsconsume-impl"> + <compatible version="@jbossws-wsconsume-impl@"/> + </import> + <import componentref="stax-api"> + <compatible version="@stax-api@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + + <export> + <include input="jbossws-integration.jar"/> + <include input="jbossws-core.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> Added: branches/jbossws-1.2.1/build/etc/component-info/jbossws14.xml =================================================================== --- branches/jbossws-1.2.1/build/etc/component-info/jbossws14.xml (rev 0) +++ branches/jbossws-1.2.1/build/etc/component-info/jbossws14.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -0,0 +1,47 @@ +<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 - Retrotranslated"> + + <artifact id="jbossws14-client.jar"/> + <artifact id="jboss-jaxws14.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-saaj.jar"/> + + <artifact id="jbossws40-jdk14.sar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> + <import componentref="jboss/jbossretro"> + <compatible version="@jboss-jbossretro@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb-jboss40@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer-jboss40@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss40@"/> + </import> + + <export> + <include input="jbossws14-client.jar"/> + <include input="jboss-jaxws14.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> \ No newline at end of file Property changes on: branches/jbossws-1.2.1/build/etc/component-info/jbossws14.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.1/build/version.properties =================================================================== --- branches/jbossws-1.2.1/build/version.properties 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/build/version.properties 2007-03-24 23:07:59 UTC (rev 2679) @@ -17,6 +17,8 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.5.0.CR1 +jbossws-wsconsume-impl=2.0.0 +jbpm-bpel=1.1.0.Beta4 sun-jaxb=2.0.3jboss stax-api=1.0 @@ -63,8 +65,6 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -jbossws-wsconsume=2.0.0 -jbpm-bpel=1.1.0.Beta4 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 Modified: branches/jbossws-1.2.1/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.1/integration-jboss40/build.xml 2007-03-24 01:34:29 UTC (rev 2678) +++ branches/jbossws-1.2.1/integration-jboss40/build.xml 2007-03-24 23:07:59 UTC (rev 2679) @@ -307,6 +307,7 @@ <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-integration.jar"/> <include name="jbossws-client.jar" /> <include name="jbossws-core.jar" /> <include name="jboss-jaxrpc.jar" />