Author: dblevins Date: Sat Oct 10 09:00:33 2009 New Revision: 823824 URL: http://svn.apache.org/viewvc?rev=823824&view=rev Log: Merging r823667 - http://svn.apache.org/viewvc?rev=823667&view=rev
svn merge -r 823666:823667 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r823667 | dblevins | 2009-10-09 12:11:24 -0700 (Fri, 09 Oct 2009) | 2 lines Tightened up naming and jndi strategy code to disallow custom prefixes ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.2/ (props changed) openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:33 2009 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:823293,823642 +/openejb/trunk/openejb3:823293,823642,823667 Modified: openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=823824&r1=823823&r2=823824&view=diff ============================================================================== --- openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original) +++ openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Sat Oct 10 09:00:33 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<String, EnterpriseBeanInfo>(); Modified: openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=823824&r1=823823&r2=823824&view=diff ============================================================================== --- openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original) +++ openejb/branches/openejb-3.1.2/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Sat Oct 10 09:00:33 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 Propchange: openejb/branches/openejb-3.1.2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:33 2009 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:823293,823642 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:823293,823642,823667 Propchange: openejb/branches/openejb-3.1.2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 10 09:00:33 2009 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:823293,823642 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:823293,823642,823667
