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 2007/01/19 15:41:48 UTC
svn commit: r497833 - in /incubator/openejb/trunk/openejb3: ./
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
conta...
Author: dblevins
Date: Fri Jan 19 06:41:45 2007
New Revision: 497833
URL: http://svn.apache.org/viewvc?view=rev&rev=497833
Log:
Allow xbean-naming to be the JNDI Enc implementation
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
incubator/openejb/trunk/openejb3/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Jan 19 06:41:45 2007
@@ -242,6 +242,10 @@
<artifactId>xbean-finder</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JndiTxReference.java Fri Jan 19 06:41:45 2007
@@ -28,7 +28,7 @@
See the init( ) method of the CastorCMP11_EntityContainer.
*/
-public class JndiTxReference implements Reference {
+public class JndiTxReference extends Reference {
private final TransactionManager transactionManager;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Fri Jan 19 06:41:45 2007
@@ -22,19 +22,21 @@
import org.apache.openejb.persistence.JtaEntityManagerRegistry;
import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
-import org.apache.openejb.core.ivm.naming.IvmContext;
import org.apache.openejb.core.ivm.naming.JndiReference;
-import org.apache.openejb.core.ivm.naming.NameNode;
-import org.apache.openejb.core.ivm.naming.ParsedName;
import org.apache.openejb.core.ivm.naming.PersistenceUnitReference;
import org.apache.openejb.core.ivm.naming.Reference;
import org.apache.openejb.core.ivm.naming.PersistenceContextReference;
import org.apache.openejb.core.ivm.naming.JndiUrlReference;
+import org.apache.openejb.core.ivm.naming.IvmContext;
+import org.apache.openejb.core.ivm.naming.NameNode;
+import org.apache.openejb.core.ivm.naming.ParsedName;
+import org.apache.xbean.naming.context.WritableContext;
import javax.ejb.EJBContext;
import javax.naming.Context;
import javax.naming.LinkRef;
import javax.naming.NamingException;
+import javax.naming.Name;
import javax.persistence.EntityManagerFactory;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
@@ -42,7 +44,7 @@
import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import java.util.List;
+import java.util.Iterator;
/**
* TODO: This class is essentially an over glorified sym-linker. The names
@@ -275,24 +277,62 @@
}
}
- IvmContext enc = new IvmContext(new NameNode(null, new ParsedName("comp"), null));
- try {
- enc.createSubcontext("comp/env");
- enc.lookup("env");
- } catch (NamingException e) {
- throw new IllegalStateException("Unable to create subcontext 'java:comp/env'. Exception:"+e.getMessage(),e);
+ Context context;
+ if (System.getProperty("openejb.naming","ivm").equals("xbean")) {
+ context = createXBeanWritableContext();
+ } else {
+ context = createIvmContext();
}
- for (Map.Entry<String, Object> entry : bindings.entrySet()) {
+
+ // bind the bindings
+ for (Iterator iterator = bindings.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
String name = (String) entry.getKey();
Object value = entry.getValue();
+ if (value == null) continue;
try {
- enc.bind(name, value);
+ Name parsedName = context.getNameParser("").parse(name);
+ for (int i = 1; i < parsedName.size(); i++) {
+ Name contextName = parsedName.getPrefix(i);
+ if (!bindingExists(context, contextName)) {
+ context.createSubcontext(contextName);
+ }
+ }
+ context.bind(name, value);
} catch (NamingException e) {
throw new org.apache.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
}
}
- return enc;
+ return context;
+ }
+
+ private WritableContext createXBeanWritableContext() {
+ WritableContext context = null;
+ try {
+ context = new WritableContext();
+ } catch (NamingException e) {
+ throw new IllegalStateException(e);
+ }
+ return context;
+ }
+
+ private IvmContext createIvmContext() {
+ IvmContext context = new IvmContext(new NameNode(null, new ParsedName("comp"), null));
+ try {
+ context.createSubcontext("comp").createSubcontext("env");
+ } catch (NamingException e) {
+ throw new IllegalStateException("Unable to create subcontext 'java:comp/env'. Exception:"+e.getMessage(),e);
+ }
+ return context;
+ }
+
+ public static boolean bindingExists(Context context, Name contextName) {
+ try {
+ return context.lookup(contextName) != null;
+ } catch (NamingException e) {
+ }
+ return false;
}
private Reference buildReferenceLocation(ReferenceLocationInfo location) {
@@ -309,9 +349,9 @@
name = name.substring(1);
if (!(name.startsWith("java:comp/env") || name.startsWith("comp/env"))) {
if (name.startsWith("env/"))
- name = "comp/" + name;
+ name = "java:comp/" + name;
else
- name = "comp/env/" + name;
+ name = "java:comp/env/" + name;
}
return name;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java Fri Jan 19 06:41:45 2007
@@ -34,7 +34,7 @@
/**
* @org.apache.xbean.XBean element="connectorRef"
*/
-public class ConnectorReference implements Reference {
+public class ConnectorReference extends Reference {
private ConnectionManager conMngr;
private ManagedConnectionFactory mngedConFactory;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Fri Jan 19 06:41:45 2007
@@ -84,7 +84,7 @@
private EntityManager getEntityManager(CoreDeploymentInfo deploymentInfo) {
EntityManager entityManager = null;
try {
- entityManager = (EntityManager) deploymentInfo.getJndiEnc().lookup("env/openejb/cmp");
+ entityManager = (EntityManager) deploymentInfo.getJndiEnc().lookup("java:comp/env/openejb/cmp");
} catch (NamingException ignroed) {
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java Fri Jan 19 06:41:45 2007
@@ -21,7 +21,7 @@
/**
* @version $Rev$ $Date$
*/
-public class BusinessLocalReference implements Reference {
+public class BusinessLocalReference extends Reference {
private final DeploymentInfo.BusinessLocalHome businessHome;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java Fri Jan 19 06:41:45 2007
@@ -21,7 +21,7 @@
/**
* @version $Rev$ $Date$
*/
-public class BusinessRemoteReference implements Reference {
+public class BusinessRemoteReference extends Reference {
private final DeploymentInfo.BusinessRemoteHome businessHome;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/EncReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/EncReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/EncReference.java Fri Jan 19 06:41:45 2007
@@ -30,9 +30,9 @@
* This class is subclassed by EncReference in the entity, stateful and stateless packages
* of org.apache.openejb.core.
*
- * @version $Rev: 493626 $ $Date: 2007-01-06 17:09:34 -0800 (Sat, 06 Jan 2007) $
+ * @version $Rev$ $Date$
*/
-public abstract class EncReference implements Reference {
+public abstract class EncReference extends Reference {
protected Reference ref = null;
protected boolean checking = true;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java Fri Jan 19 06:41:45 2007
@@ -21,7 +21,7 @@
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
-public class IntraVmJndiReference implements Reference {
+public class IntraVmJndiReference extends Reference {
private String jndiName;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Fri Jan 19 06:41:45 2007
@@ -49,6 +49,7 @@
import org.apache.openejb.ClassLoaderUtil;
import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
+import org.apache.xbean.naming.context.ContextUtil;
/*
* This class wrappers a specific NameNode which is the data model for the JNDI
@@ -358,7 +359,7 @@
}
public NameParser getNameParser(String name) throws NamingException {
- throw new javax.naming.OperationNotSupportedException();
+ return ContextUtil.NAME_PARSER;
}
public NameParser getNameParser(Name name) throws NamingException {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java Fri Jan 19 06:41:45 2007
@@ -25,7 +25,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-public class JndiReference implements Reference {
+public class JndiReference extends Reference {
private Context context;
private Hashtable envProperties;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java Fri Jan 19 06:41:45 2007
@@ -23,7 +23,7 @@
import javax.naming.NamingException;
import java.util.Hashtable;
-public class JndiUrlReference implements Reference {
+public class JndiUrlReference extends Reference {
private String jndiName;
public JndiUrlReference(String jndiName) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java Fri Jan 19 06:41:45 2007
@@ -18,7 +18,7 @@
import javax.naming.NamingException;
-public class ObjectReference implements Reference {
+public class ObjectReference extends Reference {
private Object obj;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java Fri Jan 19 06:41:45 2007
@@ -26,7 +26,7 @@
/**
* @version $Rev$ $Date$
*/
-public class PersistenceContextReference implements Reference{
+public class PersistenceContextReference extends Reference{
private EntityManager em;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java Fri Jan 19 06:41:45 2007
@@ -22,7 +22,7 @@
/**
* @version $Rev$ $Date$
*/
-public class PersistenceUnitReference implements Reference{
+public class PersistenceUnitReference extends Reference{
private EntityManagerFactory emf;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java Fri Jan 19 06:41:45 2007
@@ -16,7 +16,12 @@
*/
package org.apache.openejb.core.ivm.naming;
+import org.apache.xbean.naming.reference.SimpleReference;
+
import javax.naming.NamingException;
+import javax.naming.Name;
+import javax.naming.Context;
+import java.util.Hashtable;
/**
@@ -29,7 +34,11 @@
*
* @version $Rev$ $Date$
*/
-public interface Reference {
+public abstract class Reference extends SimpleReference {
+
+ public Object getContent() throws NamingException {
+ return getObject();
+ }
- public Object getObject() throws NamingException;
+ public abstract Object getObject() throws NamingException;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Fri Jan 19 06:41:45 2007
@@ -103,6 +103,7 @@
sessionContext = (SessionContext)ctx.lookup("java:comp/EJBContext");
} catch (NamingException e1) {
sessionContext = createSessionContext();
+ // TODO: This should work
ctx.bind("java:comp/EJBContext", sessionContext);
}
if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass)) {
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Fri Jan 19 06:41:45 2007
@@ -775,6 +775,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ <version>2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
<version>2.8</version>
<exclusions>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java?view=diff&rev=497833&r1=497832&r2=497833
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java Fri Jan 19 06:41:45 2007
@@ -19,22 +19,21 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.openejb.core.ServerFederation;
+import org.apache.openejb.server.ServiceDaemon;
+import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.server.ejbd.EjbServer;
import org.apache.openejb.test.TestManager;
import org.apache.openejb.test.entity.bmp.BmpTestSuite;
import org.apache.openejb.test.entity.cmp.CmpLocalTestSuite;
-import org.apache.openejb.test.entity.cmp2.Cmp2TestSuite;
import org.apache.openejb.test.stateful.StatefulTestSuite;
import org.apache.openejb.test.stateless.StatelessTestSuite;
-import org.apache.openejb.server.ServiceDaemon;
-import org.apache.openejb.server.ServiceException;
-import org.apache.openejb.core.ServerFederation;
-import org.apache.openejb.server.ejbd.EjbServer;
import java.util.Properties;
/**
* To run from intellij or another IDE add
- *
+ * <p/>
* -Dopenejb.home=/Users/dblevins/work/openejb3/server/openejb-ejbd/target/test-classes
*
* @version $Revision$ $Date$
@@ -102,7 +101,7 @@
public Properties getContextEnvironment() {
Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
- props.put("java.naming.provider.url", "foo://127.0.0.1:"+port);
+ props.put("java.naming.provider.url", "foo://127.0.0.1:" + port);
props.put("java.naming.security.principal", "testuser");
props.put("java.naming.security.credentials", "testpassword");
return props;