diff options
| author | ogattaz <olivier@gattaz.com> | 2014-08-28 11:05:51 +0200 |
|---|---|---|
| committer | ogattaz <olivier@gattaz.com> | 2014-08-28 11:05:51 +0200 |
| commit | d0e42f669232987359ae3431b310530dc588fc6f (patch) | |
| tree | 1e0d4cdf4344b3328dca8777ce7c23d7a498aab8 /src/main/java/com/c2kernel/process/module | |
| parent | acc72802a1e5374b9654c865c9843fd70e544d35 (diff) | |
pull master devs
Diffstat (limited to 'src/main/java/com/c2kernel/process/module')
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/Module.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/ModuleInfo.java | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java index 195c883..1272026 100644 --- a/src/main/java/com/c2kernel/process/module/Module.java +++ b/src/main/java/com/c2kernel/process/module/Module.java @@ -57,7 +57,6 @@ public class Module { moduleItem.properties.add(new com.c2kernel.property.Property("Namespace", ns, false));
moduleItem.properties.add(new com.c2kernel.property.Property("Name", name, false));
moduleItem.properties.add(new com.c2kernel.property.Property("Type", "Module", false));
- moduleItem.properties.add(new com.c2kernel.property.Property("Layer", String.valueOf(info.layer), true));
moduleItem.properties.add(new com.c2kernel.property.Property("Version", info.version, true));
// Add dependency for all children
ImportDependency children = new ImportDependency("Contents");
@@ -81,7 +80,7 @@ public class Module { for (ModuleResource thisRes : imports.getResources()) {
try {
thisRes.path = Bootstrap.verifyResource(ns, thisRes.name, thisRes.version,
- thisRes.resourceType, thisRes.resourceLocation, info.layer, reset);
+ thisRes.resourceType, thisRes.resourceLocation, reset);
} catch (Exception ex) {
Logger.error(ex);
Logger.die("Error importing module resources. Unsafe to continue.");
diff --git a/src/main/java/com/c2kernel/process/module/ModuleInfo.java b/src/main/java/com/c2kernel/process/module/ModuleInfo.java index 646a915..55e02c9 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleInfo.java +++ b/src/main/java/com/c2kernel/process/module/ModuleInfo.java @@ -6,7 +6,6 @@ public class ModuleInfo { public String desc;
public String version;
- public int layer = 0;
public ArrayList<String> dependency = new ArrayList<String>();
public ModuleInfo() {
|