geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r109574 - /geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Date Thu, 02 Dec 2004 22:30:26 GMT
Author: djencks
Date: Thu Dec  2 14:30:25 2004
New Revision: 109574

URL: http://svn.apache.org/viewcvs?view=rev&rev=109574
Log:
don't try to look for object names for urls
Modified:
   geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java

Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=diff&rev=109574&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r1=109573&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java&r2=109574
==============================================================================
--- geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Thu Dec  2 14:30:25 2004
@@ -394,13 +394,16 @@
         Set applicationManagedSecurityResources = new HashSet();
         for (int i = 0; i < resourceRefs.length; i++) {
             ResourceRefType resourceRefType = resourceRefs[i];
-            GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(resourceRefType.getResRefName().getStringValue());
-            String containerId = getResourceContainerId(getJ2eeStringValue(resourceRefType.getResRefName()),
uri, gerResourceRef, refContext, j2eeContext);
-            if ("Unshareable".equals(getJ2eeStringValue(resourceRefType.getResSharingScope())))
{
-                unshareableResources.add(containerId);
-            }
-            if ("Application".equals(getJ2eeStringValue(resourceRefType.getResAuth()))) {
-                applicationManagedSecurityResources.add(containerId);
+
+            if (!URL.class.getName().equals(resourceRefType.getResType().getStringValue().trim()))
{
+                GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(resourceRefType.getResRefName().getStringValue());
+                String containerId = getResourceContainerId(getJ2eeStringValue(resourceRefType.getResRefName()),
uri, gerResourceRef, refContext, j2eeContext);
+                if ("Unshareable".equals(getJ2eeStringValue(resourceRefType.getResSharingScope())))
{
+                    unshareableResources.add(containerId);
+                }
+                if ("Application".equals(getJ2eeStringValue(resourceRefType.getResAuth())))
{
+                    applicationManagedSecurityResources.add(containerId);
+                }
             }
         }
         builder.setUnshareableResources(unshareableResources);

Mime
View raw message