[Jboss-cvs] JBossAS SVN: r56518 - in trunk/ejb3/src/main/org/jboss: ejb3 ejb3/embedded ejb3/entity ejb3/mdb ejb3/service ejb3/stateful ejb3/stateless injection
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 1 21:48:15 EDT 2006
Author: bdecoste
Date: 2006-09-01 21:47:44 -0400 (Fri, 01 Sep 2006)
New Revision: 56518
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/service/BaseServiceProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
trunk/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
trunk/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
trunk/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
trunk/ejb3/src/main/org/jboss/injection/PcEncInjector.java
trunk/ejb3/src/main/org/jboss/injection/PuEncInjector.java
trunk/ejb3/src/main/org/jboss/injection/ValueEncInjector.java
Log:
rebind() instead of bind()
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -543,7 +543,7 @@
Thread.currentThread().setContextClassLoader(classloader);
try
{
- Util.bind(enc, "UserTransaction", new UserTransactionImpl());
+ Util.rebind(enc, "UserTransaction", new UserTransactionImpl());
}
catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/JndiBinder.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -70,11 +70,11 @@
{
if (serializable)
{
- Util.bind(ctx, bindTo, target);
+ Util.rebind(ctx, bindTo, target);
}
else
{
- NonSerializableFactory.bind(ctx, bindTo, target);
+ NonSerializableFactory.rebind(ctx, bindTo, target);
}
} catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -269,13 +269,13 @@
if (entityManagerJndiName != null)
{
EntityManager injectedManager = new TransactionScopedEntityManager(managedFactory);
- NonSerializableFactory.bind(initialContext, entityManagerJndiName, injectedManager);
+ NonSerializableFactory.rebind(initialContext, entityManagerJndiName, injectedManager);
}
String entityManagerFactoryJndiName = (String) props.get("jboss.entity.manager.factory.jndi.name");
if (entityManagerFactoryJndiName != null)
{
EntityManagerFactory injectedFactory = new InjectedEntityManagerFactory(managedFactory);
- NonSerializableFactory.bind(initialContext, entityManagerFactoryJndiName, injectedFactory);
+ NonSerializableFactory.rebind(initialContext, entityManagerFactoryJndiName, injectedFactory);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -71,7 +71,7 @@
{
super.start();
try{
- NonSerializableFactory.bind(ctx, jndiName + PROXY_FACTORY_NAME, this);
+ NonSerializableFactory.rebind(ctx, jndiName + PROXY_FACTORY_NAME, this);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind local producer factory with name " + factoryName + " into JNDI under jndiName: " + ctx.getNameInNamespace() + "/" + jndiName + PROXY_FACTORY_NAME);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -549,7 +549,7 @@
}
catch (NamingException e)
{
- jndiContext.bind(binding, result);
+ jndiContext.rebind(binding, result);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -136,7 +136,7 @@
try
{
- Util.bind(baseCtx, atom, ref);
+ Util.rebind(baseCtx, atom, ref);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind producer factory into JNDI under jndiName: " + baseCtx.getNameInNamespace() + "/" + atom);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -84,7 +84,7 @@
Object factoryProxy = Remoting.createPojiProxy(jndiName + PROXY_FACTORY_NAME, interfaces, RemoteProxyFactory.DEFAULT_CLIENT_BINDING);
try
{
- Util.bind(ctx, jndiName + PROXY_FACTORY_NAME, factoryProxy);
+ Util.rebind(ctx, jndiName + PROXY_FACTORY_NAME, factoryProxy);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind remote producer factory into JNDI under jndiName: " + ctx.getNameInNamespace() + "/" + jndiName + PROXY_FACTORY_NAME);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/service/BaseServiceProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/service/BaseServiceProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/service/BaseServiceProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -68,7 +68,7 @@
try
{
- Util.bind(container.getInitialContext(), jndiName, createProxy());
+ Util.rebind(container.getInitialContext(), jndiName, createProxy());
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind service proxy factory for EJB container with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + container.getInitialContext().getNameInNamespace() + "/" + jndiName);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/BaseStatefulProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -73,7 +73,7 @@
Reference ref = new Reference("java.lang.Object", refAddr, JndiProxyFactory.class.getName(), null);
try
{
- Util.bind(ctx, atom, ref);
+ Util.rebind(ctx, atom, ref);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind stateful proxy with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + ctx.getNameInNamespace() + "/" + atom);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -106,7 +106,7 @@
Object factoryProxy = Remoting.createPojiProxy(jndiName + PROXY_FACTORY_NAME, interfaces, ProxyFactoryHelper.getClientBindUrl(binding));
try
{
- Util.bind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, factoryProxy);
+ Util.rebind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, factoryProxy);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind stateful cluster proxy with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + container.getInitialContext().getNameInNamespace() + "/" + jndiName + PROXY_FACTORY_NAME);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -62,7 +62,7 @@
try
{
- NonSerializableFactory.bind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, this);
+ NonSerializableFactory.rebind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, this);
}
catch (NamingException e)
{
@@ -77,7 +77,7 @@
Class[] interfaces = {localHome.value()};
Object homeProxy = java.lang.reflect.Proxy.newProxyInstance(container.getBeanClass().getClassLoader(),
interfaces, new StatefulLocalHomeProxy(container));
- NonSerializableFactory.bind(container.getInitialContext(), jndiName + "Home", homeProxy);
+ NonSerializableFactory.rebind(container.getInitialContext(), jndiName + "Home", homeProxy);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -90,7 +90,7 @@
Object factoryProxy = Remoting.createPojiProxy(jndiName + PROXY_FACTORY_NAME, interfaces, ProxyFactoryHelper.getClientBindUrl(binding));
try
{
- Util.bind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, factoryProxy);
+ Util.rebind(container.getInitialContext(), jndiName + PROXY_FACTORY_NAME, factoryProxy);
}
catch (NamingException e)
{
@@ -105,7 +105,7 @@
if (remoteHome != null)
{
Object homeProxy = createHomeProxy(remoteHome.value());
- Util.bind(container.getInitialContext(), jndiName + "Home", homeProxy);
+ Util.rebind(container.getInitialContext(), jndiName + "Home", homeProxy);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -224,7 +224,7 @@
//describeClass(proxy.getClass());
try
{
- Util.bind(container.getInitialContext(), jndiName, proxy);
+ Util.rebind(container.getInitialContext(), jndiName, proxy);
} catch (NamingException e)
{
NamingException namingException = new NamingException("Could not bind stateless proxy with ejb name " + container.getEjbName() + " into JNDI under jndiName: " + container.getInitialContext().getNameInNamespace() + "/" + jndiName);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -68,7 +68,7 @@
Class[] interfaces = {localHome.value()};
Object homeProxy = java.lang.reflect.Proxy.newProxyInstance(container.getBeanClass().getClassLoader(),
interfaces, new StatelessLocalProxy(container));
- NonSerializableFactory.bind(container.getInitialContext(), jndiName + "Home", homeProxy);
+ NonSerializableFactory.rebind(container.getInitialContext(), jndiName + "Home", homeProxy);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -89,7 +89,7 @@
Object homeProxy = createHomeProxy(remoteHome.value());
try
{
- Util.bind(container.getInitialContext(), jndiName + "Home", homeProxy);
+ Util.rebind(container.getInitialContext(), jndiName + "Home", homeProxy);
}
catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/injection/EjbEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EjbEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/EjbEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -92,7 +92,7 @@
try
{
if (jndiName == null) throw new RuntimeException("Failed to populate ENC: " + encName + " global jndi name was null");
- Util.bind(container.getEnc(), encName, new LinkRef(jndiName));
+ Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
}
catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/EnvEntryEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -50,7 +50,7 @@
{
try
{
- Util.bind(container.getEnc(),
+ Util.rebind(container.getEnc(),
name,
getEnvEntryValue());
}
Modified: trunk/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/LinkRefEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -49,7 +49,7 @@
{
try
{
- Util.bind(container.getEnc(), encName, new LinkRef(jndiName));
+ Util.rebind(container.getEnc(), encName, new LinkRef(jndiName));
}
catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/injection/PcEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/PcEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/PcEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -91,7 +91,7 @@
}
try
{
- Util.bind(container.getEnc(), encName, extendedPc);
+ Util.rebind(container.getEnc(), encName, extendedPc);
}
catch (NamingException e)
{
@@ -112,7 +112,7 @@
}
try
{
- Util.bind(container.getEnc(), encName, entityManager);
+ Util.rebind(container.getEnc(), encName, entityManager);
}
catch (NamingException e)
{
Modified: trunk/ejb3/src/main/org/jboss/injection/PuEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/PuEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/PuEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -64,7 +64,7 @@
try
{
- Util.bind(container.getEnc(), encName, factory);
+ Util.rebind(container.getEnc(), encName, factory);
}
catch (Exception e)
{
Modified: trunk/ejb3/src/main/org/jboss/injection/ValueEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ValueEncInjector.java 2006-09-02 00:43:51 UTC (rev 56517)
+++ trunk/ejb3/src/main/org/jboss/injection/ValueEncInjector.java 2006-09-02 01:47:44 UTC (rev 56518)
@@ -49,7 +49,7 @@
{
try
{
- Util.bind(container.getEnc(), encName, obj);
+ Util.rebind(container.getEnc(), encName, obj);
}
catch (NamingException e)
{
More information about the jboss-cvs-commits
mailing list