You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/03/20 16:49:15 UTC
svn commit: r639327 - in /incubator/tuscany/java/sca:
itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/
modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/
Author: rsivaram
Date: Thu Mar 20 08:49:15 2008
New Revision: 639327
URL: http://svn.apache.org/viewvc?rev=639327&view=rev
Log:
Move cachedir to target directory
Modified:
incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java?rev=639327&r1=639326&r2=639327&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java Thu Mar 20 08:49:15 2008
@@ -39,6 +39,8 @@
testHarness = new OSGiTuscanyTestHarness();
testHarness.setUp();
+
+ System.setProperty("python.cachedir", "target/cachedir");
}
Modified: incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java?rev=639327&r1=639326&r2=639327&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java Thu Mar 20 08:49:15 2008
@@ -75,7 +75,11 @@
Method propsMethod = felixMainClass.getMethod("loadConfigProperties");
Properties props = (Properties)propsMethod.invoke(null);
- File profileDir = new File(".felix");
+ String profileDirName = ".felix";
+ File targetDir = new File("target");
+ if (targetDir.exists() && targetDir.isDirectory())
+ profileDirName = "target/" + profileDirName;
+ File profileDir = new File(profileDirName);
if (profileDir.isDirectory())
deleteDirectory(profileDir);
else
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org