Author: genspring
Date: Mon Mar 14 04:48:42 2011
New Revision: 1081262
URL: http://svn.apache.org/viewvc?rev=1081262&view=rev
Log:
we are now using {moduleUri}/{ejbName} instead of {moduleId}/{ejbName} as the EJB deploymentId
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1081262&r1=1081261&r2=1081262&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Mon Mar 14 04:48:42 2011
@@ -214,7 +214,7 @@ public class EjbModuleBuilder implements
System.setProperty("openejb.logger.external", "true");
System.setProperty("openejb.log.factory", "org.apache.openejb.util.PaxLogStreamFactory");
- setDefaultProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}");
+ setDefaultProperty("openejb.deploymentId.format", "{moduleUri}/{ejbName}");
setDefaultProperty("openejb.jndiname.strategy.class", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy");
setDefaultProperty("openejb.jndiname.format", "{ejbName}{interfaceType.annotationName}");
setDefaultProperty("openejb.jndiname.failoncollision", "false");
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=1081262&r1=1081261&r2=1081262&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Mon Mar 14 04:48:42 2011
@@ -123,7 +123,7 @@ public class OpenEjbSystemGBean implemen
System.setProperty("admin.disabled", "true");
System.setProperty("openejb.logger.external", "true");
- setDefaultProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}");
+ setDefaultProperty("openejb.deploymentId.format", "{moduleUri}/{ejbName}");
setDefaultProperty("openejb.jndiname.strategy.class", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy");
setDefaultProperty("openejb.jndiname.format", "{ejbName}{interfaceType.annotationName}");
setDefaultProperty("openejb.jndiname.failoncollision", "false");
|