Thomas Vachuska

Changing location where ONOS stages its deployed apps.

Change-Id: Ia3931454067829b6331419f81a714d865dc8a1e6
...@@ -76,9 +76,9 @@ public class ApplicationArchive ...@@ -76,9 +76,9 @@ public class ApplicationArchive
76 private static final String APP_XML = "app.xml"; 76 private static final String APP_XML = "app.xml";
77 private static final String M2_PREFIX = "m2"; 77 private static final String M2_PREFIX = "m2";
78 78
79 - private static final String KARAF_ROOT = "."; 79 + private static final String KARAF_ROOT = "../";
80 private static final String M2_ROOT = "system/"; 80 private static final String M2_ROOT = "system/";
81 - private static final String APPS_ROOT = "data/apps/"; 81 + private static final String APPS_ROOT = "apps/";
82 82
83 private File karafRoot = new File(KARAF_ROOT); 83 private File karafRoot = new File(KARAF_ROOT);
84 private File m2Dir = new File(karafRoot, M2_ROOT); 84 private File m2Dir = new File(karafRoot, M2_ROOT);
......
...@@ -35,7 +35,7 @@ import static org.onosproject.app.DefaultApplicationDescriptionTest.*; ...@@ -35,7 +35,7 @@ import static org.onosproject.app.DefaultApplicationDescriptionTest.*;
35 35
36 public class ApplicationArchiveTest { 36 public class ApplicationArchiveTest {
37 37
38 - static final String ROOT = "/tmp/app-junit/" + new Random().nextInt(); 38 + static final String ROOT = "/tmp/app-junit/" + new Random().nextInt() + "/foo";
39 39
40 private ApplicationArchive aar = new ApplicationArchive(); 40 private ApplicationArchive aar = new ApplicationArchive();
41 41
......