| commit | d5d9bcbdcee34b596fc7127d03be5ad50d225791 | [log] [tgz] |
|---|---|---|
| author | Thomas Vachuska <tom@onlab.us> | Wed Mar 18 17:46:20 2015 -0700 |
| committer | Thomas Vachuska <tom@onlab.us> | Wed Mar 18 17:46:20 2015 -0700 |
| tree | ad928df026a5b0039f6e08a434c6513f380c5f2a | |
| parent | 3c994f7e8ca9adcdffb75590711f7638dbcae3b0 [diff] |
Changing location where ONOS stages its deployed apps. Change-Id: Ia3931454067829b6331419f81a714d865dc8a1e6
diff --git a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java index d60f74b..880a31b 100644 --- a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java +++ b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
@@ -76,9 +76,9 @@ private static final String APP_XML = "app.xml"; private static final String M2_PREFIX = "m2"; - private static final String KARAF_ROOT = "."; + private static final String KARAF_ROOT = "../"; private static final String M2_ROOT = "system/"; - private static final String APPS_ROOT = "data/apps/"; + private static final String APPS_ROOT = "apps/"; private File karafRoot = new File(KARAF_ROOT); private File m2Dir = new File(karafRoot, M2_ROOT);
diff --git a/core/common/src/test/java/org/onosproject/common/app/ApplicationArchiveTest.java b/core/common/src/test/java/org/onosproject/common/app/ApplicationArchiveTest.java index 240ed96..8070dfe 100644 --- a/core/common/src/test/java/org/onosproject/common/app/ApplicationArchiveTest.java +++ b/core/common/src/test/java/org/onosproject/common/app/ApplicationArchiveTest.java
@@ -35,7 +35,7 @@ public class ApplicationArchiveTest { - static final String ROOT = "/tmp/app-junit/" + new Random().nextInt(); + static final String ROOT = "/tmp/app-junit/" + new Random().nextInt() + "/foo"; private ApplicationArchive aar = new ApplicationArchive();