[jboss-cvs] JBossAS SVN: r75866 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 16 00:40:58 EDT 2008
Author: ALRubinger
Date: 2008-07-16 00:40:58 -0400 (Wed, 16 Jul 2008)
New Revision: 75866
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java
Log:
[JBMETA-75] jndi-name cannot be used as a base for JNDI Names
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-07-16 04:34:46 UTC (rev 75865)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java 2008-07-16 04:40:58 UTC (rev 75866)
@@ -186,11 +186,7 @@
assert md instanceof JBossSessionBeanMetaData : "Metadata reports as Session Bean but is not assignable to "
+ JBossSessionBeanMetaData.class.getName();
JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) md;
- baseName = smd.getJndiName();
- if (baseName == null || baseName.trim().length() == 0)
- {
- baseName = smd.getEjbName();
- }
+ baseName = smd.getEjbName();
}
if (md.isEntity())
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java 2008-07-16 04:34:46 UTC (rev 75865)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java 2008-07-16 04:40:58 UTC (rev 75866)
@@ -35,6 +35,7 @@
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossEnterpriseBeanJndiNameResolver;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossSessionBeanJndiNameResolver;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces.KnownInterfaceType;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
@@ -55,7 +56,7 @@
{
// Obtain MD and define expected values for resolution
JBossSessionBeanMetaData beanMD = getDecoratedEjbMetaData();
- String expected = "testResolvedJndiName-jndi-name/home";
+ String expected = "testResolvedJndiName-ejb/home";
// Resolve
String resolved = beanMD.getHomeJndiName();
@@ -76,7 +77,7 @@
String mappedName = "testResolvedJndiName-mapped-name";
beanMD.setMappedName(mappedName);
String expectedRemoteBusiness = mappedName;
- String expectedBase = "testResolvedJndiNameWithMappedName-jndi-name/";
+ String expectedBase = "testResolvedJndiNameWithMappedName-ejb/";
String expectedLocalBusiness = expectedBase + "local";
String expectedLocalHome = expectedBase + "localHome";
String expectedHome = expectedBase + "home";
@@ -113,10 +114,11 @@
JBossSessionBeanMetaData beanMD = getDecoratedEjbMetaData();
// Define expected resolved values
- String expectedRemote = "testResolvedJndiNames-jndi-name/remote";
- String expectedHome = "testResolvedJndiNames-jndi-name/home";
- String expectedLocal = "testResolvedJndiNames-jndi-name/local";
- String expectedLocalHome = "testResolvedJndiNames-jndi-name/localHome";
+ String expectedBase = "testResolvedJndiNames-ejb/";
+ String expectedRemote = expectedBase + KnownInterfaceType.BUSINESS_REMOTE.toSuffix();
+ String expectedHome = expectedBase + KnownInterfaceType.REMOTE_HOME.toSuffix();
+ String expectedLocal = expectedBase + KnownInterfaceType.BUSINESS_LOCAL.toSuffix();
+ String expectedLocalHome = expectedBase + KnownInterfaceType.LOCAL_HOME.toSuffix();
// Resolve
String resolvedJndiNameRemote = beanMD.getJndiName();
@@ -177,15 +179,15 @@
beanMD.setBusinessRemotes(remotes);
// Define expected resolved values
- String base = "testResolvedJndiNamesWithKnownIfaces-jndi-name/";
+ String base = "testResolvedJndiNamesWithKnownIfaces-ejb/";
String expectedRemoteDefault = base + "remote";
String expectedRemote1 = base + "remote-org.jboss.ifaces.RemoteIF1";
String expectedRemote2 = base + "remote-org.jboss.ifaces.RemoteIF2";
- String expectedHome = base + "home";
- String expectedLocalDefault = base + "local";
+ String expectedHome = base + KnownInterfaceType.REMOTE_HOME.toSuffix();
+ String expectedLocalDefault = base + KnownInterfaceType.BUSINESS_LOCAL.toSuffix();
String expectedLocal1 = base + "local-org.jboss.ifaces.LocalIF1";
String expectedLocal2 = base + "local-org.jboss.ifaces.LocalIF2";
- String expectedLocalHome = base + "localHome";
+ String expectedLocalHome = base + KnownInterfaceType.LOCAL_HOME.toSuffix();
// Resolve
String resolvedJndiNameRemoteDefaultFromMDMethod = beanMD.getJndiName();
@@ -260,8 +262,8 @@
sbeanMD.setRemote(remote);
// Define expected values
- String expectedRemote = "testResolvedJndiNamesWithKnownIfaces2x-jndi-name";
- String expectedHome = "testResolvedJndiNamesWithKnownIfaces2x-jndi-name";
+ String expectedRemote = "testResolvedJndiNamesWithKnownIfaces2x-ejb";
+ String expectedHome = "testResolvedJndiNamesWithKnownIfaces2x-ejb";
String expectedLocalHome = "local/" + sbeanMD.getEjbName() + '@' + System.identityHashCode(sbeanMD.getEjbName());
// Resolve
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-07-16 04:34:46 UTC (rev 75865)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java 2008-07-16 04:40:58 UTC (rev 75866)
@@ -48,7 +48,7 @@
{
JBossEnterpriseBeanMetaData beanMD = getEjbMetaData();
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
- assertEquals("testResolvedJndiName-jndi-name", resolvedJndiName);
+ assertEquals("testResolvedJndiName-ejb", resolvedJndiName);
}
public void testResolvedJndiNameWithMappedName()
{
@@ -61,17 +61,17 @@
{
JBossEnterpriseBeanMetaData beanMD = getEjbMetaData();
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
- assertEquals("testResolvedJndiNames-jndi-name", resolvedJndiName);
+ assertEquals("testResolvedJndiNames-ejb", resolvedJndiName);
String resolvedJndiNameRemote = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
- assertEquals("testResolvedJndiNames-jndi-name/remote", resolvedJndiNameRemote);
+ assertEquals("testResolvedJndiNames-ejb/remote", resolvedJndiNameRemote);
String resolvedJndiNameHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
- assertEquals("testResolvedJndiNames-jndi-name/home", resolvedJndiNameHome);
+ assertEquals("testResolvedJndiNames-ejb/home", resolvedJndiNameHome);
String resolvedJndiNameLocal = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
- assertEquals("testResolvedJndiNames-jndi-name/local", resolvedJndiNameLocal);
+ assertEquals("testResolvedJndiNames-ejb/local", resolvedJndiNameLocal);
String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
- assertEquals("testResolvedJndiNames-jndi-name/localHome", resolvedJndiNameLocalHome);
+ assertEquals("testResolvedJndiNames-ejb/localHome", resolvedJndiNameLocalHome);
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
- assertEquals("testResolvedJndiNames-jndi-name/org.jboss.test.some.IFace", resolvedJndiNameIface);
+ assertEquals("testResolvedJndiNames-ejb/org.jboss.test.some.IFace", resolvedJndiNameIface);
}
/**
* JBMETA-36, JBMETA-37
@@ -94,21 +94,21 @@
sbeanMD.setBusinessRemotes(remotes);
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name", resolvedJndiName);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb", resolvedJndiName);
String resolvedJndiNameRemote = beanMD.determineResolvedJndiName("org.jboss.ifaces.RemoteIF", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/remote-org.jboss.ifaces.RemoteIF", resolvedJndiNameRemote);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/remote-org.jboss.ifaces.RemoteIF", resolvedJndiNameRemote);
String resolvedJndiNameRemote2 = beanMD.determineResolvedJndiName("org.jboss.ifaces.RemoteIF2", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/remote-org.jboss.ifaces.RemoteIF2", resolvedJndiNameRemote2);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/remote-org.jboss.ifaces.RemoteIF2", resolvedJndiNameRemote2);
String resolvedJndiNameHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.HomeIF", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/home", resolvedJndiNameHome);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/home", resolvedJndiNameHome);
String resolvedJndiNameLocal = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalIF", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/local-org.jboss.ifaces.LocalIF", resolvedJndiNameLocal);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/local-org.jboss.ifaces.LocalIF", resolvedJndiNameLocal);
String resolvedJndiNameLocal2 = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalIF2", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/local-org.jboss.ifaces.LocalIF2", resolvedJndiNameLocal2);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/local-org.jboss.ifaces.LocalIF2", resolvedJndiNameLocal2);
String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalHomeIF", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/localHome", resolvedJndiNameLocalHome);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/localHome", resolvedJndiNameLocalHome);
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces-jndi-name/org.jboss.test.some.IFace", resolvedJndiNameIface);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces-ejb/org.jboss.test.some.IFace", resolvedJndiNameIface);
}
public void testResolvedJndiNamesWithKnownIfaces2x()
{
@@ -123,9 +123,9 @@
String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces2x-jndi-name", resolvedJndiName);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces2x-ejb", resolvedJndiName);
String resolvedJndiNameHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.HomeIF", null);
- assertEquals("testResolvedJndiNamesWithKnownIfaces2x-jndi-name", resolvedJndiNameHome);
+ assertEquals("testResolvedJndiNamesWithKnownIfaces2x-ejb", resolvedJndiNameHome);
String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalHomeIF", null);
assertEquals(sbeanMD.determineLocalJndiName(), resolvedJndiNameLocalHome);
}
More information about the jboss-cvs-commits
mailing list