[jbossws-commits] JBossWS SVN: r2564 - in branches/jbossws-1.2.0: build/ant-import and 18 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-03-09 05:37:29 -0500 (Fri, 09 Mar 2007) New Revision: 2564 Added: branches/jbossws-1.2.0/integration-jboss40/src/java/ branches/jbossws-1.2.0/integration-jboss40/src/resources/ branches/jbossws-1.2.0/integration-jboss42/src/java/ branches/jbossws-1.2.0/integration-jboss42/src/resources/ branches/jbossws-1.2.0/integration-jboss50/src/java/ branches/jbossws-1.2.0/integration-jboss50/src/resources/ branches/jbossws-1.2.0/jbossws-core/src/java/ branches/jbossws-1.2.0/jbossws-core/src/resources/ branches/jbossws-1.2.0/jbossws-tests/src/java/ Removed: branches/jbossws-1.2.0/integration-jboss40/src/main/java/ branches/jbossws-1.2.0/integration-jboss40/src/main/resources/ branches/jbossws-1.2.0/integration-jboss42/src/main/java/ branches/jbossws-1.2.0/integration-jboss42/src/main/resources/ branches/jbossws-1.2.0/integration-jboss50/src/main/ branches/jbossws-1.2.0/jbossws-core/src/main/java/ branches/jbossws-1.2.0/jbossws-core/src/main/resources/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/ Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml branches/jbossws-1.2.0/build/ant-import/build-samples.xml branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml branches/jbossws-1.2.0/build/version.properties branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml branches/jbossws-1.2.0/integration-tomcat/build.xml branches/jbossws-1.2.0/jbossws-core/build.xml branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml branches/jbossws-1.2.0/jbossws-tests/build.xml Log: Remove redundant directory main Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -50,6 +50,7 @@ </delete> <copy todir="${jbossws.repository.dir}/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"/> @@ -86,6 +87,7 @@ </fileset> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-integration.jar"/> <include name="jbossws14-client.jar"/> <include name="jboss-jaxws14.jar"/> </fileset> @@ -110,14 +112,6 @@ <property name="portal.userguide" value="${portal.freezone}/user-guide"/> <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> - <!-- Copy user guide - <copy todir="${portal.userguide}" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build"> - <include name="en/**"/> - </fileset> - </copy> - --> - <!-- Copy downloads --> <copy todir="${portal.downloads}" overwrite="true"> <fileset dir="${build.output.dir}"> @@ -179,15 +173,6 @@ </fileset> </copy> - <!-- documentation - <copy todir="${build.bin.dist}/docs/html" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/html"/> - </copy> - <copy todir="${build.bin.dist}/docs" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/pdf"/> - </copy> - --> - <!-- Install Core --> <copy todir="${install.core.dir}" overwrite="true"> <fileset dir="${core.output.lib.dir}"> Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -43,18 +43,18 @@ <fileset dir="${tests.dir}"> <include name="ant-import/build-samples-jaxrpc.xml"/> <include name="ant-import/build-samples-jaxws.xml"/> - <include name="src/main/etc/*"/> - <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/> - <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/> - <include name="src/main/java/org/jboss/test/ws/*"/> - <include name="src/main/resources/jaxrpc/samples/**"/> - <include name="src/main/resources/jaxrpc/samples-override/**"/> - <include name="src/main/resources/jaxws/samples/**"/> - <include name="src/main/resources/*excludes.txt"/> + <include name="src/etc/*"/> + <include name="src/java/org/jboss/test/ws/jaxrpc/samples/**"/> + <include name="src/java/org/jboss/test/ws/jaxws/samples/**"/> + <include name="src/java/org/jboss/test/ws/*"/> + <include name="src/resources/jaxrpc/samples/**"/> + <include name="src/resources/jaxrpc/samples-override/**"/> + <include name="src/resources/jaxws/samples/**"/> + <include name="src/resources/*excludes.txt"/> </fileset> </copy> - <copy todir="${build.src.samples.dir}/src/main"> + <copy todir="${build.src.samples.dir}/src"> <fileset dir="${core.samples.dir}"> <include name="etc/*"/> </fileset> Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml =================================================================== --- branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -2,6 +2,7 @@ <component id="jboss/jbossws" licenseType="lgpl" version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jbossws-integration.jar"/> <artifact id="jbossws-client.jar"/> <artifact id="jbossws-core.jar"/> <artifact id="jboss-jaxrpc.jar"/> @@ -19,6 +20,7 @@ </import> <import componentref="ibm-wsdl4j"> <compatible version="@ibm-wsdl4j@"/> + <compatible version="@ibm-wsdl4j@-brew"/> </import> <import componentref="javassist"> <compatible version="@javassist@"/> @@ -29,21 +31,23 @@ </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> + <compatible version="@jboss-jbossxb@-brew"/> + <compatible version="2.0.0.CR1"/> </import> <import componentref="jboss/microcontainer"> - <compatible version="snapshot"/> <compatible version="@jboss-microcontainer@"/> + <compatible version="2.0.0.Beta3"/> </import> <import componentref="jboss/remoting"> - <compatible version="1.4.3.GA"/> - <compatible version="2.2.0.Alpha2"/> <compatible version="@jboss-remoting@"/> + <compatible version="2.2.0.Alpha7"/> </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"/> Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml =================================================================== --- branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -3,6 +3,7 @@ <component id="jboss/jbossws14" licenseType="lgpl" version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services - Retrotranslated"> + <artifact id="jbossws14-integration.jar"/> <artifact id="jbossws14-client.jar"/> <artifact id="jboss-jaxws14.jar"/> <artifact id="jboss-jaxrpc.jar"/> @@ -37,6 +38,7 @@ </import> <export> + <include input="jbossws14-integration.jar"/> <include input="jbossws14-client.jar"/> <include input="jboss-jaxws14.jar"/> <include input="jboss-jaxrpc.jar"/> Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/build/version.properties 2007-03-09 10:37:29 UTC (rev 2564) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=1.2.0.GA -repository.id=1.2.0.GA +version.id=1.2.0.SP1 +repository.id=1.2.0.SP1 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws @@ -20,6 +20,7 @@ jboss-jbossxb=1.0.0.CR9 jboss-microcontainer=1.0.2 jboss-remoting=2.0.0.GA +jbpm-bpel=1.1.0.Beta4 sun-jaxb=2.0.3 # thirdparty library versions @@ -45,7 +46,6 @@ 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.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -19,7 +19,7 @@ <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> - <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src/main"/> + <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src"/> <property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/> <property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/> <property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/> @@ -27,7 +27,7 @@ <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> - <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> <property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/> @@ -214,7 +214,7 @@ <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> </fileset> - <fileset dir="${core.dir}/src/main/resources"> + <fileset dir="${core.dir}/src/resources"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> Copied: branches/jbossws-1.2.0/integration-jboss40/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss40/src/main/java) Copied: branches/jbossws-1.2.0/integration-jboss40/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss40/src/main/resources) Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -17,7 +17,7 @@ <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> - <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> <property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/> Copied: branches/jbossws-1.2.0/integration-jboss42/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss42/src/main/java) Copied: branches/jbossws-1.2.0/integration-jboss42/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss42/src/main/resources) Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -17,7 +17,7 @@ <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> - <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/> + <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src"/> <property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/> <property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/> <property name="jboss50.output.dir" value="${integration.jboss50.dir}/output"/> Copied: branches/jbossws-1.2.0/integration-jboss50/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss50/src/main/java) Copied: branches/jbossws-1.2.0/integration-jboss50/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss50/src/main/resources) Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -17,7 +17,7 @@ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> - <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/> + <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src"/> <property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/> <property name="tomcat.resources.dir" value="${tomcat.src.dir}/resources"/> <property name="tomcat.output.dir" value="${integration.tomcat.dir}/output"/> Modified: branches/jbossws-1.2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/jbossws-core/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -16,7 +16,7 @@ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <property name="core.src.dir" value="${core.dir}/src/main"/> + <property name="core.src.dir" value="${core.dir}/src"/> <property name="core.java.dir" value="${core.src.dir}/java"/> <property name="core.resources.dir" value="${core.src.dir}/resources"/> <property name="core.samples.dir" value="${core.resources.dir}/samples"/> @@ -55,16 +55,15 @@ <classpath refid="core.classpath"/> </javac> - <!-- Compile core classes with jdk1.4 --> + <!-- Compile core classes with jdk1.5 --> <mkdir dir="${core.output.classes.dir}"/> <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="javax/annotation/**"/> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> <classpath path="${core.output.classes14.dir}"/> <classpath refid="core.classpath"/> </javac> @@ -142,6 +141,14 @@ </fileset> </jar> + <!-- Build jbossws-integration.jar --> + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/ws/integration/**"/> + </fileset> + </jar> + <!-- Build jbossws-client.jar --> <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> Copied: branches/jbossws-1.2.0/jbossws-core/src/java (from rev 2562, branches/jbossws-1.2.0/jbossws-core/src/main/java) Copied: branches/jbossws-1.2.0/jbossws-core/src/resources (from rev 2562, branches/jbossws-1.2.0/jbossws-core/src/main/resources) Modified: branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-03-09 08:15:50 UTC (rev 2562) +++ branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -16,10 +16,10 @@ <property file="${basedir}/version.properties"/> <property name="tests.dir" value="${basedir}"/> - <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/> + <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> <property name="tests.lib.dir" value="${tests.dir}/lib"/> - <property name="tests.java.dir" value="${tests.dir}/src/main/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/> + <property name="tests.java.dir" value="${tests.dir}/src/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> <property name="tests.output.dir" value="${tests.dir}/output"/> <property name="thirdparty.dir" value="${basedir}/thirdparty"/> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -16,8 +16,8 @@ <property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/> <property name="jbossws.client.jar" value="jbossws-client.jar"/> - <property name="test.java.dir" value="src/main/java"/> - <property name="test.resources.dir" value="src/main/resources"/> + <property name="test.java.dir" value="src/java"/> + <property name="test.resources.dir" value="src/resources"/> <property name="build.tests.dir" value="output"/> <property name="build.test.dir" value="output"/> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-03-09 10:03:09 UTC (rev 2563) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-03-09 10:37:29 UTC (rev 2564) @@ -25,9 +25,9 @@ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/> - <property name="tests.java.dir" value="${tests.dir}/src/main/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/> + <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> + <property name="tests.java.dir" value="${tests.dir}/src/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> <property name="tests.output.dir" value="${tests.dir}/output"/> <!-- ================================================================== --> Copied: branches/jbossws-1.2.0/jbossws-tests/src/java (from rev 2562, branches/jbossws-1.2.0/jbossws-tests/src/main/java)