From 2bf4284d2da271e4f40ef3ee680f1e845b01ca60 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 27 Aug 2014 09:09:27 +0200 Subject: Revert 'layer' from commit 8e8185210f5bd87cb5dcda3a458fe059f811aafc. This will be implemented as a diff overlay later. --- src/main/java/com/c2kernel/process/Bootstrap.java | 25 ++++---------------- .../java/com/c2kernel/process/module/Module.java | 3 +-- .../com/c2kernel/process/module/ModuleInfo.java | 1 - .../java/com/c2kernel/utils/LocalObjectLoader.java | 27 ++++++---------------- 4 files changed, 13 insertions(+), 43 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index ed15234..46e2cb6 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -106,7 +106,7 @@ public class Bootstrap String itemName = thisItem.substring(delim+1); try { String location = "boot/"+thisItem+(itemType.equals("OD")?".xsd":".xml"); - verifyResource(ns, itemName, 0, itemType, location, 0, reset); + verifyResource(ns, itemName, 0, itemType, location, reset); } catch (Exception e) { Logger.error(e); Logger.die("Error importing bootstrap items. Unsafe to continue."); @@ -115,7 +115,7 @@ public class Bootstrap } - public static DomainPath verifyResource(String ns, String itemName, Integer version, String itemType, String dataLocation, int layer, boolean reset) throws Exception { + public static DomainPath verifyResource(String ns, String itemName, Integer version, String itemType, String dataLocation, boolean reset) throws Exception { if (version == null) version = 0; LookupManager lookupManager = Gateway.getLookupManager(); ResourceImportHandler typeImpHandler = getHandler(itemType); @@ -127,7 +127,7 @@ public class Bootstrap Iterator en = Gateway.getLookup().search(typeImpHandler.getTypeRoot(), itemName); if (!en.hasNext()) { Logger.msg("Bootstrap.verifyResource() - "+typeImpHandler.getName()+" "+itemName+" not found. Creating new."); - thisProxy = createResourceItem(typeImpHandler, itemName, layer, ns); + thisProxy = createResourceItem(typeImpHandler, itemName, ns); } else { DomainPath path = (DomainPath)en.next(); @@ -151,15 +151,6 @@ public class Bootstrap Gateway.getStorage().put(thisProxy.getSystemKey(), new Property("Module", moduleName, false), thisProxy); } - // overwrite layer if different - int currentLayer = -1; - try { - String layerProp = thisProxy.getProperty("Layer"); - currentLayer = Integer.parseInt(layerProp); - } catch (Exception e) { } - if (currentLayer != layer) - Gateway.getStorage().put(thisProxy.getSystemKey(), new Property("Layer", String.valueOf(layer), false), thisProxy); - if (!modDomPath.equals(path)) { // move item to module subtree Logger.msg("Module item "+itemName+" found with path "+path.toString()+". Moving to "+modDomPath.toString()); modDomPath.setEntity(new ItemPath(thisProxy.getSystemKey())); @@ -248,10 +239,9 @@ public class Bootstrap /** * @param itemType * @param itemName - * @param layer * @param data */ - private static ItemProxy createResourceItem(ResourceImportHandler impHandler, String itemName, int layer, String ns) throws Exception { + private static ItemProxy createResourceItem(ResourceImportHandler impHandler, String itemName, String ns) throws Exception { // create props PropertyDescriptionList pdList = impHandler.getPropDesc(); PropertyArrayList props = new PropertyArrayList(); @@ -260,12 +250,7 @@ public class Bootstrap for (int i = 0; i < pdList.list.size(); i++) { PropertyDescription pd = pdList.list.get(i); String propName = pd.getName(); - String propVal; - if (propName.equals("Name")) - propVal = itemName; - else if (propName.equals("Layer")) - propVal = String.valueOf(layer); - else propVal = pd.getDefaultValue(); + String propVal = propName.equals("Name")?itemName:pd.getDefaultValue(); props.list.add(new Property(propName, propVal, pd.getIsMutable())); } 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 dependency = new ArrayList(); public ModuleInfo() { diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java index f0d8928..503e951 100644 --- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java +++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java @@ -1,5 +1,5 @@ package com.c2kernel.utils; - + import java.util.Iterator; import com.c2kernel.common.InvalidDataException; @@ -24,28 +24,15 @@ public class LocalObjectLoader { { DomainPath defRoot = new DomainPath(root); Iterator e = Gateway.getLookup().search(defRoot, name); - ItemProxy defProxy = null; int currentLayer = -1; - while (e.hasNext()) { + if (e.hasNext()) { DomainPath defPath = (DomainPath)e.next(); - ItemProxy thisProxy = Gateway.getProxyManager().getProxy(defPath); - int thisLayer; - try { - String thisLayerProp = thisProxy.getProperty("Layer"); - thisLayer = Integer.parseInt(thisLayerProp); - } catch (Exception ex) { - thisLayer = 0; - } - if (thisLayer > currentLayer) { - currentLayer = thisLayer; - defProxy = thisProxy; - } - else if (thisLayer == currentLayer) { - throw new ObjectNotFoundException("Duplicate definition for "+name+" in "+root+" found in Layer "+thisLayer, ""); - } + if (e.hasNext()) throw new ObjectNotFoundException("Too many matches for "+name+" in "+root, ""); + return Gateway.getProxyManager().getProxy(defPath); } - if (defProxy == null) + else { throw new ObjectNotFoundException("No match for "+name+" in "+root, ""); - return defProxy; + } + } static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFoundException { -- cgit v1.2.3