svn commit: r1238258 - in /openejb/trunk/openejb/tomee: tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Jan 31 08:39:31 2012
New Revision: 1238258

URL: http://svn.apache.org/viewvc?rev=1238258&view=rev
Log:
TOMEE-131 using tomee.xml instead of openejb.xml if it exists

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
    openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1238258&r1=1238257&r2=1238258&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Tue Jan 31 08:39:31 2012
@@ -160,6 +160,11 @@ public class TomcatLoader implements Loa
         try {
             conf = SystemInstance.get().getBase().getDirectory("conf");
 
+            final File tomeeXml = new File(conf, "tomee.xml");
+            if (tomeeXml.exists()) { // use tomee.xml instead of openejb.xml
+                SystemInstance.get().setProperty("openejb.configuration", tomeeXml.getAbsolutePath());
+            }
+
             //Look for custom system properties
             File file = new File(conf, "system.properties");
             if (file.exists()) {

Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1238258&r1=1238257&r2=1238258&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Tue Jan 31 08:39:31 2012
@@ -371,8 +371,8 @@ public class Installer {
         }
     }
     /**
-     * Installs conf/openejb.xml and conf/logging.properties files.
-     * This method retrieves the openejb.xml and logging.properties files
+     * Installs conf/tomee.xml and conf/logging.properties files.
+     * This method retrieves the tomee.xml and logging.properties files
      * from openejb core jar file and installs them under the conf directory
      * of tomcat. if there is already a conf/logging.properties file available
      * then this method appends the contents of openejb logging.properties file
@@ -400,16 +400,16 @@ public class Installer {
         }
 
         //
-        // conf/openejb.xml
+        // conf/tomee.xml
         //
 
-        File openEjbXmlFile = new File(confDir, "openejb.xml");
+        File openEjbXmlFile = new File(confDir, "tomee.xml");
         if (!openEjbXmlFile.exists()) {
             // read in the openejb.xml file from the openejb core jar
             String openEjbXml = Installers.readEntry(coreJar, "default.openejb.conf", alerts);
             if (openEjbXml != null) {
                 if (Installers.writeAll(openEjbXmlFile, openEjbXml, alerts)) {
-                    alerts.addInfo("Copy openejb.xml to conf");
+                    alerts.addInfo("Copy tomee.xml to conf");
                 }
             }
         }
@@ -472,7 +472,7 @@ public class Installer {
                 systemPropertiesWriter.write("# openejb.servicemanager.enabled = false\n");
                 systemPropertiesWriter.write("# openejb.descriptors.output = false\n");
                 systemPropertiesWriter.write("# openejb.strict.interface.declaration = false\n");
-                systemPropertiesWriter.write("# openejb.conf.file = conf/openejb.xml\n");
+                systemPropertiesWriter.write("# openejb.conf.file = conf/tomee.xml\n");
                 systemPropertiesWriter.write("# openejb.debuggable-vm-hackery = false\n");
                 systemPropertiesWriter.write("# openejb.validation.skip = false\n");
                 systemPropertiesWriter.write("# openejb.webservices.enabled = true\n");