You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/05/27 23:03:52 UTC
svn commit: r948999 - in /openejb/branches/openejb-3.1.x: ./
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apache/openejb/core/
container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/ co...
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
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Blevins <da...@visi.com>.
On Jun 7, 2010, at 6:40 PM, Shawn Jiang wrote:
> Got it, thanks !
>
> I know I need to build it locally to resolve critical. But I still think it
> would be better that latest snapshots could be pushed automatically. : )
Absolutely! You figure out how to do it for Geronimo and I'll copy your setup ;-)
-David
>
> On Mon, Jun 7, 2010 at 12:35 PM, David Blevins <da...@visi.com>wrote:
>
>>
>> On Jun 6, 2010, at 7:25 PM, Shawn Jiang wrote:
>>
>>> Will you try writing the ICFB in Geronimo ? This problem is still a
>> blocker
>>> for geronimo 221 release.
>>>
>>> Or can we revert this change until geronimo 221 is released ?
>>
>> Hi Shawn!
>>
>> That change was reverted Friday, so we should be good. Note, OpenEJB and
>> Geronimo don't have any system setup for publishing snapshots automatically,
>> so it's best to build from source if doing any critical work.
>>
>> Quickest way to build is:
>>
>> svn co https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
>> cd openejb-3.1.x
>> mvn clean install -Dmaven.test.skip=true
>>
>>
>> -David
>>
>>
>
>
> --
> Shawn
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by Shawn Jiang <ge...@gmail.com>.
Got it, thanks !
I know I need to build it locally to resolve critical. But I still think it
would be better that latest snapshots could be pushed automatically. : )
On Mon, Jun 7, 2010 at 12:35 PM, David Blevins <da...@visi.com>wrote:
>
> On Jun 6, 2010, at 7:25 PM, Shawn Jiang wrote:
>
> > Will you try writing the ICFB in Geronimo ? This problem is still a
> blocker
> > for geronimo 221 release.
> >
> > Or can we revert this change until geronimo 221 is released ?
>
> Hi Shawn!
>
> That change was reverted Friday, so we should be good. Note, OpenEJB and
> Geronimo don't have any system setup for publishing snapshots automatically,
> so it's best to build from source if doing any critical work.
>
> Quickest way to build is:
>
> svn co https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
> cd openejb-3.1.x
> mvn clean install -Dmaven.test.skip=true
>
>
> -David
>
>
--
Shawn
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Blevins <da...@visi.com>.
On Jun 9, 2010, at 10:29 PM, Stephen Connolly wrote:
> mvn clean install -DskipTests
> is shorter to type
Cool, I didn't even know that was an option. Thanks!
-David
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by Stephen Connolly <st...@gmail.com>.
On 7 June 2010 05:35, David Blevins <da...@visi.com> wrote:
>
> On Jun 6, 2010, at 7:25 PM, Shawn Jiang wrote:
>
> > Will you try writing the ICFB in Geronimo ? This problem is still a
> blocker
> > for geronimo 221 release.
> >
> > Or can we revert this change until geronimo 221 is released ?
>
> Hi Shawn!
>
> That change was reverted Friday, so we should be good. Note, OpenEJB and
> Geronimo don't have any system setup for publishing snapshots automatically,
> so it's best to build from source if doing any critical work.
>
> Quickest way to build is:
>
> svn co https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
> cd openejb-3.1.x
> mvn clean install -Dmaven.test.skip=true
>
mvn clean install -DskipTests
is shorter to type
>
>
> -David
>
>
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Blevins <da...@visi.com>.
On Jun 6, 2010, at 7:25 PM, Shawn Jiang wrote:
> Will you try writing the ICFB in Geronimo ? This problem is still a blocker
> for geronimo 221 release.
>
> Or can we revert this change until geronimo 221 is released ?
Hi Shawn!
That change was reverted Friday, so we should be good. Note, OpenEJB and Geronimo don't have any system setup for publishing snapshots automatically, so it's best to build from source if doing any critical work.
Quickest way to build is:
svn co https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
cd openejb-3.1.x
mvn clean install -Dmaven.test.skip=true
-David
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by Shawn Jiang <ge...@gmail.com>.
On Wed, Jun 2, 2010 at 7:24 AM, David Jencks <da...@yahoo.com> wrote:
>
> On Jun 1, 2010, at 1:48 PM, David Blevins wrote:
>
> >
> > On Jun 1, 2010, at 7:06 AM, Kevan Miller wrote:
> >
> >>
> >> On May 27, 2010, at 5:03 PM, dblevins@apache.org wrote:
> >>
> >>> 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
> >>
> >> David,
> >> This is going to break Geronimo 2.2.x. The associated jndi changes that
> make this possible are only in Geronimo 3.0. So, we either need to revert to
> previous (admittedly faulty) functionality or do a fair amount of work to
> have Geronimo 2.2.1-SNAPSHOT behave properly.
> >
> > Side note, IMO, not supporting it is a failure.
>
> I agree, we would be working around a long-standing bug in geronimo 2.2. I
> was really glad to fix it in trunk and then fix openejb.
>
> To fix it in geronimo, we need an InitialContextFactoryBuilder modeled on
> the aries one, but using gbeans instead of osgi services. This would only
> take an hour or two to write. However it may cause a fair amount of
> upheaval to get it properly installed and configured. I don't have a lot of
> time to spend on this right now, maybe I should try writing the ICFB and we
> can see how hard it is to get it to work.
>
David,
Will you try writing the ICFB in Geronimo ? This problem is still a blocker
for geronimo 221 release.
Or can we revert this change until geronimo 221 is released ?
>
> david jencks
>
> >
> >>
> >> Was there a strong motivation to merge this back into 3.1.x?
> >
> > No, was just trying to keep them in sync where possible.
> >
> > Are we seeing failures due to this?
> >
> >
> > -David
> >
>
>
--
Shawn
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Jencks <da...@yahoo.com>.
On Jun 1, 2010, at 5:00 PM, Kevan Miller wrote:
>
> On Jun 1, 2010, at 7:24 PM, David Jencks wrote:
>
>>> Side note, IMO, not supporting it is a failure.
>>
>> I agree, we would be working around a long-standing bug in geronimo 2.2. I was really glad to fix it in trunk and then fix openejb.
>>
>> To fix it in geronimo, we need an InitialContextFactoryBuilder modeled on the aries one, but using gbeans instead of osgi services. This would only take an hour or two to write. However it may cause a fair amount of upheaval to get it properly installed and configured. I don't have a lot of time to spend on this right now, maybe I should try writing the ICFB and we can see how hard it is to get it to work.
>
> Ya. I think we all agree in principal. It's the "fair amount of upheaval" that I'm worried about... I haven't seen this causing issues for users. So, haven't been particularly motivated to fix. Esp since it's fixed in G 3.0/OEJB 3.2 and likely to cause issues on the G 2.2.1 codebase... Seems like we may be as likely to create new problems as fix old ones...
That's what I thought at first, but we've already experienced significant problems from not fixing geronimo 2.2.... dblevins very sensibly ported the openejb fix to the openejb branch and broke g, and you spent a bunch of time before hunting me down..... I'm not sure we can reliably prevent fixing this bug in openejb branch forever :-) Maybe we should try fixing g and see how hard it is.
david jencks
>
> --kevan
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by Kevan Miller <ke...@gmail.com>.
On Jun 1, 2010, at 7:24 PM, David Jencks wrote:
>> Side note, IMO, not supporting it is a failure.
>
> I agree, we would be working around a long-standing bug in geronimo 2.2. I was really glad to fix it in trunk and then fix openejb.
>
> To fix it in geronimo, we need an InitialContextFactoryBuilder modeled on the aries one, but using gbeans instead of osgi services. This would only take an hour or two to write. However it may cause a fair amount of upheaval to get it properly installed and configured. I don't have a lot of time to spend on this right now, maybe I should try writing the ICFB and we can see how hard it is to get it to work.
Ya. I think we all agree in principal. It's the "fair amount of upheaval" that I'm worried about... I haven't seen this causing issues for users. So, haven't been particularly motivated to fix. Esp since it's fixed in G 3.0/OEJB 3.2 and likely to cause issues on the G 2.2.1 codebase... Seems like we may be as likely to create new problems as fix old ones...
--kevan
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Jencks <da...@yahoo.com>.
On Jun 1, 2010, at 1:48 PM, David Blevins wrote:
>
> On Jun 1, 2010, at 7:06 AM, Kevan Miller wrote:
>
>>
>> On May 27, 2010, at 5:03 PM, dblevins@apache.org wrote:
>>
>>> 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
>>
>> David,
>> This is going to break Geronimo 2.2.x. The associated jndi changes that make this possible are only in Geronimo 3.0. So, we either need to revert to previous (admittedly faulty) functionality or do a fair amount of work to have Geronimo 2.2.1-SNAPSHOT behave properly.
>
> Side note, IMO, not supporting it is a failure.
I agree, we would be working around a long-standing bug in geronimo 2.2. I was really glad to fix it in trunk and then fix openejb.
To fix it in geronimo, we need an InitialContextFactoryBuilder modeled on the aries one, but using gbeans instead of osgi services. This would only take an hour or two to write. However it may cause a fair amount of upheaval to get it properly installed and configured. I don't have a lot of time to spend on this right now, maybe I should try writing the ICFB and we can see how hard it is to get it to work.
david jencks
>
>>
>> Was there a strong motivation to merge this back into 3.1.x?
>
> No, was just trying to keep them in sync where possible.
>
> Are we seeing failures due to this?
>
>
> -David
>
Re: java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by Kevan Miller <ke...@gmail.com>.
On Jun 1, 2010, at 4:48 PM, David Blevins wrote:
>
> On Jun 1, 2010, at 7:06 AM, Kevan Miller wrote:
>
>>
>> On May 27, 2010, at 5:03 PM, dblevins@apache.org wrote:
>>
>>> 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
>>
>> David,
>> This is going to break Geronimo 2.2.x. The associated jndi changes that make this possible are only in Geronimo 3.0. So, we either need to revert to previous (admittedly faulty) functionality or do a fair amount of work to have Geronimo 2.2.1-SNAPSHOT behave properly.
>
> Side note, IMO, not supporting it is a failure.
>
>>
>> Was there a strong motivation to merge this back into 3.1.x?
>
> No, was just trying to keep them in sync where possible.
>
> Are we seeing failures due to this?
Yes. Running a simple JMS test fails with the following:
javax.naming.NameNotFoundException: comp
at org.apache.xbean.naming.context.AbstractContext.lookup(AbstractContext.java:167)
at org.apache.xbean.naming.context.AbstractContext.lookup(AbstractContext.java:619)
at org.apache.xbean.naming.context.AbstractContext.lookupFinalContext(AbstractContext.java:196)
at org.apache.xbean.naming.context.AbstractContext.addDeepBinding(AbstractContext.java:241)
at org.apache.xbean.naming.context.AbstractContext.bind(AbstractContext.java:660)
at org.apache.xbean.naming.context.AbstractContext.bind(AbstractContext.java:651)
at org.apache.openejb.core.mdb.MdbInstanceFactory.constructBean(MdbInstanceFactory.java:188)
at org.apache.openejb.core.mdb.MdbInstanceFactory.createInstance(MdbInstanceFactory.java:112)
at org.apache.openejb.core.mdb.EndpointHandler.<init>(EndpointHandler.java:79)
at org.apache.openejb.core.mdb.EndpointFactory.createEndpoint(EndpointFactory.java:67)
at org.apache.activemq.ra.ServerSessionPoolImpl.createEndpoint(ServerSessionPoolImpl.java:92)
at org.apache.activemq.ra.ServerSessionPoolImpl.createServerSessionImpl(ServerSessionPoolImpl.java:76)
at org.apache.activemq.ra.ServerSessionPoolImpl.getServerSession(ServerSessionPoolImpl.java:116)
at org.apache.activemq.ActiveMQConnectionConsumer.dispatch(ActiveMQConnectionConsumer.java:129)
at org.apache.activemq.ActiveMQConnection$2.processMessageDispatch(ActiveMQConnection.java:1707)
at org.apache.activemq.command.MessageDispatch.visit(MessageDispatch.java:108)
at org.apache.activemq.ActiveMQConnection.onCommand(ActiveMQConnection.java:1688)
at org.apache.activemq.transport.ResponseCorrelator.onCommand(ResponseCorrelator.java:116)
at org.apache.activemq.transport.TransportFilter.onCommand(TransportFilter.java:69)
at org.apache.activemq.transport.TransportFilter.onCommand(TransportFilter.java:69)
at org.apache.activemq.transport.fanout.FanoutTransport.transportListenerOnCommand(FanoutTransport.java:581)
at org.apache.activemq.transport.fanout.FanoutTransport$FanoutTransportHandler.onCommand(FanoutTransport.java:127)
at org.apache.activemq.transport.WireFormatNegotiator.onCommand(WireFormatNegotiator.java:113)
at org.apache.activemq.transport.InactivityMonitor.onCommand(InactivityMonitor.java:217)
at org.apache.activemq.transport.TransportSupport.doConsume(TransportSupport.java:83)
at org.apache.activemq.transport.tcp.TcpTransport.doRun(TcpTransport.java:219)
at org.apache.activemq.transport.tcp.TcpTransport.run(TcpTransport.java:201)
at java.lang.Thread.run(Thread.java:637)
Running the Geronimo Integration Tests will show a fair number of failures, also...
--kevan
java: prefixes in 3.1.x (was Re: svn commit: r948999)
Posted by David Blevins <da...@visi.com>.
On Jun 1, 2010, at 7:06 AM, Kevan Miller wrote:
>
> On May 27, 2010, at 5:03 PM, dblevins@apache.org wrote:
>
>> 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
>
> David,
> This is going to break Geronimo 2.2.x. The associated jndi changes that make this possible are only in Geronimo 3.0. So, we either need to revert to previous (admittedly faulty) functionality or do a fair amount of work to have Geronimo 2.2.1-SNAPSHOT behave properly.
Side note, IMO, not supporting it is a failure.
>
> Was there a strong motivation to merge this back into 3.1.x?
No, was just trying to keep them in sync where possible.
Are we seeing failures due to this?
-David
Re: svn commit: r948999 - in /openejb/branches/openejb-3.1.x: ./ container/openejb-core/src/main/java/org/apache/openejb/ container/openejb-core/src/main/java/org/apache/openejb/core/ container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/ co...
Posted by Kevan Miller <ke...@gmail.com>.
On May 27, 2010, at 5:03 PM, dblevins@apache.org wrote:
> 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
David,
This is going to break Geronimo 2.2.x. The associated jndi changes that make this possible are only in Geronimo 3.0. So, we either need to revert to previous (admittedly faulty) functionality or do a fair amount of work to have Geronimo 2.2.1-SNAPSHOT behave properly.
Was there a strong motivation to merge this back into 3.1.x?
--kevan
> ------------------------------------------------------------------------
>
> 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
>
>