Author: rmannibucau
Date: Fri Oct 5 21:19:51 2012
New Revision: 1394819
URL: http://svn.apache.org/viewvc?rev=1394819&view=rev
Log:
OPENEJB-1909 using etc as synonym for conf folder
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
Fri Oct 5 21:19:51 2012
@@ -112,23 +112,17 @@ public class ConfigUtils {
* [4] Try finding the standard openejb.xml file relative to the
* openejb.base directory
*/
- try {
- file =
SystemInstance.get().getBase().getFile("conf/openejb.xml");
- if (file != null && file.exists() && file.isFile()) {
- return file.getAbsolutePath();
- }
- } catch (java.io.FileNotFoundException e) {
+ file = SystemInstance.get().getConf("openejb.xml");
+ if (file != null && file.exists() && file.isFile()) {
+ return file.getAbsolutePath();
}
/*
* [5] Try finding the standard openejb.conf file relative to the
*/
- try {
- file =
SystemInstance.get().getBase().getFile("conf/openejb.conf");
- if (file != null && file.exists() && file.isFile()) {
- return file.getAbsolutePath();
- }
- } catch (java.io.FileNotFoundException e) {
+ file = SystemInstance.get().getConf("conf/openejb.conf");
+ if (file != null && file.exists() && file.isFile()) {
+ return file.getAbsolutePath();
}
@@ -139,9 +133,9 @@ public class ConfigUtils {
* the openejb-x.x.x.jar
*/
- final File confDir =
SystemInstance.get().getBase().getDirectory("conf", false);
+ File confDir = SystemInstance.get().getConf(null);
- if (confDir.exists()) {
+ if (confDir != null && confDir.exists()) {
File config = new File(confDir, "openejb.xml");
logger.info("Cannot find the configuration file
[conf/openejb.xml]. Creating one at "+config.getAbsolutePath());
file = createConfig(config);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
Fri Oct 5 21:19:51 2012
@@ -194,9 +194,8 @@ public class NewLoaderLogic {
FileInputStream fis = null;
try {
- final File conf =
SystemInstance.get().getBase().getDirectory("conf");
- final File exclusionsFile = new File(conf, EXCLUSION_FILE);
- if (exclusionsFile.exists()) {
+ final File exclusionsFile =
SystemInstance.get().getConf(EXCLUSION_FILE);
+ if (exclusionsFile != null && exclusionsFile.exists()) {
fis = new FileInputStream(exclusionsFile);
exclusions = readInputStreamList(fis);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
Fri Oct 5 21:19:51 2012
@@ -92,9 +92,9 @@ public class ConfUtils {
SystemInstance system = SystemInstance.get();
FileUtils base = system.getBase();
- File conf = base.getDirectory("conf");
+ File conf = system.getConf(null);
- if (!conf.exists()) return null;
+ if (conf != null && !conf.exists()) return null;
File file = new File(conf, name);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
Fri Oct 5 21:19:51 2012
@@ -63,7 +63,10 @@ public class Log4jLogStreamFactory imple
final boolean embedded =
SystemInstance.get().getOptions().get("openejb.logging.embedded", false);
- final File confDir =
SystemInstance.get().getBase().getDirectory("conf");
+ File confDir = SystemInstance.get().getConf(null);
+ if (confDir == null) {
+ confDir = SystemInstance.get().getBase().getDirectory("conf");
+ }
//Use the old file name first
File loggingPropertiesFile = new File(confDir,
LOGGING_PROPERTIES_FILE);
@@ -103,7 +106,7 @@ public class Log4jLogStreamFactory imple
private void preprocessProperties(final Properties properties) {
final FileUtils base = SystemInstance.get().getBase();
- final File confDir = new File(base.getDirectory(), "conf");
+ final File confDir = SystemInstance.get().getConf(null);
final File baseDir = base.getDirectory();
final File userDir = new File("foo").getParentFile();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Fri Oct 5 21:19:51 2012
@@ -310,7 +310,7 @@ public class Logger {
private static Properties loadLoggingProperties() {
try {
- final File conf =
SystemInstance.get().getBase().getDirectory("conf");
+ final File conf = SystemInstance.get().getConf(null);
final File file = new File(conf, "logging.properties");
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
Fri Oct 5 21:19:51 2012
@@ -301,7 +301,7 @@ public class UrlCache {
File dir = null;
// if we are not embedded, cache (temp) dir is under base dir
- if (openejbBase.getDirectory("conf").exists()) {
+ if (SystemInstance.get().getConf(null).exists()) {
try {
dir = openejbBase.getDirectory("temp");
} catch (IOException e) {
Modified:
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
(original)
+++
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
Fri Oct 5 21:19:51 2012
@@ -117,8 +117,8 @@ public class ProvisioningUtil {
}
public static void addAdditionalLibraries() throws IOException {
- final File conf = new
File(SystemInstance.get().getBase().getDirectory("conf"),
ADDITIONAL_LIB_CONFIG);
- if (!conf.exists()) {
+ File conf = SystemInstance.get().getConf(ADDITIONAL_LIB_CONFIG);
+ if (conf == null || !conf.exists()) {
return;
}
Modified:
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java?rev=1394819&r1=1394818&r2=1394819&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
(original)
+++
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
Fri Oct 5 21:19:51 2012
@@ -242,14 +242,31 @@ public class SystemInstance {
addSystemProperties(file);
}
- private static void readSystemProperties() {
- // Read in and apply the conf/system.properties
+ public File getConf(final String subPath) {
+ File conf = null;
try {
- final File conf = system.getBase().getDirectory("conf");
- final File file = new File(conf, "system.properties");
- addSystemProperties(file);
+ conf = system.getBase().getDirectory("conf");
} catch (IOException e) {
- // no-op
+ try {
+ conf = system.getBase().getDirectory("etc");
+ } catch (IOException ie) {
+ // no-op
+ }
+ }
+ if (conf == null) {
+ return new File(system.getBase().getDirectory(), "conf");
+ }
+ if (subPath == null) {
+ return conf;
+ }
+ return new File(conf, subPath);
+ }
+
+ private static void readSystemProperties() {
+ // Read in and apply the conf/system.properties
+ final File conf = system.getConf("system.properties");
+ if (conf != null && conf.exists()) {
+ addSystemProperties(conf);
}
}
