[jboss-cvs] JBossAS SVN: r63188 - in trunk: server and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-05-23 00:14:47 -0400 (Wed, 23 May 2007)
New Revision: 63188

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/server/.classpath
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
Log:
Remove dependency on javax.xml.soap.FactoryLoader

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-05-22 20:44:45 UTC (rev 63187)
+++ trunk/build/build-distr.xml	2007-05-23 04:14:47 UTC (rev 63188)
@@ -1765,6 +1765,12 @@
         <include name="jaxb-impl.jar"/>
         <include name="jaxb-xjc.jar"/>
       </fileset>
+      <fileset dir="${jboss.jbossws.spi.lib}">
+        <include name="jbossws-spi.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.jboss50.lib}">
+        <include name="jbossws-jboss50.jar"/>
+      </fileset>
       <fileset dir="${jboss.jbossws.lib}">
         <include name="jbossws-client.jar"/>
         <include name="jboss-jaxrpc.jar"/>
@@ -1819,6 +1825,9 @@
       <fileset dir="${jboss.jbossws.spi.lib}">
         <include name="jbossws-spi.jar"/>
       </fileset>
+      <fileset dir="${jboss.jbossws.jboss50.lib}">
+        <include name="jbossws-jboss50.jar"/>
+      </fileset>
       <fileset dir="${jboss.jbossws.lib}">
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-jaxws.jar"/>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-05-22 20:44:45 UTC (rev 63187)
+++ trunk/build/build.xml	2007-05-23 04:14:47 UTC (rev 63188)
@@ -846,7 +846,6 @@
         <include name="xmlsec.jar"/>
         <include name="jboss-messaging.jar"/>
         <!-- client excludes -->
-        <exclude name="jbossws14-client.jar"/>
         <exclude name="jbossws-client.jar"/>
       </fileset>
     </unjar>

Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath	2007-05-22 20:44:45 UTC (rev 63187)
+++ trunk/server/.classpath	2007-05-23 04:14:47 UTC (rev 63188)
@@ -39,5 +39,9 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer-src.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/security"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+<<<<<<< .mine
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+=======
+>>>>>>> .r63187
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-05-22 20:44:45 UTC (rev 63187)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-05-23 04:14:47 UTC (rev 63188)
@@ -25,12 +25,12 @@
 
 import javax.naming.Context;
 import javax.naming.NamingException;
-import javax.xml.soap.FactoryLoader;
 
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.logging.Logger;
+import org.jboss.ws.integration.FactoryLoader;
 import org.jboss.ws.integration.KernelLocator;
 import org.jboss.ws.integration.ServiceRefElement;
 import org.jboss.ws.integration.ServiceRefHandler;