svn commit: r1350053 - /openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jun 13 23:28:29 2012
New Revision: 1350053

URL: http://svn.apache.org/viewvc?rev=1350053&view=rev
Log:
reverting conf.d change since it was released and has a JIRA on OpenEJB (1791). 
This change was not only for tomee.

Modified:
    
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Modified: 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=1350053&r1=1350052&r2=1350053&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 Wed Jun 13 23:28:29 2012
@@ -205,7 +205,7 @@ public abstract class ServiceManager {
         if (conf.exists()) {
             File serviceConfig = new File(conf, serviceName + ".properties");
             if (!serviceConfig.exists()) {
-                serviceConfig = new File(conf, serviceConfig.getName());
+                serviceConfig = new File(conf, "conf.d/" + 
serviceConfig.getName());
             }
             if (serviceConfig.exists()) {
                 IO.readProperties(serviceConfig, serviceProperties);
@@ -263,4 +263,4 @@ public abstract class ServiceManager {
 
     abstract public void stop() throws ServiceException;
 
-}
\ No newline at end of file
+}