[jboss-cvs] JBossAS SVN: r75841 - in projects/ejb3/trunk/proxy/src: main/java/org/jboss/ejb3/proxy/handler/session and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 15 09:00:52 EDT 2008
Author: ALRubinger
Date: 2008-07-15 09:00:52 -0400 (Tue, 15 Jul 2008)
New Revision: 75841
Modified:
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateless/StatelessSessionRemoteProxyFactory.java
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/SessionProxyInvocationHandlerBase.java
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java
projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/unit/JndiSessionRegistrarBaseTestCase.java
Log:
[JBMETA-68] Update EJB3 Proxy to integrate with jboss-metadata changes
Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateless/StatelessSessionRemoteProxyFactory.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateless/StatelessSessionRemoteProxyFactory.java 2008-07-15 12:54:04 UTC (rev 75840)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateless/StatelessSessionRemoteProxyFactory.java 2008-07-15 13:00:52 UTC (rev 75841)
@@ -125,8 +125,9 @@
protected String getInterceptorStackName()
{
return StatelessSessionRemoteProxyFactory.STACK_NAME_STATELESS_SESSION_CLIENT_INTERCEPTORS;
- } // --------------------------------------------------------------------------------||
-
+ }
+
+ // --------------------------------------------------------------------------------||
// Required Implementations -------------------------------------------------------||
// --------------------------------------------------------------------------------||
Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/SessionProxyInvocationHandlerBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/SessionProxyInvocationHandlerBase.java 2008-07-15 12:54:04 UTC (rev 75840)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/SessionProxyInvocationHandlerBase.java 2008-07-15 13:00:52 UTC (rev 75841)
@@ -21,19 +21,15 @@
*/
package org.jboss.ejb3.proxy.handler.session;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.List;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
import org.jboss.aspects.remoting.PojiProxy;
import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
-import org.jboss.ejb3.common.string.StringUtils;
import org.jboss.ejb3.interceptors.container.ContainerMethodInvocation;
import org.jboss.ejb3.proxy.container.InvokableContext;
import org.jboss.ejb3.proxy.handler.NotEligibleForDirectInvocationException;
Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java 2008-07-15 12:54:04 UTC (rev 75840)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java 2008-07-15 13:00:52 UTC (rev 75841)
@@ -42,6 +42,7 @@
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossSessionBeanJndiNameResolver;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
import org.jboss.naming.Util;
@@ -263,7 +264,7 @@
}
// Bind the Default Remote Reference to JNDI
- String defaultRemoteAddress = smd.determineJndiName();
+ String defaultRemoteAddress = smd.getJndiName();
log.debug("Default Remote Business View for EJB " + smd.getEjbName() + " to be bound into JNDI at \""
+ defaultRemoteAddress + "\"");
this.bind(context, defaultRemoteRef, defaultRemoteAddress, remoteProxyFactoryKey, containerName);
@@ -280,7 +281,7 @@
this.getSessionProxyObjectFactoryType(), null);
ref.add(refAddrBusinessInterface);
ref.add(refAddrRemoting);
- String address = smd.determineResolvedJndiName(businessRemote);
+ String address = JbossSessionBeanJndiNameResolver.resolveJndiName(smd, businessRemote);
log.debug("Remote Business View for " + businessRemote + " of EJB " + smd.getEjbName()
+ " to be bound into JNDI at \"" + address + "\"");
this.bind(context, ref, address, remoteProxyFactoryKey, containerName);
@@ -354,7 +355,7 @@
}
// Bind the Default Local Reference to JNDI
- String defaultLocalAddress = smd.determineLocalJndiName();
+ String defaultLocalAddress = smd.getLocalJndiName();
log.debug("Default Local Business View for EJB " + smd.getEjbName() + " to be bound into JNDI at \""
+ defaultLocalAddress + "\"");
this.bind(context, defaultLocalRef, defaultLocalAddress, localProxyFactoryKey, containerName);
@@ -369,7 +370,7 @@
Reference ref = new Reference(JndiSessionRegistrarBase.OBJECT_FACTORY_CLASSNAME_PREFIX + businessLocal,
this.getSessionProxyObjectFactoryType(), null);
ref.add(refAddr);
- String address = smd.determineResolvedJndiName(businessLocal);
+ String address = JbossSessionBeanJndiNameResolver.resolveJndiName(smd, businessLocal);
log.debug("Local Business View for " + businessLocal + " of EJB " + smd.getEjbName()
+ " to be bound into JNDI at \"" + address + "\"");
this.bind(context, ref, address, localProxyFactoryKey, containerName);
@@ -445,7 +446,7 @@
*/
// Bind the Default Remote Reference to JNDI
- String defaultRemoteAddress = smd.determineJndiName();
+ String defaultRemoteAddress = smd.getJndiName();
log.debug("Default Remote Business View for EJB " + smd.getEjbName() + " to be unbound from JNDI at \""
+ defaultRemoteAddress + "\"");
this.unbind(context, defaultRemoteAddress);
@@ -455,7 +456,7 @@
{
for (String businessRemote : businessRemotes)
{
- String address = smd.determineResolvedJndiName(businessRemote);
+ String address = JbossSessionBeanJndiNameResolver.resolveJndiName(smd, businessRemote);
log.debug("Remote Business View for " + businessRemote + " of EJB " + smd.getEjbName()
+ " to be unbound from JNDI at \"" + address + "\"");
this.unbind(context, address);
@@ -486,7 +487,7 @@
*/
// Unbind the Default Local Reference to JNDI
- String defaultLocalAddress = smd.determineLocalJndiName();
+ String defaultLocalAddress = smd.getLocalJndiName();
log.debug("Default Local Business View for EJB " + smd.getEjbName() + " to be unbound from JNDI at \""
+ defaultLocalAddress + "\"");
this.unbind(context, defaultLocalAddress);
@@ -496,7 +497,7 @@
{
for (String businessLocal : businessLocals)
{
- String address = smd.determineResolvedJndiName(businessLocal);
+ String address = JbossSessionBeanJndiNameResolver.resolveJndiName(smd, businessLocal);
log.debug("Local Business View for " + businessLocal + " of EJB " + smd.getEjbName()
+ " to be unbound from JNDI at \"" + address + "\"");
this.unbind(context, address);
@@ -621,13 +622,13 @@
if (isLocal)
{
// Bind together if Local Default JNDI Name == Local Home JNDI Name
- bindTogether = smd.determineLocalJndiName().equals(smd.getLocalHomeJndiName());
+ bindTogether = smd.getLocalJndiName().equals(smd.getLocalHomeJndiName());
}
// If Remote
else
{
// Bind together if Local Default JNDI Name == Local Home JNDI Name
- bindTogether = smd.determineJndiName().equals(smd.getHomeJndiName());
+ bindTogether = smd.getJndiName().equals(smd.getHomeJndiName());
}
// Return
@@ -670,7 +671,7 @@
* @param md
* @param isLocal
*/
- public String getProxyFactoryRegistryKey(JBossEnterpriseBeanMetaData md, boolean isLocal)
+ public String getProxyFactoryRegistryKey(JBossSessionBeanMetaData md, boolean isLocal)
{
// Initialize
String prefix = null;
@@ -678,11 +679,11 @@
// Set Suffix
if (isLocal)
{
- prefix = md.determineLocalJndiName();
+ prefix = md.getLocalJndiName();
}
else
{
- prefix = md.determineJndiName();
+ prefix = md.getJndiName();
}
// Assemble and return
Modified: projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java 2008-07-15 12:54:04 UTC (rev 75840)
+++ projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java 2008-07-15 13:00:52 UTC (rev 75841)
@@ -26,6 +26,8 @@
import org.jboss.ejb3.test.proxy.common.container.StatelessContainer;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
+import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
/**
* Utils
@@ -59,6 +61,9 @@
// Get Metadata
JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(slsbImplementationClass);
+ // Decorate Metadata
+ beanMetaData = new JBossSessionPolicyDecorator(beanMetaData, new BasicJndiBindingPolicy());
+
// Make a Container
StatelessContainer container = new StatelessContainer(beanMetaData, Thread.currentThread()
.getContextClassLoader());
@@ -79,6 +84,9 @@
// Get Metadata
JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(sfsbImplementationClass);
+ // Decorate Metadata
+ beanMetaData = new JBossSessionPolicyDecorator(beanMetaData, new BasicJndiBindingPolicy());
+
// Make a Container
StatefulContainer container = new StatefulContainer(beanMetaData, Thread.currentThread().getContextClassLoader());
Modified: projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/unit/JndiSessionRegistrarBaseTestCase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/unit/JndiSessionRegistrarBaseTestCase.java 2008-07-15 12:54:04 UTC (rev 75840)
+++ projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/unit/JndiSessionRegistrarBaseTestCase.java 2008-07-15 13:00:52 UTC (rev 75841)
@@ -58,6 +58,7 @@
import org.jboss.ejb3.test.proxy.common.ejb.slsb.MyStatelessRemoteHome;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossSessionBeanJndiNameResolver;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
import org.junit.After;
@@ -471,7 +472,7 @@
private String getDefaultBusinessRemoteJndiName(SessionContainer sessionContainer)
{
JBossSessionBeanMetaData metadata = sessionContainer.getMetaData();
- return metadata.determineJndiName();
+ return metadata.getJndiName();
}
/**
@@ -483,7 +484,7 @@
private String getDefaultBusinessLocalJndiName(SessionContainer sessionContainer)
{
JBossSessionBeanMetaData metadata = sessionContainer.getMetaData();
- return metadata.determineLocalJndiName();
+ return metadata.getLocalJndiName();
}
/**
@@ -529,9 +530,9 @@
Set<String> jndiNames = new HashSet<String>();
// default business remote jndi name
- jndiNames.add(metadata.determineJndiName());
+ jndiNames.add(metadata.getJndiName());
// default business local jndi name
- jndiNames.add(metadata.determineLocalJndiName());
+ jndiNames.add(metadata.getLocalJndiName());
// local home jndi name
jndiNames.add(metadata.getLocalHomeJndiName());
// remote home jndi name
@@ -543,7 +544,7 @@
{
for (String businessRemoteInterfaceName : businessRemotesMetadata)
{
- jndiNames.add(metadata.determineResolvedJndiName(businessRemoteInterfaceName));
+ jndiNames.add(JbossSessionBeanJndiNameResolver.resolveJndiName(metadata, businessRemoteInterfaceName));
}
}
@@ -553,7 +554,7 @@
{
for (String businessLocalInterfaceName : businessLocalsMetadata)
{
- jndiNames.add(metadata.determineResolvedJndiName(businessLocalInterfaceName));
+ jndiNames.add(JbossSessionBeanJndiNameResolver.resolveJndiName(metadata, businessLocalInterfaceName));
}
}
More information about the jboss-cvs-commits
mailing list