geronimo-scm mailing list archives

Author: dblevins
Date: Tue Oct  2 18:55:44 2007
New Revision: 581470

URL: http://svn.apache.org/viewvc?rev=581470&view=rev
Log:
Accidentally checked it in in a non-configurable way.  Made it configurable.

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=581470&r1=581469&r2=581470&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:55:44 2007
@@ -107,12 +107,12 @@
         System.setProperty("duct tape","");
         System.setProperty("admin.disabled", "true");
         System.setProperty("openejb.logger.external", "true");
-        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", "{ejbName}{interfaceType.annotationName}");
-
+        setDefaultProperty("openejb.jndiname.failoncollision", "false");
+        
         System.setProperty("openejb.naming", "xbean");
         if (transactionManager == null) {
             throw new NullPointerException("transactionManager is null");