Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 14966 invoked from network); 9 Sep 2005 06:42:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Sep 2005 06:42:20 -0000 Received: (qmail 65594 invoked by uid 500); 9 Sep 2005 06:42:19 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 65575 invoked by uid 500); 9 Sep 2005 06:42:18 -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 List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 65562 invoked by uid 99); 9 Sep 2005 06:42:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2005 23:42:18 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 08 Sep 2005 23:42:30 -0700 Received: (qmail 14754 invoked by uid 65534); 9 Sep 2005 06:42:17 -0000 Message-ID: <20050909064217.14753.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r279717 - in /geronimo/trunk/modules: j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ naming-builder/src/java/org/apache/geronimo/naming/deployment/ naming-builder/src/test/org/apache/geronimo/naming/ naming-builder/src/test/org/... Date: Fri, 09 Sep 2005 06:42:16 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Sep 8 23:42:11 2005 New Revision: 279717 URL: http://svn.apache.org/viewcvs?rev=279717&view=rev Log: GERONIMO-989 Make app client css-links work. Also remove an NPE possibility Added: geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/ geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java - copied, changed from r279608, geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/MessageDestinationTest.java Removed: geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/MessageDestinationTest.java Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?rev=279717&r1=279716&r2=279717&view=diff ============================================================================== --- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java (original) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java Thu Sep 8 23:42:11 2005 @@ -259,7 +259,7 @@ private GBeanData locateComponentInModule(String resourceLink, URI moduleURI, String moduleType, String type, J2eeContext j2eeContext, String queryType, NamingContext context) throws UnresolvedReferenceException { GBeanData match; String name = resourceLink.substring(resourceLink.lastIndexOf('#') + 1); - String module = moduleURI.getPath(); + String module = moduleURI == null? "": moduleURI.getPath(); if (resourceLink.indexOf('#') > -1) { //presence of # means they explicitly want only gbeans in specified module in this application. Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=279717&r1=279716&r2=279717&view=diff ============================================================================== --- geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original) +++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Thu Sep 8 23:42:11 2005 @@ -165,7 +165,7 @@ } - public static void addEnvEntries(EnvEntryType[] envEntries, ComponentContextBuilder builder, ClassLoader classLoader) throws DeploymentException { + static void addEnvEntries(EnvEntryType[] envEntries, ComponentContextBuilder builder, ClassLoader classLoader) throws DeploymentException { for (int i = 0; i < envEntries.length; i++) { EnvEntryType envEntry = envEntries[i]; String name = getStringValue(envEntry.getEnvEntryName()); @@ -182,7 +182,7 @@ } - public static void addResourceRefs(EARContext earContext, URI moduleURI, ResourceRefType[] resourceRefs, Map refMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addResourceRefs(EARContext earContext, URI moduleURI, ResourceRefType[] resourceRefs, Map refMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { if (refMap == null) { refMap = Collections.EMPTY_MAP; } @@ -264,7 +264,7 @@ return containerId; } - public static void addResourceEnvRefs(EARContext earContext, ResourceEnvRefType[] resourceEnvRefArray, Map refMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addResourceEnvRefs(EARContext earContext, ResourceEnvRefType[] resourceEnvRefArray, Map refMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { if (refMap == null) { refMap = Collections.EMPTY_MAP; } @@ -331,7 +331,7 @@ return containerId; } - public static void addMessageDestinationRefs(RefContext refContext, NamingContext namingContext, MessageDestinationRefType[] messageDestinationRefs, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addMessageDestinationRefs(RefContext refContext, NamingContext namingContext, MessageDestinationRefType[] messageDestinationRefs, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { for (int i = 0; i < messageDestinationRefs.length; i++) { MessageDestinationRefType messageDestinationRef = messageDestinationRefs[i]; String name = getStringValue(messageDestinationRef.getMessageDestinationRefName()); @@ -358,7 +358,7 @@ linkName = destination.getAdminObjectLink().trim(); } } else { - //well, we know for sure an admin object is not going to be defined in a modules that can have a message-destination + //well, we know for sure an admin object is not going to be defined in a modules that can have a message-destination int pos = linkName.indexOf('#'); if (pos > -1) { linkName = linkName.substring(pos + 1); @@ -375,7 +375,7 @@ } - public static void addEJBRefs(NamingContext ejbContext, RefContext refContext, URI moduleURI, EjbRefType[] ejbRefs, Map ejbRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addEJBRefs(NamingContext earContext, NamingContext ejbContext, RefContext refContext, URI moduleURI, EjbRefType[] ejbRefs, Map ejbRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { J2eeContext j2eeContext = ejbContext.getJ2eeContext(); for (int i = 0; i < ejbRefs.length; i++) { EjbRefType ejbRef = ejbRefs[i]; @@ -418,7 +418,7 @@ String cssLink = remoteRef.getCssLink().trim(); //TODO is this correct? String moduleType = null; - cssBean = refContext.locateComponentName(cssLink, moduleURI, moduleType, NameFactory.CORBA_CSS, j2eeContext, ejbContext, "css gbean"); + cssBean = refContext.locateComponentName(cssLink, moduleURI, moduleType, NameFactory.CORBA_CSS, earContext.getJ2eeContext(), earContext, "css gbean"); } else { GerCssType css = remoteRef.getCss(); cssBean = NameFactory.getComponentName(getStringValue(css.getDomain()), @@ -427,7 +427,7 @@ getStringValue(css.getModule()), getStringValue(css.getName()), getStringValue(NameFactory.CORBA_CSS), - j2eeContext); + earContext.getJ2eeContext()); } ejbReference = refContext.getCORBARemoteRef(new URI(getStringValue(remoteRef.getNsCorbaloc())), getStringValue(remoteRef.getName()), @@ -462,7 +462,7 @@ } } - public static void addEJBLocalRefs(NamingContext ejbContext, RefContext refContext, URI moduleURI, EjbLocalRefType[] ejbLocalRefs, Map ejbLocalRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addEJBLocalRefs(NamingContext ejbContext, RefContext refContext, URI moduleURI, EjbLocalRefType[] ejbLocalRefs, Map ejbLocalRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { J2eeContext j2eeContext = ejbContext.getJ2eeContext(); for (int i = 0; i < ejbLocalRefs.length; i++) { EjbLocalRefType ejbLocalRef = ejbLocalRefs[i]; @@ -515,7 +515,7 @@ } //TODO current implementation does not deal with portComponentRef links. - public static void addServiceRefs(EARContext earContext, Module module, ServiceRefType[] serviceRefs, Map serviceRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { + static void addServiceRefs(EARContext earContext, Module module, ServiceRefType[] serviceRefs, Map serviceRefMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException { RefContext refContext = earContext.getRefContext(); @@ -752,7 +752,7 @@ RefContext refContext = earContext.getRefContext(); // ejb-ref - addEJBRefs(ejbContext, refContext, moduleURI, ejbRefs, mapEjbRefs(gerEjbRefs), cl, builder); + addEJBRefs(earContext, ejbContext, refContext, moduleURI, ejbRefs, mapEjbRefs(gerEjbRefs), cl, builder); // ejb-local-ref addEJBLocalRefs(ejbContext, refContext, moduleURI, ejbLocalRefs, mapEjbLocalRefs(gerEjbLocalRef), cl, builder); Copied: geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java (from r279608, geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/MessageDestinationTest.java) URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java?p2=geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java&p1=geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/MessageDestinationTest.java&r1=279608&r2=279717&rev=279717&view=diff ============================================================================== --- geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/MessageDestinationTest.java (original) +++ geronimo/trunk/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java Thu Sep 8 23:42:11 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.geronimo.naming; +package org.apache.geronimo.naming.deployment; import java.net.URI; import java.util.Map;