You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2007/10/03 03:23:55 UTC

svn commit: r581467 - /geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

Author: dblevins
Date: Tue Oct  2 18:23:55 2007
New Revision: 581467

URL: http://svn.apache.org/viewvc?rev=581467&view=rev
Log:
Fix for GERONIMO-3199: Prefix ear name in deployment-id to make it unique
Set jndiname format to {ejbName}{interfaceType.annotationName}
Setup jndi name binding of non-javaee clients to not fail a deployment if a name is taken (just logs an ERROR as usual).

Modified:
    geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=581467&r1=581466&r2=581467&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Tue Oct  2 18:23:55 2007
@@ -105,10 +105,11 @@
         System.setProperty("duct tape","");
         System.setProperty("admin.disabled", "true");
         System.setProperty("openejb.logger.external", "true");
-        
-        setDefaultProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}");
+        System.setProperty("openejb.jndiname.failoncollision", "false");
+
+        setDefaultProperty("openejb.deploymentId.format", "{appId}/{moduleId}/{ejbName}");
         setDefaultProperty("openejb.jndiname.strategy.class", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy");
-        setDefaultProperty("openejb.jndiname.format", "{deploymentId}/{interfaceClass}");
+        setDefaultProperty("openejb.jndiname.format", "{ejbName}{interfaceType.annotationName}");
 
         System.setProperty("openejb.naming", "xbean");
         if (transactionManager == null) {