Thomas Vachuska

Fixed a defect in app archive base class.

Change-Id: If54d65926ad4b4c346a234d6ffac75ca2797efa3
...@@ -76,32 +76,32 @@ public class ApplicationArchive ...@@ -76,32 +76,32 @@ 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 ROOT = "../";
80 private static final String M2_ROOT = "system/"; 80 private static final String M2_ROOT = "system/";
81 private static final String APPS_ROOT = "apps/"; 81 private static final String APPS_ROOT = "apps/";
82 82
83 - private File karafRoot = new File(KARAF_ROOT); 83 + private File root = new File(ROOT);
84 - private File m2Dir = new File(karafRoot, M2_ROOT); 84 + private File appsDir = new File(root, APPS_ROOT);
85 - private File appsDir = new File(karafRoot, APPS_ROOT); 85 + private File m2Dir = new File(M2_ROOT);
86 86
87 /** 87 /**
88 - * Sets the root directory where application artifacts are kept. 88 + * Sets the root directory where apps directory is contained.
89 * 89 *
90 - * @param appsRoot top-level applications directory path 90 + * @param root top-level directory path
91 */ 91 */
92 - protected void setRootPath(String appsRoot) { 92 + protected void setRootPath(String root) {
93 - this.karafRoot = new File(appsRoot); 93 + this.root = new File(root);
94 - this.appsDir = new File(karafRoot, APPS_ROOT); 94 + this.appsDir = new File(this.root, APPS_ROOT);
95 - this.m2Dir = new File(karafRoot, M2_ROOT); 95 + this.m2Dir = new File(M2_ROOT);
96 } 96 }
97 97
98 /** 98 /**
99 - * Returns the root directory where application artifacts are kept. 99 + * Returns the root directory where apps directory is contained.
100 * 100 *
101 - * @return top-level applications directory path 101 + * @return top-level directory path
102 */ 102 */
103 protected String getRootPath() { 103 protected String getRootPath() {
104 - return karafRoot.getPath(); 104 + return root.getPath();
105 } 105 }
106 106
107 /** 107 /**
......