[jboss-cvs] JBossAS SVN: r58906 - in trunk: build ejb3 j2ee j2ee/src/main/javax/xml server tools/etc/buildmagic varia

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-12-07 13:21:00 -0500 (Thu, 07 Dec 2006)
New Revision: 58906

Removed:
   trunk/j2ee/src/main/javax/xml/rpc/
   trunk/j2ee/src/main/javax/xml/soap/
Modified:
   trunk/build/build-distr.xml
   trunk/ejb3/build.xml
   trunk/j2ee/build.xml
   trunk/server/build.xml
   trunk/tools/etc/buildmagic/modules.ent
   trunk/varia/build.xml
Log:
remove jaxrpc, saaj api from as

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/build/build-distr.xml	2006-12-07 18:21:00 UTC (rev 58906)
@@ -296,8 +296,6 @@
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jboss-j2ee.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-saaj.jar"/>
       </fileset>
     </copy>
 
@@ -306,8 +304,6 @@
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jboss-j2ee.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-saaj.jar"/>
       </fileset>
       <fileset dir="${sun.jaf.lib}">
         <include name="activation.jar"/>
@@ -1830,6 +1826,8 @@
       </fileset>
       <fileset dir="${jboss.jbossws.lib}">
         <include name="jbossws-client.jar"/>
+        <include name="jboss-jaxrpc.jar"/>
+        <include name="jboss-saaj.jar"/>
       </fileset>
     </copy>
 
@@ -1852,6 +1850,10 @@
       <fileset dir="${apache.logging.lib}">
         <include name="commons-logging.jar"/>
       </fileset>
+      <fileset dir="${jboss.jbossws.lib}">
+        <include name="jboss-jaxrpc.jar"/>
+        <include name="jboss-saaj.jar"/>
+      </fileset>
     </copy>
 
 

Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/ejb3/build.xml	2006-12-07 18:21:00 UTC (rev 58906)
@@ -485,7 +485,7 @@
          <zipfileset src="${jboss.jca.lib}/jboss-xa-jdbc.jar" />
          <zipfileset src="${jboss.system.lib}/jboss-system.jar" />
          <zipfileset src="${jboss.serialization.lib}/jboss-serialization.jar" />
-         <zipfileset src="${jboss.j2ee.lib}/jboss-jaxrpc.jar" />
+         <zipfileset src="${jboss.jbossws.lib}/jboss-jaxrpc.jar" />
       </jar>
       
       

Modified: trunk/j2ee/build.xml
===================================================================
--- trunk/j2ee/build.xml	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/j2ee/build.xml	2006-12-07 18:21:00 UTC (rev 58906)
@@ -77,6 +77,7 @@
       <path refid="apache.xerces.classpath"/>
       <path refid="sun.jaf.classpath"/>
       <path refid="sun.servlet.classpath"/>
+      <path refid="jboss.jbossws.classpath"/>
     </path>
 
     <!-- ======= -->
@@ -229,28 +230,12 @@
         <include name="javax/sql/**"/>
         <include name="javax/transaction/**"/>
         <include name="javax/xml/**"/>
-        <exclude name="javax/xml/rpc/**"/>
-        <exclude name="javax/xml/soap/**"/>
       </fileset>
       <fileset dir="${jboss.jmx.root}/classes">
         <include name="javax/management/**"/>
       </fileset>
     </jar>
 
-    <jar jarfile="${build.lib}/jboss-jaxrpc.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="javax/xml/rpc/**"/>
-      </fileset>
-    </jar>
-
-    <jar jarfile="${build.lib}/jboss-saaj.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="javax/xml/soap/**"/>
-      </fileset>
-    </jar>
-
   </target>
 
   <!-- ================================================================== -->

Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/server/build.xml	2006-12-07 18:21:00 UTC (rev 58906)
@@ -86,6 +86,7 @@
       <path refid="sun.servlet.classpath"/>
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
+      <path refid="jboss.jbossws.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
     </path>
 
@@ -96,8 +97,8 @@
     &modules;
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
+      <path refid="ejb3-persistence.classpath"/>
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="ejb3-persistence.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>

Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/tools/etc/buildmagic/modules.ent	2006-12-07 18:21:00 UTC (rev 58906)
@@ -68,8 +68,6 @@
 <property name="jboss.j2ee.lib" value="${jboss.j2ee.root}/lib"/>
 <path id="jboss.j2ee.classpath">
   <pathelement path="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
-  <pathelement path="${jboss.j2ee.lib}/jboss-jaxrpc.jar"/>
-  <pathelement path="${jboss.j2ee.lib}/jboss-saaj.jar"/>
 </path>
 
 <!-- J2SE -->

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2006-12-07 17:36:20 UTC (rev 58905)
+++ trunk/varia/build.xml	2006-12-07 18:21:00 UTC (rev 58906)
@@ -92,6 +92,7 @@
       <path refid="oswego.concurrent.classpath"/>
       <path refid="juddi.juddi.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
+      <path refid="jboss.jbossws.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
     </path>