geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096959 [3/3] - in /geronimo/server/trunk: framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ plugins/j2ee/geronimo-j2ee...
Date Tue, 26 Apr 2011 23:21:15 GMT
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Tue Apr 26 23:21:13 2011
@@ -17,6 +17,7 @@
 
 package org.apache.geronimo.naming.deployment;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -24,24 +25,24 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.j2ee.deployment.model.naming.GbeanLocatorType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PatternType;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.xbeans.geronimo.naming.GerGbeanLocatorType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 
 /**
  * @version $Rev:385232 $ $Date$
  */
 public class ENCConfigBuilder {
 
-    public static AbstractNameQuery getGBeanQuery(String j2eeType, GerGbeanLocatorType gerGbeanLocator)
{
+    public static AbstractNameQuery getGBeanQuery(String j2eeType, GbeanLocatorType gerGbeanLocator)
{
         AbstractNameQuery abstractNameQuery;
-        if (gerGbeanLocator.isSetGbeanLink()) {
+        if (gerGbeanLocator.getGbeanLink() != null) {
             //exact match
             String linkName = gerGbeanLocator.getGbeanLink().trim();
             abstractNameQuery = buildAbstractNameQuery(null, null, linkName, j2eeType, null);
 
         } else {
-            GerPatternType patternType = gerGbeanLocator.getPattern();
+            PatternType patternType = gerGbeanLocator.getPattern();
             //construct name from components
             abstractNameQuery = buildAbstractNameQuery(patternType, j2eeType, null, null);
         }
@@ -49,35 +50,34 @@ public class ENCConfigBuilder {
         return abstractNameQuery;
     }
 
-    public static AbstractNameQuery buildAbstractNameQuery(GerPatternType pattern, String
type, String moduleType, Set interfaceTypes) {
+    public static AbstractNameQuery buildAbstractNameQuery(PatternType pattern, String type,
String moduleType, Collection<String> interfaceTypes) {
         return buildAbstractNameQueryFromPattern(pattern, "car", type, moduleType, interfaceTypes);
     }
-    
-    public static AbstractNameQuery buildAbstractNameQueryFromPattern(GerPatternType pattern,
String artifactType, String type, String moduleType, Set interfaceTypes)  {
-        String groupId = pattern.isSetGroupId() ? pattern.getGroupId().trim() : null;
-        String artifactid = pattern.isSetArtifactId() ? pattern.getArtifactId().trim() :
null;
-        String version = pattern.isSetVersion() ? pattern.getVersion().trim() : null;
-        String module = pattern.isSetModule() ? pattern.getModule().trim() : null;
+
+    public static AbstractNameQuery buildAbstractNameQueryFromPattern(PatternType pattern,
String artifactType, String type, String moduleType, Collection<String> interfaceTypes)
 {
+        String filter = pattern.getFilter();
+        String module = pattern.getModule();
         String name = pattern.getName().trim();
 
-        Artifact artifact = artifactid != null ? new Artifact(groupId, artifactid, version,
artifactType) : null;
-        Map nameMap = new HashMap();
-        nameMap.put("name", name);
-        if (type != null) {
-            nameMap.put("j2eeType", type);
-        }
-        if (module != null && moduleType != null) {
-            nameMap.put(moduleType, module);
-        }
-        if (interfaceTypes != null) {
-            Set trimmed = new HashSet();
-            for (Iterator it = interfaceTypes.iterator(); it.hasNext();) {
-                String intf = (String) it.next();
-                trimmed.add(intf == null ? null : intf.trim());
-            }
-            interfaceTypes = trimmed;
-        }
-        return new AbstractNameQuery(artifact, nameMap, interfaceTypes);
+        throw new IllegalArgumentException("OSGI not yet supported");
+//        Artifact artifact = artifactid != null ? new Artifact(groupId, artifactid, version,
artifactType) : null;
+//        Map nameMap = new HashMap();
+//        nameMap.put("name", name);
+//        if (type != null) {
+//            nameMap.put("j2eeType", type);
+//        }
+//        if (module != null && moduleType != null) {
+//            nameMap.put(moduleType, module);
+//        }
+//        if (interfaceTypes != null) {
+//            Set trimmed = new HashSet();
+//            for (Iterator it = interfaceTypes.iterator(); it.hasNext();) {
+//                String intf = (String) it.next();
+//                trimmed.add(intf == null ? null : intf.trim());
+//            }
+//            interfaceTypes = trimmed;
+//        }
+//        return new AbstractNameQuery(artifact, nameMap, interfaceTypes);
     }
 
     public static AbstractNameQuery buildAbstractNameQuery(Artifact configId, String module,
String name, String type, String moduleType) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Tue Apr 26 23:21:13 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.naming.deplo
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -27,28 +28,25 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.Resource;
-import javax.xml.namespace.QName;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
+import org.apache.geronimo.j2ee.deployment.model.naming.EnvEntryType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.naming.reference.ClassReference;
 import org.apache.geronimo.naming.reference.JndiReference;
 import org.apache.geronimo.naming.reference.KernelReference;
-import org.apache.geronimo.xbeans.geronimo.naming.GerEnvEntryDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerEnvEntryType;
 import org.apache.openejb.jee.EnvEntry;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
 import org.apache.openejb.jee.Text;
 import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +56,7 @@ import org.slf4j.LoggerFactory;
  */
 
 @GBean(j2eeType = NameFactory.MODULE_BUILDER)
-public class EnvironmentEntryBuilder extends AbstractNamingBuilder implements GBeanLifecycle
{
+public class EnvironmentEntryBuilder extends AbstractNamingBuilder {
 
     private static final Logger log = LoggerFactory.getLogger(EnvironmentEntryBuilder.class);
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String,
String>();
@@ -68,27 +66,27 @@ public class EnvironmentEntryBuilder ext
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.1", "http://geronimo.apache.org/xml/ns/naming-1.2");
     }
 
-    private static final QName GER_ENV_ENTRY_QNAME = GerEnvEntryDocument.type.getDocumentElementName();
-    private static final QNameSet GER_ENV_ENTRY_QNAME_SET = QNameSet.singleton(GER_ENV_ENTRY_QNAME);
-    private final QNameSet envEntryQNameSet;
+//    private static final QName GER_ENV_ENTRY_QNAME = GerEnvEntryDocument.type.getDocumentElementName();
+//    private static final QNameSet GER_ENV_ENTRY_QNAME_SET = QNameSet.singleton(GER_ENV_ENTRY_QNAME);
+//    private final QNameSet envEntryQNameSet;
 
     public EnvironmentEntryBuilder(@ParamAttribute(name = "eeNamespaces")String[] eeNamespaces)
{
-        envEntryQNameSet = buildQNameSet(eeNamespaces, "env-entry");
+//        envEntryQNameSet = buildQNameSet(eeNamespaces, "env-entry");
     }
 
-    public void doStart() throws Exception {
-        XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
-    }
-
-    public void doStop() {
-        XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
-    }
+//    public void doStart() throws Exception {
+//        XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+//    }
+//
+//    public void doStop() {
+//        XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+//    }
+
+//    public void doFail() {
+//        doStop();
+//    }
 
-    public void doFail() {
-        doStop();
-    }
-
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
 
         // Discover and process any @Resource annotations (if !metadata-complete)
         if ((module != null) && (module.getClassFinder() != null)) {
@@ -103,8 +101,8 @@ public class EnvironmentEntryBuilder ext
         }
 
         Bundle bundle = module.getEarContext().getDeploymentBundle();
-        XmlObject[] gerEnvEntryUntyped = plan == null ? NO_REFS : plan.selectChildren(GER_ENV_ENTRY_QNAME_SET);
-        Map<String, String> envEntryMap = mapEnvEntries(gerEnvEntryUntyped);
+        List<EnvEntryType> envEntries = plan == null ? Collections.<EnvEntryType>emptyList()
: plan.getEnvEntry();
+        Map<String, String> envEntryMap = mapEnvEntries(envEntries);
         for (Map.Entry<String, EnvEntry> entry : specDD.getEnvEntryMap().entrySet())
{
             String name = entry.getKey();
             EnvEntry envEntry = entry.getValue();
@@ -116,7 +114,7 @@ public class EnvironmentEntryBuilder ext
                 continue;
             }         
             
-            String type = getStringValue(envEntry.getEnvEntryType());
+            String type = envEntry.getEnvEntryType();
 
             Object value = null;
 
@@ -124,7 +122,7 @@ public class EnvironmentEntryBuilder ext
             String strValue = null;
             if (strValueOverride == null) {
                 strValue = envEntry.getEnvEntryValue();
-                String lookupName = getStringValue(envEntry.getLookupName());
+                String lookupName = envEntry.getLookupName();
                 if (strValue != null && lookupName != null) {
                     throw new DeploymentException("You must specify an environment entry
value or lookup name but not both. Component: " + module.toString() + ", name: " + name +
", env-entry-value: " + strValue + ", lookup-name: " + lookupName + "");
                 }
@@ -204,20 +202,17 @@ public class EnvironmentEntryBuilder ext
 
     }
 
-    private Map<String, String> mapEnvEntries(XmlObject[] refs) {
+    private Map<String, String> mapEnvEntries(List<EnvEntryType> refs) {
         Map<String, String> envEntryMap = new HashMap<String, String>();
-        if (refs != null) {
-            for (XmlObject ref1 : refs) {
-                GerEnvEntryType ref = (GerEnvEntryType) ref1.copy().changeType(GerEnvEntryType.type);
-                envEntryMap.put(getJndiName(ref.getEnvEntryName().trim()), ref.getEnvEntryValue());
-            }
+        for (EnvEntryType ref : refs) {
+            envEntryMap.put(getJndiName(ref.getEnvEntryName()), ref.getEnvEntryValue());
         }
         return envEntryMap;
     }
 
-    public QNameSet getSpecQNameSet() {
-        return envEntryQNameSet;
-    }
+//    public QNameSet getSpecQNameSet() {
+//        return envEntryQNameSet;
+//    }
 
     public QNameSet getPlanQNameSet() {
         return QNameSet.EMPTY;

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
Tue Apr 26 23:21:13 2011
@@ -17,30 +17,27 @@
 
 package org.apache.geronimo.naming.deployment;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.namespace.QName;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.model.naming.GbeanRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PatternType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.ClassLoading;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.naming.reference.GBeanReference;
-import org.apache.geronimo.xbeans.geronimo.naming.GerGbeanRefDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerGbeanRefType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 
 /**
@@ -48,26 +45,19 @@ import org.osgi.framework.Bundle;
  */
 @GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class GBeanRefBuilder extends AbstractNamingBuilder {
-    private static final QName GBEAN_REF_QNAME = GerGbeanRefDocument.type.getDocumentElementName();
-    private static final QNameSet GBEAN_REF_QNAME_SET = QNameSet.singleton(GBEAN_REF_QNAME);
 
     @Override
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
         if (plan == null) {
             return;
         }
-        XmlObject[] gbeanRefsUntyped = plan.selectChildren(GBEAN_REF_QNAME_SET);
-        for (XmlObject gbeanRefUntyped : gbeanRefsUntyped) {
-            GerGbeanRefType gbeanRef = (GerGbeanRefType) gbeanRefUntyped.copy().changeType(GerGbeanRefType.type);
-            if (gbeanRef == null) {
-                throw new DeploymentException("Could not read gbeanRef " + gbeanRefUntyped
+ " as the correct xml type");
-            }
-            GerPatternType[] gbeanLocatorArray = gbeanRef.getPatternArray();
+        List<GbeanRefType> gbeanRefsUntyped = plan.getGBeanRef();
+        for (GbeanRefType gbeanRef : gbeanRefsUntyped) {
+            List<PatternType> gbeanLocatorArray = gbeanRef.getPattern();
 
-            String[] interfaceTypesArray = gbeanRef.getRefTypeArray();
-            Set<String> interfaceTypes = new HashSet<String>(Arrays.asList(interfaceTypesArray));
+            List<String> interfaceTypes = gbeanRef.getRefType();
             Set<AbstractNameQuery> queries = new HashSet<AbstractNameQuery>();
-            for (GerPatternType patternType : gbeanLocatorArray) {
+            for (PatternType patternType : gbeanLocatorArray) {
                 AbstractNameQuery abstractNameQuery = ENCConfigBuilder.buildAbstractNameQuery(patternType,
null, null, interfaceTypes);
                 queries.add(abstractNameQuery);
             }
@@ -97,14 +87,14 @@ public class GBeanRefBuilder extends Abs
         }
     }
 
-    @Override
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    @Override
-    public QNameSet getPlanQNameSet() {
-        return GBEAN_REF_QNAME_SET;
-    }
+//    @Override
+//    public QNameSet getSpecQNameSet() {
+//        return QNameSet.EMPTY;
+//    }
+
+//    @Override
+//    public QNameSet getPlanQNameSet() {
+//        return GBEAN_REF_QNAME_SET;
+//    }
 
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
Tue Apr 26 23:21:13 2011
@@ -34,6 +34,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.annotation.LifecycleMethod;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -44,8 +45,6 @@ import org.apache.openejb.jee.JndiConsum
 import org.apache.openejb.jee.Lifecycle;
 import org.apache.openejb.jee.LifecycleCallback;
 import org.apache.xbean.finder.AbstractFinder;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
@@ -54,7 +53,7 @@ import org.apache.xmlbeans.XmlObject;
 public class LifecycleMethodBuilder extends AbstractNamingBuilder {
 
     @Override
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
         // skip ejb modules... they have already been processed
         //skip ears, they have no standalone components
 //        if (module.getType() == ConfigurationModuleType.EJB || module.getType() == ConfigurationModuleType.EAR)
{
@@ -140,14 +139,4 @@ public class LifecycleMethodBuilder exte
         return map;
     }
 
-    @Override
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    @Override
-    public QNameSet getPlanQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
Tue Apr 26 23:21:13 2011
@@ -17,11 +17,9 @@
 package org.apache.geronimo.naming.deployment;
 
 import java.util.Collection;
-import java.util.List;
 
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceRefType;
 import org.apache.openejb.jee.ResourceRef;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
 import org.apache.geronimo.common.DeploymentException;
 
 /**
@@ -29,6 +27,6 @@ import org.apache.geronimo.common.Deploy
  */
 public interface ResourceEnvironmentSetter {
 
-    void setResourceEnvironment(ResourceEnvironmentBuilder builder, Collection<ResourceRef>
resourceRefs, GerResourceRefType[] gerResourceRefs) throws DeploymentException;
+    void setResourceEnvironment(ResourceEnvironmentBuilder builder, Collection<ResourceRef>
resourceRefs, Collection<ResourceRefType> gerResourceRefs) throws DeploymentException;
 
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ServiceRefBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ServiceRefBuilder.java
Tue Apr 26 23:21:13 2011
@@ -24,15 +24,14 @@ import org.apache.geronimo.common.Deploy
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 
+import org.apache.geronimo.j2ee.deployment.model.naming.ServiceRefType;
 import org.apache.geronimo.kernel.repository.Environment;
 
-import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-
 import org.apache.openejb.jee.ServiceRef;
 
 public interface ServiceRefBuilder {
     void buildNaming(ServiceRef serviceRef,
-                     GerServiceRefType serviceRefType,
+                     ServiceRefType serviceRefType,
                      Module module,
                      Map<EARContext.Key, Object> componentContext) throws DeploymentException;
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
Tue Apr 26 23:21:13 2011
@@ -26,25 +26,22 @@ import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
-import javax.xml.namespace.QName;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
 import org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationHelper;
+import org.apache.geronimo.j2ee.deployment.model.naming.ServiceRefType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
 import org.apache.openejb.jee.ServiceRef;
 import org.apache.openejb.jee.Text;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,13 +50,13 @@ public class SwitchingServiceRefBuilder 
 
     private static final Logger log = LoggerFactory.getLogger(SwitchingServiceRefBuilder.class);
 
-    private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type
-            .getDocumentElementName();
+//    private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type
+//            .getDocumentElementName();
 
-    private static final QNameSet GER_SERVICE_REF_QNAME_SET = QNameSet
-            .singleton(GER_SERVICE_REF_QNAME);
+//    private static final QNameSet GER_SERVICE_REF_QNAME_SET = QNameSet
+//            .singleton(GER_SERVICE_REF_QNAME);
 
-    private final QNameSet serviceRefQNameSet;
+//    private final QNameSet serviceRefQNameSet;
 
     private final Collection jaxrpcBuilders;
 
@@ -71,11 +68,11 @@ public class SwitchingServiceRefBuilder 
         super(null);
         this.jaxrpcBuilders = jaxrpcBuilders;
         this.jaxwsBuilders = jaxwsBuilders;
-        this.serviceRefQNameSet = buildQNameSet(eeNamespaces, "service-ref");
+//        this.serviceRefQNameSet = buildQNameSet(eeNamespaces, "service-ref");
     }
 
     public void buildEnvironment(JndiConsumer specDD,
-            XmlObject plan,
+            JndiPlan plan,
             Environment environment)
             throws DeploymentException {
         if (this.jaxrpcBuilders != null && !this.jaxrpcBuilders.isEmpty()) {
@@ -87,7 +84,7 @@ public class SwitchingServiceRefBuilder 
     }
 
     public void buildNaming(JndiConsumer specDD,
-            XmlObject plan,
+            JndiPlan plan,
             Module module,
             Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
 
@@ -98,9 +95,9 @@ public class SwitchingServiceRefBuilder 
 
         Collection<ServiceRef> serviceRefs = specDD.getServiceRef();
 
-        XmlObject[] gerServiceRefsUntyped = plan == null ? NO_REFS : plan
-                .selectChildren(GER_SERVICE_REF_QNAME_SET);
-        Map<String, GerServiceRefType> serviceRefMap = mapServiceRefs(gerServiceRefsUntyped);
+        List<ServiceRefType> gerServiceRefsUntyped = plan == null ? Collections.<ServiceRefType>emptyList()
: plan
+                .getServiceRef();
+        Map<String, ServiceRefType> serviceRefMap = mapServiceRefs(gerServiceRefsUntyped);
 
         if (serviceRefs.size() > 0) {
             Bundle bundle = module.getEarContext().getDeploymentBundle();
@@ -109,8 +106,8 @@ public class SwitchingServiceRefBuilder 
 
             for (ServiceRef serviceRef : serviceRefs) {
 
-                String name = getStringValue(serviceRef.getServiceRefName());
-                GerServiceRefType gerServiceRefType = serviceRefMap.get(name);
+                String name = serviceRef.getServiceRefName();
+                ServiceRefType gerServiceRefType = serviceRefMap.get(name);
                 serviceRefMap.remove(name);
 
                 String serviceInterfaceName = serviceRef.getServiceInterface();
@@ -176,17 +173,13 @@ public class SwitchingServiceRefBuilder 
         }
     }
 
-    private Map<String, GerServiceRefType> mapServiceRefs(XmlObject[] refs) {
-        if (refs != null && refs.length > 0) {
-            Map<String, GerServiceRefType> refMap = new HashMap<String, GerServiceRefType>();
-            for (int i = 0; i < refs.length; i++) {
-                GerServiceRefType ref = (GerServiceRefType) refs[i].copy().changeType(GerServiceRefType.type);
+    private Map<String, ServiceRefType> mapServiceRefs(List<ServiceRefType> refs)
{
+        Map<String, ServiceRefType> refMap = new HashMap<String, ServiceRefType>();
+        for (ServiceRefType ref: refs) {
                 String serviceRefName = ref.getServiceRefName().trim();
                 refMap.put(serviceRefName, ref);
             }
             return refMap;
-        }
-        return Collections.<String, GerServiceRefType> emptyMap();
     }
 
     private void processAnnotations(JndiConsumer specDD, Module module) throws DeploymentException
{
@@ -202,14 +195,6 @@ public class SwitchingServiceRefBuilder 
         }
     }
 
-    public QNameSet getSpecQNameSet() {
-        return serviceRefQNameSet;
-    }
-
-    public QNameSet getPlanQNameSet() {
-        return GER_SERVICE_REF_QNAME_SET;
-    }
-
     public static class ServiceRefProcessor extends ResourceAnnotationHelper.ResourceProcessor
{
 
         public static final ServiceRefProcessor INSTANCE = new ServiceRefProcessor();

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
Tue Apr 26 23:21:13 2011
@@ -20,21 +20,19 @@ package org.apache.geronimo.naming.deplo
 import java.util.Map;
 
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
+@GBean
 public class UserTransactionRefBuilder extends AbstractNamingBuilder {
 
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
 //        EARContext rootContext = module.getRootEarContext();
 //        UserTransaction userTransaction = rootContext.getUserTransaction();
 //        if (userTransaction != null) {
@@ -43,23 +41,4 @@ public class UserTransactionRefBuilder e
 //        }
     }
 
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    public QNameSet getPlanQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(UserTransactionRefBuilder.class,
NameFactory.MODULE_BUILDER);
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
Tue Apr 26 23:21:13 2011
@@ -18,7 +18,6 @@
 
 <xsd:schema targetNamespace="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming-1.2"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified" version="1.0">
 
@@ -38,16 +37,16 @@
         </xsd:documentation>
     </xsd:annotation>
 
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
-        schemaLocation="geronimo-module-1.2.xsd">
-        <xsd:annotation>
-            <xsd:documentation>
-                Import Geronimo Services deployment plans, the imported plan
-                includes complex types like moduleType, environmentType,
-                dependenciesType, etc. required by this plan schema.
-            </xsd:documentation>
-        </xsd:annotation>
-    </xsd:import>
+    <!--<xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"-->
+        <!--schemaLocation="geronimo-module-1.2.xsd">-->
+        <!--<xsd:annotation>-->
+            <!--<xsd:documentation>-->
+                <!--Import Geronimo Services deployment plans, the imported plan-->
+                <!--includes complex types like moduleType, environmentType,-->
+                <!--dependenciesType, etc. required by this plan schema.-->
+            <!--</xsd:documentation>-->
+        <!--</xsd:annotation>-->
+    <!--</xsd:import>-->
 
     <xsd:element name="env-entry" type="gernaming:env-entryType">
         <xsd:annotation>
@@ -918,28 +917,10 @@
 
     <xsd:complexType name="patternType">
         <xsd:sequence>
-            <xsd:element name="groupId" type="xsd:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        The name for group containing module to match. By
-                        default is it considered wild card '*'.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="artifactId" type="xsd:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        The name for module in a specified group to be matched.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="version" type="xsd:string" minOccurs="0">
+            <xsd:element name="filter" type="xsd:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
-                        The version number for the module formatted by dot
-                        separated numbers. If no version is provided it will be
-                        defaulted latest available version matching other
-                        criterions.
+                        osgi filter for bundle containing external component
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
Tue Apr 26 23:21:13 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.naming.deplo
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.net.URI;
 import java.net.URL;
 import java.util.Arrays;
@@ -42,6 +43,9 @@ import org.apache.geronimo.j2ee.deployme
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
+import org.apache.geronimo.j2ee.deployment.model.app.ApplicationType;
+import org.apache.geronimo.j2ee.deployment.model.app.JaxbUtil;
+import org.apache.geronimo.j2ee.deployment.model.naming.EnvEntryType;
 import org.apache.geronimo.j2ee.jndi.JndiScope;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -132,64 +136,64 @@ public class EnvironmentEntryBuilderTest
             "</env-entry>" +
             "</web-app>";
 
-    private static final String TEST_PLAN = "<tmp xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">"
+
-            "<env-entry>" +
+    private static final String TEST_PLAN = "<application xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/application-2.0\">"
+
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>string</env-entry-name>" +
             "<env-entry-value>Goodbye World</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>char</env-entry-name>" +
             "<env-entry-value>K</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>byte</env-entry-name>" +
             "<env-entry-value>21</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>short</env-entry-name>" +
             "<env-entry-value>4321</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>int</env-entry-name>" +
             "<env-entry-value>87654321</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>long</env-entry-name>" +
             "<env-entry-value>6543210987654321</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>float</env-entry-name>" +
             "<env-entry-value>654.321</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>double</env-entry-name>" +
             "<env-entry-value>9876.54321</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>boolean</env-entry-name>" +
             "<env-entry-value>FALSE</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>class</env-entry-name>" +
             "<env-entry-type>java.lang.Class</env-entry-type>" +
             "<env-entry-value>java.net.URL</env-entry-value>" +
             "</env-entry>" +
 
-            "<env-entry>" +
+            "<env-entry xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
             "<env-entry-name>enum</env-entry-name>" +
             "<env-entry-type>java.util.concurrent.TimeUnit</env-entry-type>"
+
             "<env-entry-value>SECONDS</env-entry-value>" +
             "</env-entry>" +
-            "</tmp>";
+            "</application>";
 
     private Module module;
 
@@ -200,7 +204,7 @@ public class EnvironmentEntryBuilderTest
         BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(),
"", null, locations);
         Artifact id = new Artifact("test", "test", "", "car");
         module  = new ConnectorModule(false, new AbstractName(id, Collections.singletonMap("name",
"test")), null, null, null, "foo", null, null, null, null, null);
-        ConfigurationManager configurationManager = new MockConfigurationManager();
+//        ConfigurationManager configurationManager = new MockConfigurationManager();
         EARContext earContext = new EARContext(new File("foo"),
             null,
             new Environment(artifact),
@@ -265,14 +269,7 @@ public class EnvironmentEntryBuilderTest
         Boolean booleanVal = Boolean.FALSE;
 
         WebApp webApp = load(TEST, WebApp.class);
-        XmlObject plan = XmlObject.Factory.parse(TEST_PLAN);
-        XmlCursor cursor = plan.newCursor();
-        try {
-            cursor.toFirstChild();
-            plan = cursor.getObject();
-        } finally {
-            cursor.dispose();
-        }
+        ApplicationType plan = JaxbUtil.unmarshalApplication(new ByteArrayInputStream(TEST_PLAN.getBytes()),
false);
         environmentEntryBuilder.buildNaming(webApp, plan, module, componentContext);
         Context context = EnterpriseNamingContext.livenReferences(module.getJndiScope(JndiScope.comp),
null, null, getClass().getClassLoader(), null, "comp/");
         Set actual = new HashSet();
@@ -310,5 +307,17 @@ public class EnvironmentEntryBuilderTest
         }
     }
 
+    public void testMarshall() throws Exception {
+        ApplicationType  applicationType = new ApplicationType();
+        EnvEntryType envEntryType = new EnvEntryType();
+        envEntryType.setEnvEntryName("name");
+        envEntryType.setEnvEntryValue("value");
+        applicationType.getEnvEntry().add(envEntryType);
+        StringWriter writer = new StringWriter();
+        JaxbUtil.marshal(ApplicationType.class, applicationType, writer);
+        String s = writer.toString();
+        System.out.println(s);
+//        throw new Exception(s);
 
+    }
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java?rev=1096959&r1=1096958&r2=1096959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
Tue Apr 26 23:21:13 2011
@@ -28,7 +28,6 @@ import javax.enterprise.deploy.spi.excep
 
 import org.apache.geronimo.deployment.dconfigbean.DConfigBeanSupport;
 import org.apache.geronimo.deployment.service.jsr88.EnvironmentData;
-import org.apache.geronimo.naming.deployment.ENCHelper;
 import org.apache.geronimo.naming.deployment.jsr88.EjbLocalRef;
 import org.apache.geronimo.naming.deployment.jsr88.EjbRef;
 import org.apache.geronimo.naming.deployment.jsr88.MessageDestination;



Mime
View raw message