Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 29880 invoked from network); 9 Oct 2009 19:11:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Oct 2009 19:11:50 -0000 Received: (qmail 17538 invoked by uid 500); 9 Oct 2009 19:11:50 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 17516 invoked by uid 500); 9 Oct 2009 19:11:50 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 17499 invoked by uid 99); 9 Oct 2009 19:11:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2009 19:11:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2009 19:11:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BC3CA23888C2; Fri, 9 Oct 2009 19:11:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r823667 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/JndiBuilder.java core/ivm/naming/IvmContext.java Date: Fri, 09 Oct 2009 19:11:25 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091009191125.BC3CA23888C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Fri Oct 9 19:11:24 2009 New Revision: 823667 URL: http://svn.apache.org/viewvc?rev=823667&view=rev Log: Tightened up naming and jndi strategy code to disallow custom prefixes Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=823667&r1=823666&r2=823667&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Fri Oct 9 19:11:24 2009 @@ -178,6 +178,14 @@ format = options.get(JNDINAME_FORMAT, "{deploymentId}{interfaceType.annotationName}"); + { // illegal format check + int index = format.indexOf(":"); + if (index > -1) { + logger.error("Illegal " + JNDINAME_FORMAT + " contains a colon ':'. Everything before the colon will be removed, '" + format + "' "); + format = format.substring(index + 1); + } + } + this.template = new StringTemplate(format); beanInfos = new HashMap(); Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=823667&r1=823666&r2=823667&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Fri Oct 9 19:11:24 2009 @@ -115,9 +115,7 @@ if (prefix.equals("openejb")){ path = name.path(); return openejbURLContextFactory.getContext().lookup(path); - } - - if (prefix.equals("java")){ + } else if (prefix.equals("java")){ if (name.getComponent().equals("openejb")){ path = name.remaining().path(); return openejbURLContextFactory.getContext().lookup(path); @@ -125,13 +123,10 @@ path = name.path(); return javaURLContextFactory.getContext().lookup(path); } + } else { + // we don't know what the prefix means, throw an exception + throw new NamingException("Unknown JNDI name prefix '"+prefix +":'"); } - - // we don't know what the prefix means, default to JNDI - - InitialContext initialContext = new InitialContext(); - return initialContext.lookup(compositName); - } else { /* the resolve method always starts with the comparison assuming that the first