You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/08/24 22:58:08 UTC
svn commit: r807374 - in
/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main:
Bootstrap.java Main.java Utils.java
Author: gnodet
Date: Mon Aug 24 20:58:08 2009
New Revision: 807374
URL: http://svn.apache.org/viewvc?rev=807374&view=rev
Log:
FELIX-1516: Child instances use stuff from the /etc directory in the root
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Utils.java
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java?rev=807374&r1=807373&r2=807374&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java Mon Aug 24 20:58:08 2009
@@ -52,7 +52,11 @@
private static void updateClassLoader() throws Exception {
File home = Utils.getKarafHome();
- File file = new File(new File(home, "etc"), FRAMEWORK_PROPERTIES_FILE_NAME);
+ File base = Utils.getKarafBase(home);
+ File file = new File(new File(base, "etc"), FRAMEWORK_PROPERTIES_FILE_NAME);
+ if (!file.exists()) {
+ file = new File(new File(home, "etc"), FRAMEWORK_PROPERTIES_FILE_NAME);
+ }
if (!file.exists()) {
throw new FileNotFoundException(file.getAbsolutePath());
}
@@ -69,7 +73,10 @@
if (bundle == null) {
throw new IllegalArgumentException("Property " + KARAF_FRAMEWORK + "." + framework + " must be set in the etc/" + FRAMEWORK_PROPERTIES_FILE_NAME + " configuration file");
}
- File bundleFile = new File(home, bundle);
+ File bundleFile = new File(base, bundle);
+ if (!bundleFile.exists()) {
+ bundleFile = new File(home, bundle);
+ }
if (!bundleFile.exists()) {
throw new FileNotFoundException(bundleFile.getAbsolutePath());
}
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=807374&r1=807373&r2=807374&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java Mon Aug 24 20:58:08 2009
@@ -144,7 +144,7 @@
public void launch() throws Exception {
karafHome = Utils.getKarafHome();
- karafBase = getKarafBase(karafHome);
+ karafBase = Utils.getKarafBase(karafHome);
//System.out.println("Karaf Home: "+main.servicemixHome.getPath());
//System.out.println("Karaf Base: "+main.servicemixBase.getPath());
@@ -300,27 +300,6 @@
}
}
- private static File getKarafBase(File defaultValue) {
- File rc = null;
-
- String path = System.getProperty(PROP_KARAF_BASE);
- if (path != null) {
- rc = Utils.validateDirectoryExists(path, "Invalid " + PROP_KARAF_BASE + " system property");
- }
-
- if (rc == null) {
- path = System.getenv(ENV_KARAF_BASE);
- if (path != null) {
- rc = Utils.validateDirectoryExists(path, "Invalid " + ENV_KARAF_BASE + " environment variable");
- }
- }
-
- if (rc == null) {
- rc = defaultValue;
- }
- return rc;
- }
-
private static void processSecurityProperties(Properties m_configProps) {
String prop = m_configProps.getProperty("org.apache.felix.karaf.security.providers");
if (prop != null) {
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Utils.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Utils.java?rev=807374&r1=807373&r2=807374&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Utils.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Utils.java Mon Aug 24 20:58:08 2009
@@ -90,4 +90,25 @@
}
return rc;
}
+
+ public static File getKarafBase(File defaultValue) {
+ File rc = null;
+
+ String path = System.getProperty(Main.PROP_KARAF_BASE);
+ if (path != null) {
+ rc = validateDirectoryExists(path, "Invalid " + Main.PROP_KARAF_BASE + " system property");
+ }
+
+ if (rc == null) {
+ path = System.getenv(Main.ENV_KARAF_BASE);
+ if (path != null) {
+ rc = validateDirectoryExists(path, "Invalid " + Main.ENV_KARAF_BASE + " environment variable");
+ }
+ }
+
+ if (rc == null) {
+ rc = defaultValue;
+ }
+ return rc;
+ }
}