[jboss-cvs] JBossAS SVN: r64657 - in branches/Branch_4_4: ejb3 and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 17 12:13:20 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-17 12:13:20 -0400 (Fri, 17 Aug 2007)
New Revision: 64657
Modified:
branches/Branch_4_4/build/build-distr.xml
branches/Branch_4_4/build/build-thirdparty.xml
branches/Branch_4_4/ejb3/.classpath
branches/Branch_4_4/ejb3/build.xml
branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
branches/Branch_4_4/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
branches/Branch_4_4/server/.classpath
branches/Branch_4_4/server/build.xml
branches/Branch_4_4/server/src/main/org/jboss/deployment/ClientDeployer.java
branches/Branch_4_4/server/src/main/org/jboss/ejb/Container.java
branches/Branch_4_4/server/src/main/org/jboss/metadata/BeanMetaData.java
branches/Branch_4_4/server/src/main/org/jboss/metadata/ClientMetaData.java
branches/Branch_4_4/server/src/main/org/jboss/metadata/WebMetaData.java
branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java
branches/Branch_4_4/server/src/main/org/jboss/web/AbstractWebDeployer.java
branches/Branch_4_4/tomcat/.classpath
branches/Branch_4_4/tomcat/build.xml
Log:
Install jbossws-2.0.1.GA
Modified: branches/Branch_4_4/build/build-distr.xml
===================================================================
--- branches/Branch_4_4/build/build-distr.xml 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/build/build-distr.xml 2007-08-17 16:13:20 UTC (rev 64657)
@@ -1511,18 +1511,24 @@
<fileset dir="${jboss.common.lib}">
<include name="jboss-common-client.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws.common.lib}">
+ <include name="jbossws-common.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.framework.lib}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.spi.lib}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.jboss42.lib}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
<fileset dir="${jboss.jbossws.lib}">
<include name="jbossws-client.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.jboss42.lib}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossws.spi.lib}">
- <include name="jbossws-spi.jar"/>
- </fileset>
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
@@ -1566,12 +1572,15 @@
<fileset dir="${javassist.javassist.lib}">
<include name="javassist.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.jboss42.lib}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="${jboss.jbossws.spi.lib}">
<include name="jbossws-spi.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws.common.lib}">
+ <include name="jbossws-common.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.framework.lib}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
<fileset dir="${apache.httpclient.lib}">
<include name="commons-httpclient.jar"/>
</fileset>
@@ -1598,18 +1607,30 @@
<fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
</copy>
- <!-- Install jbossws tools shell scripts -->
- <unzip dest="${install.bin}" src="${jboss.jbossws.spi.lib}/jbossws-spi-scripts.zip"/>
- <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-core-scripts.zip"/>
-
<!-- Install JBossWS -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native42.lib}/jbossws-native42.sar"/>
- <!-- This is executed last, so make executable all bin/*.sh scripts -->
+ <!-- Install jbossws tools shell scripts -->
+ <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
+ <patternset>
+ <include name="wstools.*"/>
+ <include name="wsrunclient.*"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${install.bin}" src="${jboss.jbossws.framework.lib}/jbossws-framework-scripts.zip">
+ <patternset>
+ <include name="wsprovide.*"/>
+ <include name="wsconsume.*"/>
+ </patternset>
+ </unzip>
+
<chmod perm="+x">
- <fileset dir="${install.bin}">
- <include name="**/*.sh"/>
+ <fileset dir ="${install.bin}">
+ <include name="wstools.sh"/>
+ <include name="wsprovide.sh"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsrunclient.sh"/>
</fileset>
</chmod>
Modified: branches/Branch_4_4/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_4/build/build-thirdparty.xml 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/build/build-thirdparty.xml 2007-08-17 16:13:20 UTC (rev 64657)
@@ -85,9 +85,9 @@
<componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jbossts14" version="4.2.3.SP5-brew"/>
- <componentref name="jboss/jbossws-jboss42" version="2.0.0.GA"/>
- <componentref name="jboss/jbossws-native42" version="2.0.0.GA"/>
- <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
+ <componentref name="jboss/jbossws-jboss42" version="2.0.1.GA"/>
+ <componentref name="jboss/jbossws-native42" version="2.0.1.GA"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.CR11"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
<componentref name="jboss/remoting" version="2.2.1.GA"/>
Modified: branches/Branch_4_4/ejb3/.classpath
===================================================================
--- branches/Branch_4_4/ejb3/.classpath 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/.classpath 2007-08-17 16:13:20 UTC (rev 64657)
@@ -93,5 +93,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/dom4j-jarjar/lib/dom4j-jarjar.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-common/lib/jbossws-common.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_4_4/ejb3/build.xml
===================================================================
--- branches/Branch_4_4/ejb3/build.xml 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/build.xml 2007-08-17 16:13:20 UTC (rev 64657)
@@ -98,6 +98,7 @@
<!--path refid="jboss.jboss.vfs.classpath"/-->
<path refid="quartz.quartz.classpath"/>
<path refid="jboss.jbossws.spi.classpath"/>
+ <path refid="jboss.jbossws.common.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -40,7 +40,7 @@
import org.jboss.metamodel.descriptor.SecurityRoleRef;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -35,7 +35,7 @@
import org.jboss.metamodel.descriptor.MessageDestinationRef;
import org.jboss.metamodel.descriptor.ResourceEnvRef;
import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
/**
* Represents EJB elements of the ejb-jar.xml deployment descriptor for the 1.4
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -32,7 +32,7 @@
import org.jboss.metamodel.descriptor.PersistenceUnitRef;
import org.jboss.metamodel.descriptor.ResourceEnvRef;
import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
/**
*
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -31,7 +31,7 @@
import org.jboss.metamodel.descriptor.ResourceEnvRef;
import org.jboss.metamodel.descriptor.ResourceRef;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -36,7 +36,7 @@
import org.jboss.metamodel.descriptor.ResourceRef;
import org.jboss.security.SecurityRoleMetaData;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -36,7 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.serviceref.ServiceRefDelegate;
import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
/**
* Handle @WebServiceRef annotations
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -33,8 +33,9 @@
import org.jboss.ejb3.EJBContainer;
import org.jboss.logging.Logger;
import org.jboss.metadata.serviceref.ServiceRefDelegate;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
/**
* Inject a jaxws web service ref.
@@ -66,9 +67,9 @@
URL rootURL = unit.getUrl();
ClassLoader loader = unit.getClassLoader();
- URLLoaderAdapter vfsRoot = new URLLoaderAdapter(rootURL);
+ UnifiedVirtualFile vfsRoot = new URLLoaderAdapter(rootURL);
new ServiceRefDelegate().bindServiceRef(encCtx, name, vfsRoot, loader, sref);
-
+
log.debug("@WebServiceRef bound [env=" + name + "]");
}
catch (Exception e)
Modified: branches/Branch_4_4/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- branches/Branch_4_4/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -27,7 +27,7 @@
import java.util.List;
import org.jboss.logging.Logger;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: branches/Branch_4_4/server/.classpath
===================================================================
--- branches/Branch_4_4/server/.classpath 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/.classpath 2007-08-17 16:13:20 UTC (rev 64657)
@@ -27,5 +27,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-saaj.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-common/lib/jbossws-common.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_4_4/server/build.xml
===================================================================
--- branches/Branch_4_4/server/build.xml 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/build.xml 2007-08-17 16:13:20 UTC (rev 64657)
@@ -87,6 +87,7 @@
<path refid="ibm.wsdl4j.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossws.spi.classpath"/>
+ <path refid="jboss.jbossws.common.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="junit.junit.classpath"/>
Modified: branches/Branch_4_4/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/deployment/ClientDeployer.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/deployment/ClientDeployer.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -43,10 +43,9 @@
import org.jboss.metadata.XmlFileLoader;
import org.jboss.metadata.serviceref.ServiceRefDelegate;
import org.jboss.util.naming.Util;
-import org.jboss.ws.integration.ServiceRefHandler;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.URLLoaderAdapter;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
/**
Modified: branches/Branch_4_4/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/ejb/Container.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/ejb/Container.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -87,9 +87,9 @@
import org.jboss.util.naming.ENCThreadLocalKey;
import org.jboss.util.naming.NonSerializableFactory;
import org.jboss.util.naming.Util;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.URLLoaderAdapter;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.omg.CORBA.ORB;
/**
Modified: branches/Branch_4_4/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -37,7 +37,7 @@
import org.jboss.security.AnybodyPrincipal;
import org.jboss.security.NobodyPrincipal;
import org.jboss.security.SimplePrincipal;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
Modified: branches/Branch_4_4/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/metadata/ClientMetaData.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/metadata/ClientMetaData.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -25,7 +25,7 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.serviceref.ServiceRefDelegate;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
import java.util.ArrayList;
Modified: branches/Branch_4_4/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/metadata/WebMetaData.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/metadata/WebMetaData.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -41,7 +41,7 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityRoleMetaData;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
/** A representation of the web.xml and jboss-web.xml deployment
Modified: branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -26,11 +26,14 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.ws.integration.ServiceRefElement;
-import org.jboss.ws.integration.ServiceRefHandler;
-import org.jboss.ws.integration.ServiceRefHandlerFactory;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefElement;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
@@ -43,14 +46,21 @@
*/
public class ServiceRefDelegate implements ServiceRefHandler
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceRefDelegate.class);
+
private static ServiceRefHandler delegate;
public ServiceRefDelegate()
{
if (delegate == null)
{
- delegate = ServiceRefHandlerFactory.getServiceRefHandler();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
}
+
+ if (delegate == null)
+ log.warn("ServiceRefHandler not available");
}
public ServiceRefMetaData newServiceRefMetaData()
Modified: branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -24,7 +24,7 @@
// $Id$
import org.jboss.logging.Logger;
-import org.jboss.ws.integration.ServiceRefElement;
+import org.jboss.wsf.spi.serviceref.ServiceRefElement;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.w3c.dom.DocumentType;
Modified: branches/Branch_4_4/server/src/main/org/jboss/web/AbstractWebDeployer.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/web/AbstractWebDeployer.java 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/server/src/main/org/jboss/web/AbstractWebDeployer.java 2007-08-17 16:13:20 UTC (rev 64657)
@@ -58,9 +58,9 @@
import org.jboss.util.naming.NonSerializableFactory;
import org.jboss.util.naming.Util;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.URLLoaderAdapter;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.omg.CORBA.ORB;
/** A template pattern class for web deployer integration into JBoss. This class
Modified: branches/Branch_4_4/tomcat/.classpath
===================================================================
--- branches/Branch_4_4/tomcat/.classpath 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/tomcat/.classpath 2007-08-17 16:13:20 UTC (rev 64657)
@@ -31,7 +31,7 @@
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-impl.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-integration.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/iiop"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-common/lib/jbossws-common.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_4_4/tomcat/build.xml
===================================================================
--- branches/Branch_4_4/tomcat/build.xml 2007-08-17 14:59:48 UTC (rev 64656)
+++ branches/Branch_4_4/tomcat/build.xml 2007-08-17 16:13:20 UTC (rev 64657)
@@ -58,6 +58,7 @@
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="jboss.jbossws.spi.classpath"/>
+ <path refid="jboss.jbossws.common.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
More information about the jboss-cvs-commits
mailing list