geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428838 - in /geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src: ./ java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Date Fri, 04 Aug 2006 18:36:53 GMT
Author: jdillon
Date: Fri Aug  4 11:36:53 2006
New Revision: 428838

URL: http://svn.apache.org/viewvc?rev=428838&view=rev
Log:
 r630@jason-dillons-computer (orig r427999):  jdillon | 2006-08-02 07:15:34 -0700
  r615@dyn456093 (orig r427714):  ammulder | 2006-08-01 13:32:17 -0700
  Merge GERONIMO-2261 and GERONIMO-2243 to trunk
  
 

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 11:36:53 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/naming-builder/src:427999

Modified: geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=428838&r1=428837&r2=428838&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Fri Aug  4 11:36:53 2006
@@ -22,6 +22,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -29,18 +30,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Arrays;
-
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.transaction.UserTransaction;
 import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.UnresolvedReferenceException;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.RefContext;
@@ -855,7 +852,6 @@
         return refMap;
     }
 
-    //TODO consider including target interface
     public static AbstractNameQuery buildAbstractNameQuery(GerPatternType pattern, String
type, String moduleType, Set interfaceTypes) {
         String groupId = pattern.isSetGroupId() ? pattern.getGroupId().trim() : null;
         String artifactid = pattern.isSetArtifactId() ? pattern.getArtifactId().trim() :
null;
@@ -871,6 +867,14 @@
         }
         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);
     }



Mime
View raw message