[jboss-cvs] JBossAS SVN: r64399 - in trunk: ejb3/src/main/org/jboss/ejb3 and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 1 11:08:43 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-08-01 11:08:43 -0400 (Wed, 01 Aug 2007)
New Revision: 64399

Modified:
   trunk/deployment/.classpath
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
   trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
   trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
   trunk/server/src/main/org/jboss/ejb/Container.java
   trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
   trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/serviceref/VirtualFileAdaptor.java
   trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
   trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java
   trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
Log:
Update WS integration to use the SPI

Modified: trunk/deployment/.classpath
===================================================================
--- trunk/deployment/.classpath	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/deployment/.classpath	2007-08-01 15:08:43 UTC (rev 64399)
@@ -15,7 +15,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -99,8 +99,8 @@
 import org.jboss.naming.Util;
 import org.jboss.util.StringPropertyReplacer;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 
 /**
  * Comment

Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -70,8 +70,8 @@
 import org.jboss.metadata.serviceref.VirtualFileAdaptor;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 
 /**
  * This class builds up the java:comp namespace for JavaEE 5 application clients.

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -30,11 +30,11 @@
 import org.jboss.metamodel.descriptor.EnvEntry;
 import org.jboss.metamodel.descriptor.MessageDestinationRef;
 import org.jboss.util.xml.JBossEntityResolver;
+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;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.ws.integration.ServiceRefMetaData;
 import org.xml.sax.Attributes;
 
 /**

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -38,9 +38,9 @@
 import org.jboss.metamodel.descriptor.RunAs;
 import org.jboss.metamodel.descriptor.SecurityRole;
 import org.jboss.metamodel.descriptor.SecurityRoleRef;
+import org.jboss.util.StringPropertyReplacer;
 import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.util.StringPropertyReplacer;
-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: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -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: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -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: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -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: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -37,7 +37,7 @@
 import org.jboss.metamodel.descriptor.ResourceRef;
 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: trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/injection/ServiceRefInjector.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -31,8 +31,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.serviceref.ServiceRefDelegate;
 import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 
 /**
  * Inject a web service ref.

Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -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: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -50,8 +50,8 @@
 import org.jboss.naming.Util;
 import org.jboss.util.xml.DOMUtils;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
 

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -48,7 +48,7 @@
 import org.jboss.metadata.SecurityRoleMetaData;
 import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metadata.SessionMetaData;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -53,7 +53,7 @@
 import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
 import org.jboss.metadata.ApplicationMetaData.Webservices;
 import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/ejb/Container.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -91,8 +91,8 @@
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.util.NestedError;
 import org.jboss.util.NestedRuntimeException;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.omg.CORBA.ORB;
 
 /**

Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -44,7 +44,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: trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/ClientMetaData.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -34,7 +34,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.serviceref.ServiceRefDelegate;
 import org.jboss.metadata.serviceref.ServiceRefObjectFactory;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.w3c.dom.Element;
 
 /** The metdata data from a j2ee application-client.xml descriptor

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -55,7 +55,7 @@
 import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.security.RunAsIdentity;
-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: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -27,11 +27,13 @@
 import javax.naming.NamingException;
 
 import org.jboss.logging.Logger;
-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.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;
@@ -53,7 +55,8 @@
    {
       if (delegate == null)
       {
-         delegate = ServiceRefHandlerFactory.getServiceRefHandler();
+         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+         delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
       }
 
       if (delegate == null)

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -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: trunk/server/src/main/org/jboss/metadata/serviceref/VirtualFileAdaptor.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/VirtualFileAdaptor.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/VirtualFileAdaptor.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -25,9 +25,9 @@
 import java.net.URL;
 
 import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
 
-// $Id$
+// $Id: $
 
 /**
  * A JBoss50 VirtualFile adaptor

Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -39,7 +39,7 @@
 import org.jboss.mx.loading.LoaderRepositoryFactory;
 import org.jboss.mx.util.ObjectNameFactory;
 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: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -41,7 +41,7 @@
 import org.jboss.metadata.WebMetaData;
 import org.jboss.metadata.WebSecurityMetaData;
 import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
 

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -28,7 +28,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: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -59,8 +59,8 @@
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.web.WebApplication;
 import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.omg.CORBA.ORB;
 
 /**

Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -35,7 +35,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.ObjectModelFactory;
 import org.jboss.xb.binding.Unmarshaller;

Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -41,7 +41,7 @@
 import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.jboss.metadata.WebMetaData;
-import org.jboss.ws.integration.ServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.xml.sax.Attributes;
 
 import java.io.IOException;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -73,8 +73,8 @@
 import org.jboss.web.tomcat.service.session.AbstractJBossManager;
 import org.jboss.web.tomcat.service.session.ClusteringNotSupportedException;
 import org.jboss.web.tomcat.service.session.JBossCacheManager;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.omg.CORBA.ORB;
 
 /**

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-08-01 13:05:20 UTC (rev 64398)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-08-01 15:08:43 UTC (rev 64399)
@@ -70,8 +70,8 @@
 import org.jboss.web.tomcat.service.session.AbstractJBossManager;
 import org.jboss.web.tomcat.service.session.ClusteringNotSupportedException;
 import org.jboss.web.tomcat.service.session.JBossCacheManager;
-import org.jboss.ws.integration.ServiceRefMetaData;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.omg.CORBA.ORB;
 
 /**




More information about the jboss-cvs-commits mailing list