[jbossws-commits] JBossWS SVN: r2249 - in branches/jbossws-1.2.0: jbossws-core and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-02 06:54:02 -0500 (Fri, 02 Feb 2007)
New Revision: 2249

Modified:
   branches/jbossws-1.2.0/integration-tomcat/build.xml
   branches/jbossws-1.2.0/jbossws-core/build.xml
   branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Remove javax classes from jbossws-client.jar

Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml	2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml	2007-02-02 11:54:02 UTC (rev 2249)
@@ -99,6 +99,9 @@
         <include name="META-INF/standard-jaxws-client-config.xml"/>
         <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
       </fileset>
+      <webinf dir="${tomcat.resources.dir}/jbossws.war/WEB-INF">
+        <include name="log4j.xml"/>
+      </webinf>
     </war>
     
   </target>

Modified: branches/jbossws-1.2.0/jbossws-core/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/build.xml	2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/jbossws-core/build.xml	2007-02-02 11:54:02 UTC (rev 2249)
@@ -125,7 +125,6 @@
         <include name="javax/annotation/**"/>
         <include name="javax/jws/**"/>
         <include name="javax/xml/ws/**"/>
-        <include name="org/jboss/ws/jaxws/injection/**"/>
       </fileset>
       <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
     </jar>
@@ -136,7 +135,6 @@
       <fileset dir="${core.output.classes.dir}">
         <include name="org/jboss/annotation/**"/>
         <include name="org/jboss/ws/**"/>
-        <exclude name="org/jboss/ws/integration/**"/>
       </fileset>
       <fileset dir="${core.resources.dir}">
         <include name="schema/**"/>
@@ -146,14 +144,9 @@
     
     <!-- Build jbossws-client.jar -->
     <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf">
-      <fileset dir="${core.output.classes14.dir}">
-        <include name="javax/xml/rpc/**"/>
-        <include name="javax/xml/soap/**"/>
-      </fileset>
       <fileset dir="${core.output.classes.dir}">
-        <include name="javax/xml/ws/**"/>
-        <include name="javax/jws/**"/>
         <include name="org/jboss/ws/**"/>
+        <exclude name="org/jboss/ws/core/server/**"/>
       </fileset>
       <fileset dir="${core.resources.dir}/jbossws.sar">
         <include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -168,7 +161,6 @@
         <include name="wstools.bat"/>
         <include name="wstools-log4j.xml"/>
       </fileset>
-      <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
     </jar>
     
   </target>

Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-02 10:55:37 UTC (rev 2248)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-02 11:54:02 UTC (rev 2249)
@@ -115,15 +115,17 @@
       <format property="build.id" pattern="yyyyMMddHHmm"/>
     </tstamp>
     
+    <!-- Define the jbossws.core.jar -->
+    <condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar">
+      <isset property="HAVE_JDK_1.5"/>
+    </condition>
+    <property name="jbossws.core.jar" value="${jboss40.output.lib.dir}/jbossws14-core.jar"/>
+
     <!-- Define the jbossws.client.jar -->
-    <condition property="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar">
-      <not>
-        <isset property="HAVE_JDK_1.5"/>
-      </not>
-    </condition>
     <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
       <isset property="HAVE_JDK_1.5"/>
     </condition>
+    <property name="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"/>
 
     <!-- Define excluded tests -->
     <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
@@ -155,6 +157,7 @@
     
     <!-- The combined compile classpath -->
     <path id="jbossws.jars.classpath">
+      <pathelement location="${jbossws.core.jar}"/>
       <pathelement location="${jbossws.client.jar}"/>
       <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
       <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
@@ -326,7 +329,10 @@
 	  <!-- generate mapping artifacts -->
     <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
       <classpath refid="core.classpath"/>
-      <classpath location="${jbossws.client.jar}"/>
+      <classpath location="${jbossws.core.jar}"/>
+      <classpath location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
+      <classpath location="${core.output.lib.dir}/jboss-jaxws.jar"/>
+      <classpath location="${core.output.lib.dir}/jboss-saaj.jar"/>
       <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
       <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
       <classpath location="${thirdparty.dir}/concurrent.jar"/>