[jboss-cvs] JBossAS SVN: r75869 - 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 02:34:32 EDT 2008
Author: ALRubinger
Date: 2008-07-16 02:34:32 -0400 (Wed, 16 Jul 2008)
New Revision: 75869
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] Bug fix and resolve affected tests
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 06:14:53 UTC (rev 75868)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java 2008-07-16 06:34:32 UTC (rev 75869)
@@ -118,7 +118,11 @@
{
mappedName = ((JBossSessionBeanMetaData) md).getJndiName();
}
- mappedName = md.getMappedName();
+ String setMappedName = md.getMappedName();
+ if (setMappedName != null && setMappedName.trim().length() > 0)
+ {
+ mappedName = md.getMappedName();
+ }
// JBMETA-75
// Use mappedName if it's specified
@@ -170,6 +174,7 @@
}
}
+
return jndiName;
}
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 06:14:53 UTC (rev 75868)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java 2008-07-16 06:34:32 UTC (rev 75869)
@@ -76,29 +76,59 @@
JBossSessionBeanMetaData beanMD = getDecoratedEjbMetaData();
String mappedName = "testResolvedJndiName-mapped-name";
beanMD.setMappedName(mappedName);
- String expectedRemoteBusiness = mappedName;
+
+ // Execute the tests
String expectedBase = "testResolvedJndiNameWithMappedName-ejb/";
+ this.resolvedOverrideName(beanMD, mappedName, expectedBase);
+
+ }
+
+ @SuppressWarnings(value="deprecation")
+ public void testResolvedJndiNameWithJndiName()
+ {
+ // Obtain MD, set mappedName, and define expected values for resolution
+ JBossSessionBeanMetaData beanMD = getDecoratedEjbMetaData();
+ String jndiName = "testResolvedJndiName-jndi-name";
+ beanMD.setJndiName(jndiName);
+
+ // Execute the tests
+ String expectedBase = "testResolvedJndiNameWithJndiName-ejb/";
+ this.resolvedOverrideName(beanMD, jndiName, expectedBase);
+
+ }
+
+ /**
+ * Tests for resolved JNDI names in presense of a mapped-name or
+ * jndi-name override
+ *
+ * @param md
+ * @param overrideName
+ */
+ private void resolvedOverrideName(JBossSessionBeanMetaData md, String overrideName, String expectedBase)
+ {
+ String expectedRemoteBusiness = overrideName;
String expectedLocalBusiness = expectedBase + "local";
String expectedLocalHome = expectedBase + "localHome";
String expectedHome = expectedBase + "home";
// Resolve
- String resolvedRemoteBusiness = beanMD.getJndiName();
- String resolvedHome = beanMD.getHomeJndiName();
+ String resolvedRemoteBusiness = md.getJndiName();
+ String resolvedHome = md.getHomeJndiName();
// Test
assertEquals(
- "JNDI Target for default remote business interface in presense of mapped-name must be equal to mapped-name",
+ "JNDI Target for default remote business interface in presense of mapped-name must be equal to overridden name",
expectedRemoteBusiness, resolvedRemoteBusiness);
- assertEquals("JNDI Target for Remote Home in presense of a mapped-name is invalid", expectedHome, resolvedHome);
+ assertEquals("JNDI Target for Remote Home in presense of an overridden name is invalid", expectedHome,
+ resolvedHome);
// Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
- String resolvedDeprecatedRemoteDefault = beanMD.determineJndiName();
- String resolvedDeprecatedRemoteDefault2 = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
- String resolvedDeprecatedLocalDefault = beanMD.determineLocalJndiName();
- String resolvedDeprecatedLocalDefault2 = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
- String resolvedDeprecatedLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
- String resolvedDeprecatedHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
+ String resolvedDeprecatedRemoteDefault = md.determineJndiName();
+ String resolvedDeprecatedRemoteDefault2 = md.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
+ String resolvedDeprecatedLocalDefault = md.determineLocalJndiName();
+ String resolvedDeprecatedLocalDefault2 = md.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
+ String resolvedDeprecatedLocalHome = md.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
+ String resolvedDeprecatedHome = md.determineResolvedJndiName(KnownInterfaces.HOME, null);
assertEquals(expectedHome, resolvedDeprecatedHome);
assertEquals(expectedRemoteBusiness, resolvedDeprecatedRemoteDefault);
assertEquals(expectedRemoteBusiness, resolvedDeprecatedRemoteDefault2);
@@ -113,9 +143,11 @@
// Get Metadata
JBossSessionBeanMetaData beanMD = getDecoratedEjbMetaData();
+ // Remove a defined jndi-name
+
// Define expected resolved values
String expectedBase = "testResolvedJndiNames-ejb/";
- String expectedRemote = expectedBase + KnownInterfaceType.BUSINESS_REMOTE.toSuffix();
+ String expectedRemote = beanMD.getJndiName();
String expectedHome = expectedBase + KnownInterfaceType.REMOTE_HOME.toSuffix();
String expectedLocal = expectedBase + KnownInterfaceType.BUSINESS_LOCAL.toSuffix();
String expectedLocalHome = expectedBase + KnownInterfaceType.LOCAL_HOME.toSuffix();
@@ -453,7 +485,6 @@
JBossSessionBeanMetaData sbeanMD = new JBossSessionBeanMetaData();
sbeanMD.setEjbName(name + "-ejb");
sbeanMD.setEjbClass("org.jboss.ejb." + name);
- sbeanMD.setJndiName(name + "-jndi-name");
JBossEnterpriseBeansMetaData beans = new JBossEnterpriseBeansMetaData();
beans.setEjbJarMetaData(jbossMetaData);
beans.add(sbeanMD);
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 06:14:53 UTC (rev 75868)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolvedJndiNameUnitTestCase.java 2008-07-16 06:34:32 UTC (rev 75869)
@@ -73,6 +73,7 @@
String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
assertEquals("testResolvedJndiNames-ejb/org.jboss.test.some.IFace", resolvedJndiNameIface);
}
+
/**
* JBMETA-36, JBMETA-37
*/
@@ -214,7 +215,6 @@
JBossSessionBeanMetaData sbeanMD = new JBossSessionBeanMetaData();
sbeanMD.setEjbName(name+"-ejb");
sbeanMD.setEjbClass("org.jboss.ejb."+name);
- sbeanMD.setJndiName(name+"-jndi-name");
JBossEnterpriseBeansMetaData beans = new JBossEnterpriseBeansMetaData();
beans.setEjbJarMetaData(jbossMetaData);
beans.add(sbeanMD);
More information about the jboss-cvs-commits
mailing list