Author: rfeng
Date: Fri Jan 30 18:13:35 2009
New Revision: 739364
URL: http://svn.apache.org/viewvc?rev=739364&view=rev
Log:
Set the default configuration area using a temp folder
Modified:
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
tuscany/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
Modified:
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=739364&r1=739363&r2=739364&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
(original)
+++
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
Fri Jan 30 18:13:35 2009
@@ -30,6 +30,7 @@
import static
org.apache.tuscany.sca.node.equinox.launcher.NodeLauncherUtil.thisBundleLocation;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -154,20 +155,28 @@
logger.fine("Equinox location: " + root);
}
- put(props, LocationManager.PROP_INSTANCE_AREA, new File(root,
"workspace").toURI().toString());
+ put(props, LocationManager.PROP_INSTANCE_AREA_DEFAULT, new
File(root, "workspace").toURI().toString());
put(props, LocationManager.PROP_INSTALL_AREA, new File(root,
"install").toURI().toString());
- put(props, LocationManager.PROP_CONFIG_AREA, new File(root,
"config").toURI().toString());
- put(props, LocationManager.PROP_USER_AREA, new File(root,
"user").toURI().toString());
+ put(props, LocationManager.PROP_CONFIG_AREA_DEFAULT, new
File(root, "config").toURI().toString());
+ put(props, LocationManager.PROP_USER_AREA_DEFAULT, new
File(root, "user").toURI().toString());
EclipseStarter.setInitialProperties(props);
// Test if the configuration/config.ini or osgi.bundles has
been set
// If yes, try to avoid discovery of bundles
if (bundleLocations == null) {
- String config =
props.getProperty(LocationManager.PROP_CONFIG_AREA);
- File ini = new File(config, "config.ini");
- if (ini.isFile() || props.getProperty("osgi.bundles") !=
null) {
+ if (props.getProperty("osgi.bundles") != null) {
bundleLocations = Collections.emptySet();
+ } else {
+ String config =
props.getProperty(LocationManager.PROP_CONFIG_AREA);
+ File ini = new File(config, "config.ini");
+ if (ini.isFile()) {
+ Properties iniProps = new Properties();
+ iniProps.load(new FileInputStream(ini));
+ if (iniProps.getProperty("osgi.bundles") != null) {
+ bundleLocations = Collections.emptySet();
+ }
+ }
}
}
Modified:
tuscany/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java?rev=739364&r1=739363&r2=739364&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
(original)
+++
tuscany/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
Fri Jan 30 18:13:35 2009
@@ -33,6 +33,7 @@
@BeforeClass
public static void setUp() {
+ System.setProperty("osgi.configuration.area",
"target/equinox/configuration");
try {
launcher = NodeLauncher.newInstance();
} catch (Exception e) {
@@ -42,6 +43,7 @@
@AfterClass
public static void tearDown() {
+ System.clearProperty("osgi.configuration.area");
if (launcher != null) {
launcher.destroy();
}
