From scm-return-5766-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Dec 02 22:30:29 2004 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 6026 invoked from network); 2 Dec 2004 22:30:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Dec 2004 22:30:29 -0000 Received: (qmail 38946 invoked by uid 500); 2 Dec 2004 22:30:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 38930 invoked by uid 500); 2 Dec 2004 22:30:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 38914 invoked by uid 99); 2 Dec 2004 22:30:28 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 02 Dec 2004 14:30:27 -0800 Received: (qmail 6007 invoked by uid 65534); 2 Dec 2004 22:30:26 -0000 Date: 2 Dec 2004 22:30:26 -0000 Message-ID: <20041202223026.6003.qmail@minotaur.apache.org> From: djencks@apache.org To: scm@geronimo.apache.org Subject: svn commit: r109574 - /geronimo/branches/djencks/jetty-deployer1/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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);