[jboss-cvs] JBossAS SVN: r65861 - in projects/metadata/trunk/src/main/java/org/jboss: ejb3/metamodel and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-10-04 18:09:19 -0400 (Thu, 04 Oct 2007)
New Revision: 65861

Removed:
   projects/metadata/trunk/src/main/java/org/jboss/ws/
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/Injectable.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
Log:
Drop the org.jboss.ws.integration classes in favor of the org.jboss.wsf.spi classes.

Modified: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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;
 
 /**
@@ -106,7 +106,7 @@
    {
       parent.addMessageDestinationRef(ref);
    }
-   
+
    public void addChild(ApplicationClientDD parent, ServiceRefMetaData serviceref,
                         UnmarshallingContext navigator, String namespaceURI, String localName)
    {

Modified: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -40,7 +40,7 @@
 import org.jboss.metamodel.descriptor.SecurityRoleRef;
 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: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/Injectable.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/Injectable.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/Injectable.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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: projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-10-04 22:06:19 UTC (rev 65860)
+++ projects/metadata/trunk/src/main/java/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-10-04 22:09:19 UTC (rev 65861)
@@ -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>