[jboss-cvs] JBossAS SVN: r75014 - in projects/ejb3/dev/proxy-int: core/src/main/java/org/jboss/ejb3/proxy/factory and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 24 17:48:09 EDT 2008
Author: ALRubinger
Date: 2008-06-24 17:48:09 -0400 (Tue, 24 Jun 2008)
New Revision: 75014
Modified:
projects/ejb3/dev/proxy-int/build/pom.xml
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/BaseSessionProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulRemoteProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulClusterProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulRemoteProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessRemoteProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/StatelessLocalProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java
projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockBean.java
projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockStatefulContainer.java
projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml
Log:
[EJBTHREE-1385] Refactored EJB3 Core Proxy code to use jboss-metadata for JNDI Names
Modified: projects/ejb3/dev/proxy-int/build/pom.xml
===================================================================
--- projects/ejb3/dev/proxy-int/build/pom.xml 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/build/pom.xml 2008-06-24 21:48:09 UTC (rev 75014)
@@ -296,7 +296,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
- <version>1.0.0.Beta18</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/BaseSessionProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/BaseSessionProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/BaseSessionProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -57,6 +57,7 @@
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ejb3.session.SessionSpecContainer;
import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.util.naming.Util;
/**
@@ -76,7 +77,6 @@
protected String containerGuid;
protected String containerClusterUid;
protected boolean isClustered = false;
- protected String jndiName;
/**
* Proxy Constructor for the Business Interfaces' Proxy
@@ -456,10 +456,22 @@
*/
protected abstract Class<?> getHomeType();
- protected final String getJndiName()
+ protected String getJndiName()
{
- return this.jndiName;
+ SessionSpecContainer container = this.getContainer();
+ JBossSessionBeanMetaData md = container.getMetaData();
+ String jndiName = md.determineResolvedJndiName(null);
+ return jndiName;
}
+
+ protected String getHomeJndiName()
+ {
+ SessionSpecContainer container = this.getContainer();
+ JBossSessionBeanMetaData md = container.getMetaData();
+ String home = md.getHome();
+ String jndiName = md.determineResolvedJndiName(home);
+ return jndiName;
+ }
public final String getJndiNameProxyFactory()
{
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -62,13 +62,9 @@
super();
}
- public BaseStatefulProxyFactory(SessionSpecContainer container, String jndiName)
+ public BaseStatefulProxyFactory(SessionSpecContainer container)
{
super(container);
-
- assert jndiName != null : "jndiName is null";
-
- this.jndiName = jndiName;
}
public void init() throws Exception
@@ -86,20 +82,21 @@
// Bind the Proxy Factory
Context ctx = getContainer().getInitialContext();
- Name name = ctx.getNameParser("").parse(jndiName);
- ctx = Util.createSubcontext(ctx, name.getPrefix(name.size() - 1));
- String atom = name.get(name.size() - 1);
+ String jndiName = this.getJndiName();
+// Name name = ctx.getNameParser("").parse(jndiName);
+ //ctx = Util.createSubcontext(ctx, name.getPrefix(name.size() - 1));
+ //String atom = name.get(name.size() - 1);
RefAddr refAddr = new StringRefAddr(JndiSessionProxyObjectFactory.REF_ADDR_NAME_JNDI_BINDING_DELEGATE_PROXY_FACTORY, jndiName + PROXY_FACTORY_NAME);
Reference ref = new Reference(Object.class.getName(), refAddr, JndiSessionProxyObjectFactory.class.getName(), null);
try
{
log.debug("Binding reference for " + getContainer().getEjbName() + " in JNDI at " + jndiName);
- Util.rebind(ctx, atom, ref);
+ Util.rebind(ctx, jndiName, ref);
}
catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind stateful proxy with ejb name "
- + getContainer().getEjbName() + " into JNDI under jndiName: " + ctx.getNameInNamespace() + "/" + atom);
+ + getContainer().getEjbName() + " into JNDI under jndiName: " + ctx.getNameInNamespace() + "/" + jndiName);
namingException.setRootCause(e);
throw namingException;
}
@@ -107,6 +104,7 @@
public void stop() throws Exception
{
+ String jndiName = this.getJndiName();
Util.unbind(getContainer().getInitialContext(), jndiName);
}
@@ -125,13 +123,11 @@
log.error(e.getMessage(), e);
throw new IOException(e.getMessage());
}
- this.jndiName = in.readUTF();
}
@Override
public void writeExternal(ObjectOutput out) throws IOException
{
super.writeExternal(out);
- out.writeUTF(jndiName);
}
}
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulRemoteProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulRemoteProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/BaseStatefulRemoteProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -62,7 +62,7 @@
// Constructor
public BaseStatefulRemoteProxyFactory(SessionSpecContainer container, RemoteBinding binding)
{
- super(container, binding.jndiBinding());
+ super(container);
this.binding = binding;
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulClusterProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulClusterProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulClusterProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -216,6 +216,7 @@
ClusteredPojiProxy proxy = new ClusteredPojiProxy(targetId, locator, interceptors, wrapper,
factoryLBP, partitionName, null);
Object factoryProxy = Proxy.newProxyInstance(interfaces[0].getClassLoader(), interfaces, proxy);
+ String jndiName = this.getJndiName();
try
{
Util.rebind(getContainer().getInitialContext(), jndiName + PROXY_FACTORY_NAME, factoryProxy);
@@ -268,6 +269,7 @@
hatarget.destroy();
drm.unregisterListener(proxyFamilyName, this);
this.getContainer().getClusterFamilies().remove(proxyFamilyName);
+ String jndiName = this.getJndiName();
Util.unbind(getContainer().getInitialContext(), jndiName + PROXY_FACTORY_NAME);
super.stop();
}
@@ -277,6 +279,7 @@
*/
protected String getTargetId()
{
+ String jndiName = this.getJndiName();
assert jndiName != null : "jndiName is null";
String partition = ((SessionContainer) getContainer()).getPartitionName();
return jndiName + PROXY_FACTORY_NAME + "@" + partition;
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulRemoteProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateful/StatefulRemoteProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -72,6 +72,7 @@
String targetId = getTargetId();
String clientBindUrl = ProxyFactoryHelper.getClientBindUrl(this.getBinding());
Object factoryProxy = createPojiProxy(targetId, interfaces, clientBindUrl);
+ String jndiName = this.getJndiName();
log.debug("Binding proxy factory for " + getContainer().getEjbName() + " in JNDI at " + jndiName + PROXY_FACTORY_NAME + " with client bind url " + clientBindUrl);
try
{
@@ -100,6 +101,7 @@
@Override
public void stop() throws Exception
{
+ String jndiName = this.getJndiName();
Util.unbind(getContainer().getInitialContext(), jndiName + PROXY_FACTORY_NAME);
Dispatcher.singleton.unregisterTarget(getTargetId());
@@ -167,6 +169,7 @@
*/
protected String getTargetId()
{
+ String jndiName = this.getJndiName();
assert jndiName != null : "jndiName is null";
return jndiName + PROXY_FACTORY_NAME;
}
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -37,13 +37,9 @@
{
private static final Logger log = Logger.getLogger(BaseStatelessProxyFactory.class);
- public BaseStatelessProxyFactory(SessionSpecContainer container, String jndiName)
+ public BaseStatelessProxyFactory(SessionSpecContainer container)
{
super(container);
-
- assert jndiName != null : "jndiName is null";
-
- this.jndiName = jndiName;
}
/**
@@ -129,7 +125,7 @@
public void stop() throws Exception
{
- Util.unbind(getContainer().getInitialContext(), jndiName);
+ Util.unbind(getContainer().getInitialContext(), this.getJndiName());
}
protected abstract void validateEjb21Views();
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessRemoteProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessRemoteProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/BaseStatelessRemoteProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -28,7 +28,7 @@
// Constructor
public BaseStatelessRemoteProxyFactory(SessionSpecContainer container, RemoteBinding binding)
{
- super(container, binding.jndiBinding());
+ super(container);
this.binding = binding;
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/StatelessLocalProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/StatelessLocalProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/stateless/StatelessLocalProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -33,6 +33,7 @@
import org.jboss.ejb3.session.SessionSpecContainer;
import org.jboss.ejb3.stateless.StatelessHandleRemoteImpl;
import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.util.naming.Util;
@@ -48,7 +49,7 @@
public StatelessLocalProxyFactory(SessionSpecContainer container, LocalBinding binding)
{
- super(container, binding.jndiBinding());
+ super(container);
}
/**
@@ -89,6 +90,7 @@
@Override
protected boolean bindHomeAndBusinessTogether()
{
+ String jndiName = this.getJndiName();
return ProxyFactoryHelper.getLocalHomeJndiName(this.getContainer()).equals(jndiName);
}
@@ -153,4 +155,13 @@
// defined for local proxy factories
return null;
}
+
+ @Override
+ protected String getJndiName()
+ {
+ SessionSpecContainer container = this.getContainer();
+ JBossSessionBeanMetaData md = container.getMetaData();
+ String jndiName = md.determineLocalJndiName();
+ return jndiName;
+ }
}
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/session/SessionContainer.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -155,7 +155,7 @@
throw new IllegalStateException("Unable to find geInvokedBusinessInterface()");
}
- protected JBossSessionBeanMetaData getMetaData()
+ public JBossSessionBeanMetaData getMetaData()
{
// TODO: resolve this cast using generics on EJBContainer
return (JBossSessionBeanMetaData) getXml();
Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -40,6 +40,7 @@
import org.jboss.ejb3.session.ProxyAccessType;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ejb3.session.SessionSpecContainer;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.proxy.ejb.handle.StatefulHandleImpl;
import org.jboss.util.NotImplementedException;
import org.jboss.util.naming.Util;
@@ -65,7 +66,7 @@
public StatefulLocalProxyFactory(SessionSpecContainer container, LocalBinding binding)
{
- super(container, binding.jndiBinding());
+ super(container);
}
/**
@@ -111,12 +112,15 @@
@Override
protected boolean bindHomeAndBusinessTogether()
{
- return ProxyFactoryHelper.getLocalHomeJndiName(this.getContainer()).equals(this.jndiName);
+ String jndiName = this.getJndiName();
+ return ProxyFactoryHelper.getLocalHomeJndiName(this.getContainer()).equals(jndiName);
}
public void start() throws Exception
{
super.start();
+
+ String jndiName = this.getJndiName();
try
{
@@ -147,6 +151,7 @@
public void stop() throws Exception
{
super.stop();
+ String jndiName = this.getJndiName();
Util.unbind(getContainer().getInitialContext(), jndiName + PROXY_FACTORY_NAME);
SessionContainer statefulContainer = this.getContainer();
LocalHome localHome = this.getContainer().getAnnotation(LocalHome.class);
@@ -230,4 +235,13 @@
super.writeExternal(out);
out.writeObject(vmid);
}
+
+ @Override
+ protected String getJndiName()
+ {
+ SessionSpecContainer container = this.getContainer();
+ JBossSessionBeanMetaData md = container.getMetaData();
+ String jndiName = md.determineLocalJndiName();
+ return jndiName;
+ }
}
Modified: projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -73,7 +73,7 @@
InitialContext ctx = new InitialContext();
- System.out.println("ctx = " + ctx);
+ //System.out.println("ctx = " + ctx);
//System.out.println(" " + container.getInitialContext().list("MyStatelessBean").next());
MyStateless bean = (MyStateless) ctx.lookup("MyStatelessBean/local");
Modified: projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockBean.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockBean.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockBean.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -26,6 +26,7 @@
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.ejb.SessionContext;
+import javax.ejb.Stateful;
import org.jboss.ejb3.annotation.Cache;
import org.jboss.ejb3.annotation.CacheConfig;
@@ -42,6 +43,7 @@
@PersistenceManager("MyStatefulSessionFilePersistenceManager")
@CacheConfig(idleTimeoutSeconds=1)
@Pool("ThreadlocalPool")
+ at Stateful
public class MockBean implements Mock
{
public static Object notification = new Object();
Modified: projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockStatefulContainer.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockStatefulContainer.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/MockStatefulContainer.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -26,9 +26,7 @@
import org.jboss.aop.Domain;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateful.StatefulContainer;
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.ejb3.test.common.MetaDataHelper;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
/**
@@ -44,24 +42,27 @@
public MockStatefulContainer(ClassLoader cl, String beanClassName, String ejbName, Domain domain,
Hashtable ctxProperties, Ejb3Deployment deployment) throws ClassNotFoundException
{
- super(cl, beanClassName, ejbName, domain, ctxProperties, deployment, createMockBeanMetaData());
+ super(cl, beanClassName, ejbName, domain, ctxProperties, deployment, createMockBeanMetaData(beanClassName));
}
-
+
@Override
public Object createSession()
{
// TODO Auto-generated method stub
return super.createSession();
}
-
- private static JBossSessionBeanMetaData createMockBeanMetaData()
+
+ private static JBossSessionBeanMetaData createMockBeanMetaData(String beanClassName)
{
- JBossMetaData metaData = new JBossMetaData();
- JBossEnterpriseBeansMetaData enterpriseBeans = new JBossEnterpriseBeansMetaData();
- metaData.setEnterpriseBeans(enterpriseBeans);
- metaData.setAssemblyDescriptor(new JBossAssemblyDescriptorMetaData());
- JBossSessionBeanMetaData sessionBeanMetaData = new JBossSessionBeanMetaData();
- sessionBeanMetaData.setEnterpriseBeansMetaData(enterpriseBeans);
- return sessionBeanMetaData;
+ try
+ {
+ return MetaDataHelper.getMetadataFromBeanImplClass(Thread.currentThread().getContextClassLoader().loadClass(
+ beanClassName));
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("Could not load Bean Implementation class when creating new "
+ + MockStatefulContainer.class, e);
+ }
}
}
Modified: projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/test/java/org/jboss/ejb3/test/cachepassivation/unit/CachePassivationUnitTestCase.java 2008-06-24 21:48:09 UTC (rev 75014)
@@ -76,8 +76,9 @@
Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- String beanClassName = MockBean.class.getName();
- String ejbName = "MockBean";
+ Class<?> beanClass = MockBean.class;
+ String beanClassName = beanClass.getName();
+ String ejbName = beanClass.getSimpleName();
Domain domain = new Domain(new AspectManager(), "Test", false);
Map<String, Class<? extends PersistenceManagerFactory>> factories = new HashMap<String, Class<? extends PersistenceManagerFactory>>();
factories.put("MyStatefulSessionFilePersistenceManager", MyStatefulSessionFilePersistenceManagerFactory.class);
@@ -85,7 +86,8 @@
persistenceManagerFactoryRegistry.setFactories(factories);
Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
deployment.setPersistenceManagerFactoryRegistry(persistenceManagerFactoryRegistry);
- MockStatefulContainer container = new MockStatefulContainer(cl, beanClassName, ejbName, domain, ctxProperties, deployment);
+ MockStatefulContainer container = new MockStatefulContainer(cl, beanClassName, ejbName, domain, ctxProperties,
+ deployment);
container.instantiated();
container.processMetadata();
System.out.println("injectors = " + container.getInjectors());
Modified: projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml 2008-06-24 21:45:39 UTC (rev 75013)
+++ projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml 2008-06-24 21:48:09 UTC (rev 75014)
@@ -83,37 +83,27 @@
-->
- <!-- SLSB JNDI Registrar -->
+ <!-- SLSB JNDI Registrar
<bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
<constructor>
<parameter>
- <inject bean="org.jboss.ejb3.JndiContext" />
- </parameter>
- <parameter>
org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
</parameter>
</constructor>
<depends>NameServer</depends>
- </bean>
+ </bean> -->
- <!-- SFSB JNDI Registrar -->
+ <!-- SFSB JNDI Registrar
<bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
<constructor>
<parameter>
- <inject bean="org.jboss.ejb3.JndiContext" />
- </parameter>
- <parameter>
org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
</parameter>
</constructor>
<depends>NameServer</depends>
- </bean>
-
- <!-- JNDI Registrar Configuration -->
- <bean name="org.jboss.ejb3.JndiContext"
- class="javax.naming.InitialContext" />
+ </bean> -->
<!-- Remoting Proxy Factory Registry -->
<bean name="EJB3RemoteProxyFactoryRegistry" class="org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry">
More information about the jboss-cvs-commits
mailing list