From d0e42f669232987359ae3431b310530dc588fc6f Mon Sep 17 00:00:00 2001
From: ogattaz <olivier@gattaz.com>
Date: Thu, 28 Aug 2014 11:05:51 +0200
Subject: pull master devs

---
 src/main/java/com/c2kernel/process/Bootstrap.java | 41 ++++++++---------------
 1 file changed, 14 insertions(+), 27 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/Bootstrap.java')

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index bc93676..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<Path> 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()));
@@ -195,13 +186,15 @@ public class Bootstrap
                 }
             
 	            // data was missing or doesn't match
-            	// validate it
-            	OutcomeValidator validator = OutcomeValidator.getValidator(LocalObjectLoader.getSchema(newOutcome.getSchemaType(), newOutcome.getSchemaVersion()));
-            	String error = validator.validate(newOutcome.getData());
-                if (error.length() > 0) {
-                    Logger.error("Outcome not valid: \n " + error);
-                    throw new InvalidDataException(error, "");
-                }
+            	// validate it (but not for kernel objects because we need those to validate the rest)
+            	if (ns!= null) {
+            		OutcomeValidator validator = OutcomeValidator.getValidator(LocalObjectLoader.getSchema(newOutcome.getSchemaType(), newOutcome.getSchemaVersion()));
+            		String error = validator.validate(newOutcome.getData());
+            		if (error.length() > 0) {
+            			Logger.error("Outcome not valid: \n " + error);
+            			throw new InvalidDataException(error, "");
+            		}
+            	}
                 
                 // store
 	            Logger.msg("Bootstrap.verifyResource() - Writing new "+newOutcome.getSchemaType()+" v"+version+" to "+typeImpHandler.getName()+" "+itemName);
@@ -246,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();
@@ -258,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()));
         }
         
-- 
cgit v1.2.3