Author: dblevins Date: Thu May 27 21:03:52 2010 New Revision: 948999 URL: http://svn.apache.org/viewvc?rev=948999&view=rev Log: svn merge -r 948242:948243 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=948243&view=rev ------------------------------------------------------------------------ r948243 | djencks | 2010-05-25 16:03:16 -0700 (Tue, 25 May 2010) | 1 line OPENEJB-1014 remove a lot of incorrect/misleading java: prefixes when accessing local jndi rather than an initial context ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:03:52 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243 Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java Thu May 27 21:03:52 2010 @@ -198,8 +198,13 @@ public class InjectionProcessor<T> { public static Context unwrap(Context context) { if (context == null) return null; try { - context = (Context) context.lookup("java:comp/env/"); + context = (Context) context.lookup("comp/env/"); } catch (NamingException notAnIssue) { + //TODO figure out which clause should work and remove the other one. + try { + context = (Context) context.lookup("java:comp/env/"); + } catch (NamingException notAnIssue2) { + } } return context; Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java Thu May 27 21:03:52 2010 @@ -119,7 +119,7 @@ public abstract class BaseContext implem DeploymentInfo deploymentInfo = threadContext.getDeploymentInfo(); Context jndiEnc = deploymentInfo.getJndiEnc(); try { - jndiEnc = (Context) jndiEnc.lookup("java:comp/env"); + jndiEnc = (Context) jndiEnc.lookup("comp/env"); return jndiEnc.lookup(name); } catch (NamingException e) { throw new IllegalArgumentException(e); Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Thu May 27 21:03:52 2010 @@ -91,7 +91,7 @@ public class JpaCmpEngine implements Cmp private EntityManager getEntityManager(CoreDeploymentInfo deploymentInfo) { EntityManager entityManager = null; try { - entityManager = (EntityManager) deploymentInfo.getJndiEnc().lookup("java:comp/env/" + CMP_PERSISTENCE_CONTEXT_REF_NAME); + entityManager = (EntityManager) deploymentInfo.getJndiEnc().lookup("comp/env/" + CMP_PERSISTENCE_CONTEXT_REF_NAME); } catch (NamingException ignored) { //TODO see OPENEJB-1259 temporary hack until geronimo jndi integration works better try { Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java Thu May 27 21:03:52 2010 @@ -579,11 +579,11 @@ public class ManagedContainer implements SessionContext sessionContext; synchronized (this) { try { - sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext"); + sessionContext = (SessionContext) ctx.lookup("comp/EJBContext"); } catch (NamingException e1) { ManagedUserTransaction userTransaction = new ManagedUserTransaction(new EjbUserTransaction(), entityManagerRegistry); sessionContext = new ManagedContext(securityService, userTransaction); - ctx.bind("java:comp/EJBContext", sessionContext); + ctx.bind("comp/EJBContext", sessionContext); } } Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java Thu May 27 21:03:52 2010 @@ -182,10 +182,10 @@ public class MdbInstanceFactory { MdbContext mdbContext; synchronized(this) { try { - mdbContext = (MdbContext) ctx.lookup("java:comp/EJBContext"); + mdbContext = (MdbContext) ctx.lookup("comp/EJBContext"); } catch (NamingException e) { mdbContext = new MdbContext(securityService); - ctx.bind("java:comp/EJBContext",mdbContext); + ctx.bind("comp/EJBContext",mdbContext); } } @@ -257,7 +257,7 @@ public class MdbInstanceFactory { if (!injection.getTarget().isAssignableFrom(clazz)) continue; try { String jndiName = injection.getJndiName(); - Object object = context.lookup("java:comp/env/" + jndiName); + Object object = context.lookup("comp/env/" + jndiName); if (object instanceof String) { String string = (String) object; // Pass it in raw so it could be potentially converted to Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java Thu May 27 21:03:52 2010 @@ -143,11 +143,11 @@ public class SingletonInstanceManager { // This is a fix for GERONIMO-3444 synchronized(this){ try { - sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext"); + sessionContext = (SessionContext) ctx.lookup("comp/EJBContext"); } catch (NamingException e1) { sessionContext = createSessionContext(); // TODO: This should work - ctx.bind("java:comp/EJBContext", sessionContext); + ctx.bind("comp/EJBContext", sessionContext); } } @@ -160,11 +160,11 @@ public class SingletonInstanceManager { // This is a fix for GERONIMO-3444 synchronized(this){ try { - ctx.lookup("java:comp/WebServiceContext"); + ctx.lookup("comp/WebServiceContext"); } catch (NamingException e) { WebServiceContext wsContext; wsContext = new EjbWsContext(sessionContext); - ctx.bind("java:comp/WebServiceContext", wsContext); + ctx.bind("comp/WebServiceContext", wsContext); } } @@ -262,7 +262,7 @@ public class SingletonInstanceManager { if (!injection.getTarget().isAssignableFrom(clazz)) continue; try { String jndiName = injection.getJndiName(); - Object object = context.lookup("java:comp/env/" + jndiName); + Object object = context.lookup("comp/env/" + jndiName); String prefix; if (usePrefix) { prefix = injection.getTarget().getName() + "/"; Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Thu May 27 21:03:52 2010 @@ -590,11 +590,11 @@ public class StatefulContainer implement SessionContext sessionContext; synchronized (this) { try { - sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext"); + sessionContext = (SessionContext) ctx.lookup("comp/EJBContext"); } catch (NamingException e1) { StatefulUserTransaction userTransaction = new StatefulUserTransaction(new EjbUserTransaction(), entityManagerRegistry); sessionContext = new StatefulContext(securityService, userTransaction); - ctx.bind("java:comp/EJBContext", sessionContext); + ctx.bind("comp/EJBContext", sessionContext); } } Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?rev=948999&r1=948998&r2=948999&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Thu May 27 21:03:52 2010 @@ -173,11 +173,11 @@ public class StatelessInstanceManager { // This is a fix for GERONIMO-3444 synchronized(this){ try { - sessionContext = (SessionContext) ctx.lookup("java:comp/EJBContext"); + sessionContext = (SessionContext) ctx.lookup("comp/EJBContext"); } catch (NamingException e1) { sessionContext = createSessionContext(deploymentInfo); // TODO: This should work - ctx.bind("java:comp/EJBContext", sessionContext); + ctx.bind("comp/EJBContext", sessionContext); } } if (SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) { @@ -189,10 +189,10 @@ public class StatelessInstanceManager { // This is a fix for GERONIMO-3444 synchronized(this){ try { - ctx.lookup("java:comp/WebServiceContext"); + ctx.lookup("comp/WebServiceContext"); } catch (NamingException e) { WebServiceContext wsContext = new EjbWsContext(sessionContext); - ctx.bind("java:comp/WebServiceContext", wsContext); + ctx.bind("comp/WebServiceContext", wsContext); } } @@ -279,7 +279,7 @@ public class StatelessInstanceManager { if (!injection.getTarget().isAssignableFrom(clazz)) continue; try { String jndiName = injection.getJndiName(); - Object object = context.lookup("java:comp/env/" + jndiName); + Object object = context.lookup("comp/env/" + jndiName); String prefix; if (usePrefix) { prefix = injection.getTarget().getName() + "/"; Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:03:52 2010 @@ -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:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:03:52 2010 @@ -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:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243
