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/10/05 18:16:16 UTC
svn commit: r821901 - in /felix/trunk/karaf/main/src/main:
java/org/apache/felix/karaf/main/Main.java resources/config.properties
Author: gnodet
Date: Mon Oct 5 16:16:16 2009
New Revision: 821901
URL: http://svn.apache.org/viewvc?rev=821901&view=rev
Log:
FELIX-1660: karaf should not hardcode the 'system' location of its maven like repository, patch provided by David Jencks
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
felix/trunk/karaf/main/src/main/resources/config.properties
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=821901&r1=821900&r2=821901&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 Oct 5 16:16:16 2009
@@ -132,6 +132,8 @@
public static final String PROPERTY_LOCK_LEVEL = "karaf.lock.level";
+ public static final String DEFAULT_REPO = "karaf.default.repository";
+
public static final String PROPERTY_LOCK_CLASS_DEFAULT = SimpleFileLock.class.getName();
Logger LOG = Logger.getLogger(this.getClass().getName());
@@ -714,17 +716,10 @@
try {
File file = new File(new File(karafBase, "etc"), CONFIG_PROPERTIES_FILE_NAME);
- configPropURL = file.toURL();
+ configPropURL = file.toURI().toURL();
file = new File(new File(karafBase, "etc"), STARTUP_PROPERTIES_FILE_NAME);
- startupPropURL = file.toURL();
-
- if (karafBase.equals(karafHome)) {
- bundleDirs.add(new File(karafHome, "system"));
- } else {
- bundleDirs.add(new File(karafBase, "system"));
- bundleDirs.add(new File(karafHome, "system"));
- }
+ startupPropURL = file.toURI().toURL();
}
catch (MalformedURLException ex) {
@@ -736,6 +731,15 @@
Properties configProps = loadPropertiesFile(configPropURL);
Properties startupProps = loadPropertiesFile(startupPropURL);
+ String defaultRepo = configProps.getProperty(DEFAULT_REPO, "system");
+
+ if (karafBase.equals(karafHome)) {
+ bundleDirs.add(new File(karafHome, defaultRepo));
+ } else {
+ bundleDirs.add(new File(karafBase, defaultRepo));
+ bundleDirs.add(new File(karafHome, defaultRepo));
+ }
+
String locations = configProps.getProperty(BUNDLE_LOCATIONS);
if (locations != null) {
Modified: felix/trunk/karaf/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/resources/config.properties?rev=821901&r1=821900&r2=821901&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/resources/config.properties (original)
+++ felix/trunk/karaf/main/src/main/resources/config.properties Mon Oct 5 16:16:16 2009
@@ -43,6 +43,7 @@
osgi.shell.telnet=on
#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
+karaf.default.repository=system
#list of directories containing bundles to be loaded by SMX
#bundle.locations=