[jboss-cvs] JBossAS SVN: r73137 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 8 02:03:29 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-05-08 02:03:29 -0400 (Thu, 08 May 2008)
New Revision: 73137
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/KnownInterfaces.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java
Log:
JBMETA-36, compare iface against the known interface types
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2008-05-08 05:41:28 UTC (rev 73136)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2008-05-08 06:03:29 UTC (rev 73137)
@@ -38,6 +38,7 @@
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -607,6 +608,31 @@
if(policy == null)
policy = new BasicJndiBindingPolicy(baseJndiName);
EjbDeploymentSummary ejbSummary = new EjbDeploymentSummary(this, dsummary);
+ // Need to compare iface against the metadata local/local-home/home/remote
+ if(this.isSession())
+ {
+ JBossSessionBeanMetaData sbeanMD = (JBossSessionBeanMetaData) this;
+ if(sbeanMD.getLocal() != null && sbeanMD.getLocal().equals(iface))
+ iface = KnownInterfaces.LOCAL;
+ else if(sbeanMD.getLocalHome() != null && sbeanMD.getLocalHome().equals(iface))
+ iface = KnownInterfaces.LOCAL_HOME;
+ else if(sbeanMD.getHome() != null && sbeanMD.getHome().equals(iface))
+ iface = KnownInterfaces.HOME;
+ else if(sbeanMD.getRemote() != null && sbeanMD.getRemote().equals(iface))
+ iface = KnownInterfaces.REMOTE;
+ }
+ else if(this.isEntity())
+ {
+ JBossEntityBeanMetaData ebeanMD = (JBossEntityBeanMetaData) this;
+ if(ebeanMD.getLocal() != null && ebeanMD.getLocal().equals(iface))
+ iface = KnownInterfaces.LOCAL;
+ else if(ebeanMD.getLocalHome() != null && ebeanMD.getLocalHome().equals(iface))
+ iface = KnownInterfaces.LOCAL_HOME;
+ else if(ebeanMD.getHome() != null && ebeanMD.getHome().equals(iface))
+ iface = KnownInterfaces.HOME;
+ else if(ebeanMD.getRemote() != null && ebeanMD.getRemote().equals(iface))
+ iface = KnownInterfaces.REMOTE;
+ }
resolvedJndiName = policy.getJndiName(ejbSummary, iface);
}
return resolvedJndiName;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java 2008-05-08 05:41:28 UTC (rev 73136)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java 2008-05-08 06:03:29 UTC (rev 73137)
@@ -93,7 +93,7 @@
jndiName = getJndiName(summary);
else if(KnownInterfaces.isKnownInterface(iface))
{
- jndiName = baseJndiName + "/" + iface.toLowerCase();
+ jndiName = baseJndiName + "/" + iface;
}
else
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/KnownInterfaces.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/KnownInterfaces.java 2008-05-08 05:41:28 UTC (rev 73136)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/KnownInterfaces.java 2008-05-08 06:03:29 UTC (rev 73137)
@@ -31,9 +31,9 @@
public final class KnownInterfaces
{
public static final String LOCAL = "local";
- public static final String LOCAL_HOME = "local-home";
+ public static final String LOCAL_HOME = "localHome";
public static final String REMOTE = "remote";
- public static final String HOME = "home";
+ public static final String HOME = "remoteHome";
/**
* Is iface one of the KnownInterfaces
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java 2008-05-08 05:41:28 UTC (rev 73136)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java 2008-05-08 06:03:29 UTC (rev 73137)
@@ -27,6 +27,7 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.EjbNameJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
import junit.framework.TestCase;
@@ -58,18 +59,43 @@
JBossEnterpriseBeanMetaData beanMD = getEjbMetaData();
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
assertEquals("testResolvedJndiNames-jndi-name", resolvedJndiName);
- String resolvedJndiNameRemote = beanMD.determineResolvedJndiName("remote", null);
+ String resolvedJndiNameRemote = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
assertEquals("testResolvedJndiNames-jndi-name/remote", resolvedJndiNameRemote);
- String resolvedJndiNameHome = beanMD.determineResolvedJndiName("Home", null);
- assertEquals("testResolvedJndiNames-jndi-name/home", resolvedJndiNameHome);
- String resolvedJndiNameLocal = beanMD.determineResolvedJndiName("local", null);
+ String resolvedJndiNameHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
+ assertEquals("testResolvedJndiNames-jndi-name/remoteHome", resolvedJndiNameHome);
+ String resolvedJndiNameLocal = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
assertEquals("testResolvedJndiNames-jndi-name/local", resolvedJndiNameLocal);
- String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("local-home", null);
- assertEquals("testResolvedJndiNames-jndi-name/local-home", resolvedJndiNameLocalHome);
+ String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
+ assertEquals("testResolvedJndiNames-jndi-name/localHome", resolvedJndiNameLocalHome);
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
assertEquals("testResolvedJndiNames-jndi-name/org.jboss.test.some.IFace", resolvedJndiNameIface);
}
/**
+ * JBMETA-36
+ */
+ public void testResolvedJndiNamesWithKnowIfaces()
+ {
+ JBossEnterpriseBeanMetaData beanMD = getEjbMetaData();
+ JBossSessionBeanMetaData sbeanMD = (JBossSessionBeanMetaData) beanMD;
+ sbeanMD.setLocal("org.jboss.ifaces.LocalIF");
+ sbeanMD.setLocalHome("org.jboss.ifaces.LocalHomeIF");
+ sbeanMD.setHome("org.jboss.ifaces.HomeIF");
+ sbeanMD.setRemote("org.jboss.ifaces.RemoteIF");
+
+ String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name", resolvedJndiName);
+ String resolvedJndiNameRemote = beanMD.determineResolvedJndiName("org.jboss.ifaces.RemoteIF", null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name/remote", resolvedJndiNameRemote);
+ String resolvedJndiNameHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.HomeIF", null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name/remoteHome", resolvedJndiNameHome);
+ String resolvedJndiNameLocal = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalIF", null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name/local", resolvedJndiNameLocal);
+ String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalHomeIF", null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name/localHome", resolvedJndiNameLocalHome);
+ String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
+ assertEquals("testResolvedJndiNamesWithKnowIfaces-jndi-name/org.jboss.test.some.IFace", resolvedJndiNameIface);
+ }
+ /**
* Test the determineResolvedJndiName with a jndiBindingPolicy on the
* JBossEnterpriseBeanMetaData
*
@@ -80,13 +106,13 @@
beanMD.setJndiBindingPolicy(EjbNameJndiBindingPolicy.class.getName());
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejb", resolvedJndiName);
- String resolvedJndiNameRemote = beanMD.determineResolvedJndiName("remote", null);
+ String resolvedJndiNameRemote = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejbRemote", resolvedJndiNameRemote);
- String resolvedJndiNameHome = beanMD.determineResolvedJndiName("Home", null);
+ String resolvedJndiNameHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejbHome", resolvedJndiNameHome);
- String resolvedJndiNameLocal = beanMD.determineResolvedJndiName("local", null);
+ String resolvedJndiNameLocal = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejbLocal", resolvedJndiNameLocal);
- String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("local-home", null);
+ String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejbLocalHome", resolvedJndiNameLocalHome);
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
assertEquals("testResolvedJndiNamesWithMDPolicy-ejb/org.jboss.test.some.IFace", resolvedJndiNameIface);
@@ -102,13 +128,13 @@
EjbNameJndiBindingPolicy policy = new EjbNameJndiBindingPolicy();
String resolvedJndiName = beanMD.determineResolvedJndiName(null, policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejb", resolvedJndiName);
- String resolvedJndiNameRemote = beanMD.determineResolvedJndiName("remote", policy);
+ String resolvedJndiNameRemote = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejbRemote", resolvedJndiNameRemote);
- String resolvedJndiNameHome = beanMD.determineResolvedJndiName("Home", policy);
+ String resolvedJndiNameHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejbHome", resolvedJndiNameHome);
- String resolvedJndiNameLocal = beanMD.determineResolvedJndiName("local", policy);
+ String resolvedJndiNameLocal = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejbLocal", resolvedJndiNameLocal);
- String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("local-home", policy);
+ String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejbLocalHome", resolvedJndiNameLocalHome);
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", policy);
assertEquals("testResolvedJndiNamesWithExternalPolicy-ejb/org.jboss.test.some.IFace", resolvedJndiNameIface);
More information about the jboss-cvs-commits
mailing list