geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r581456 - /geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Date Wed, 03 Oct 2007 01:16:14 GMT
Author: dblevins
Date: Tue Oct  2 18:16:13 2007
New Revision: 581456

URL: http://svn.apache.org/viewvc?rev=581456&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/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=581456&r1=581455&r2=581456&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Tue Oct  2 18:16:13 2007
@@ -107,10 +107,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) {



Mime
View raw message