[jbossws-commits] JBossWS SVN: r2261 - in branches/jbossws-1.2.0: integration-jboss40 and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-03 15:16:45 -0500 (Sat, 03 Feb 2007) New Revision: 2261 Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/jbossws-tests/build.xml Log: Fix jdk14 build and samples Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-03 19:55:44 UTC (rev 2260) +++ branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-03 20:16:45 UTC (rev 2261) @@ -79,7 +79,6 @@ <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="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> @@ -193,7 +192,6 @@ </fileset> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> </fileset> </copy> <mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/> Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-03 19:55:44 UTC (rev 2260) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-03 20:16:45 UTC (rev 2261) @@ -196,21 +196,13 @@ --> <target name="jboss40-jars14" depends="jboss40-jars,jboss40-retro"> - <!-- Build jboss-jaxws14.jar --> - <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - </fileset> - </jar> - <!-- Build jbossws14-core.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> </fileset> <fileset dir="${core.dir}/src/main/resources"> <include name="schema/**"/> @@ -233,9 +225,10 @@ <include name="javax/xml/soap/**"/> </fileset> <fileset dir="${jboss40.output.classes14.dir}"> + <include name="org/jboss/ws/**"/> + <exclude name="org/jboss/ws/core/server/**"/> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> - <include name="org/jboss/ws/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> @@ -262,7 +255,6 @@ <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> <include name="jbossws14-core.jar"/> - <include name="jboss-jaxws14.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-03 19:55:44 UTC (rev 2260) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-03 20:16:45 UTC (rev 2261) @@ -160,12 +160,11 @@ <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/> </path> <path id="jbossws.classpath.jdk14"> - <pathelement location="${core.output.lib.dir}/jbossws14-core.jar"/> - <pathelement location="${core.output.lib.dir}/jbossws14-client.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-jaxws14.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-client.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-core.jar"/> </path> <path id="jbossws.classpath" refid="${jbossws.classpath}"/>