[Jboss-cvs] JBossAS SVN: r56055 - in branches/Branch_4_0: build ejb3 ejb3/src/main/javax j2ee j2ee/src/main/javax/xml jaxrpc/src/main/org/jboss server varia varia/src/main/org/jboss/jaxr/juddi

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

Author: thomas.diesler at jboss.com
Date: 2006-08-18 08:46:17 -0400 (Fri, 18 Aug 2006)
New Revision: 56055

Removed:
   branches/Branch_4_0/ejb3/src/main/javax/jws/
   branches/Branch_4_0/j2ee/src/main/javax/xml/rpc/
   branches/Branch_4_0/j2ee/src/main/javax/xml/soap/
   branches/Branch_4_0/jaxrpc/src/main/org/jboss/axis/
   branches/Branch_4_0/varia/src/main/org/jboss/jaxr/juddi/axis/
Modified:
   branches/Branch_4_0/build/build-distr.xml
   branches/Branch_4_0/build/build-thirdparty.xml
   branches/Branch_4_0/ejb3/build.xml
   branches/Branch_4_0/j2ee/build.xml
   branches/Branch_4_0/server/build.xml
   branches/Branch_4_0/varia/build.xml
Log:
* update to jbossws-1.0.3-snapshot 
* remove axis, jaxrpc, saaj

Modified: branches/Branch_4_0/build/build-distr.xml
===================================================================
--- branches/Branch_4_0/build/build-distr.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/build/build-distr.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -33,8 +33,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>
 
@@ -43,8 +41,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"/>
@@ -1426,6 +1422,8 @@
       </fileset>
       <fileset dir="${jboss.jbossws14.lib}">
         <include name="jbossws14-client.jar"/>
+        <include name="jboss-jaxrpc.jar"/>
+        <include name="jboss-saaj.jar"/>
       </fileset>
       <fileset dir="${jboss/jbossretro.rt.lib}">
         <include name="jbossretro-rt.jar"/>
@@ -1453,6 +1451,9 @@
         <fileset dir="${jboss/jbossretro.rt.lib}">
           <include name="jbossretro-rt.jar"/>
         </fileset>
+        <fileset dir="${jboss.jbossws14.lib}">
+          <include name="jboss-jaxrpc.jar"/>
+        </fileset>
         <fileset dir="${jboss/backport.concurrent.lib}">
           <include name="jboss-backport-concurrent.jar"/>
         </fileset>

Modified: branches/Branch_4_0/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_0/build/build-thirdparty.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/build/build-thirdparty.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -90,8 +90,9 @@
       <componentref name="jboss/cache" version="1.4.0.SP1"/>
       <componentref name="jboss/microcontainer" version="1.0.2"/>
       <componentref name="jboss/jbossretro-rt" version="1.0.2.GA"/>
-      <componentref name="jboss/jbossws" version="1.0.1.GA"/>
-      <componentref name="jboss/jbossws14" version="1.0.1.GA"/>
+      <componentref name="jboss/jbossws" version="snapshot"/>
+      <componentref name="jboss/jbossws14" version="snapshot"/>
+      <componentref name="jboss/jboss-ws4ee" version="4.0.4.SP1"/>
       <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
       <componentref name="jboss/common" version="snapshot-Branch_4_0"/>
       <componentref name="jboss/remoting" version="1.4.3.GA"/>

Modified: branches/Branch_4_0/ejb3/build.xml
===================================================================
--- branches/Branch_4_0/ejb3/build.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/ejb3/build.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -96,6 +96,7 @@
          <path refid="apache.logging.classpath"/>
          <path refid="jboss.serialization.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
+         <path refid="jboss.jbossws.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
       </path>
 

Modified: branches/Branch_4_0/j2ee/build.xml
===================================================================
--- branches/Branch_4_0/j2ee/build.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/j2ee/build.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -77,6 +77,7 @@
       <path refid="sun.jaf.classpath"/>
       <path refid="sun.servlet.classpath"/>
       <path refid="apache.xerces.classpath"/>
+      <path refid="jboss.jbossws14.classpath"/>
     </path>
 
     <!-- ======= -->

Modified: branches/Branch_4_0/server/build.xml
===================================================================
--- branches/Branch_4_0/server/build.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/server/build.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -81,9 +81,10 @@
       <path refid="gjt.jpl-util.classpath"/>
       <path refid="gnu.getopt.classpath"/>
       <path refid="ibm.wsdl4j.classpath"/>
+      <path refid="jboss.jbossws14.classpath"/>
+      <path refid="jboss.jbossxb.classpath"/>
+      <path refid="junit.junit.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
-      <path refid="junit.junit.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
     </path>
 
     <!-- ======= -->

Modified: branches/Branch_4_0/varia/build.xml
===================================================================
--- branches/Branch_4_0/varia/build.xml	2006-08-18 12:37:43 UTC (rev 56054)
+++ branches/Branch_4_0/varia/build.xml	2006-08-18 12:46:17 UTC (rev 56055)
@@ -83,6 +83,8 @@
       <path refid="beanshell.beanshell.classpath"/>
       <path refid="hsqldb.hsqldb.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
+      <path refid="jboss.jbossws14.classpath"/>
+      <path refid="jboss.jbossxb.classpath"/>
       <path refid="juddi.juddi.classpath"/>
       <path refid="junit.junit.classpath"/>
       <path refid="opennms.joesnmp.classpath"/>
@@ -90,7 +92,6 @@
       <path refid="sun.jaf.classpath"/>
       <path refid="sun.javamail.classpath"/>
       <path refid="sun.servlet.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
     </path>
 
     <!-- ======= -->