From 4ac3ad872c1f31cb5e8a4d625fca6eb8e23666c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 27 Jun 2013 09:14:27 +0200
Subject: Removed CERN schema 'BreakApart' property

---
 src/main/java/com/c2kernel/persistency/outcome/Schema.java   | 6 +-----
 src/main/java/com/c2kernel/process/module/ModuleManager.java | 2 +-
 src/main/java/com/c2kernel/utils/LocalObjectLoader.java      | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/c2kernel/persistency/outcome/Schema.java b/src/main/java/com/c2kernel/persistency/outcome/Schema.java
index 0538233..aa4e5c7 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Schema.java
+++ b/src/main/java/com/c2kernel/persistency/outcome/Schema.java
@@ -20,22 +20,18 @@ import org.xml.sax.InputSource;
 public class Schema {
     public String docType;
 	public int docVersion;
-	public boolean breakApart;
 	public String schema;
 	public org.exolab.castor.xml.schema.Schema som;
 	
 	/**
 	 * @param docType
 	 * @param docVersion
-	 * @param breakApart
 	 * @param schema
 	 */
-	public Schema(String docType, int docVersion, boolean breakApart,
-			String schema) {
+	public Schema(String docType, int docVersion, String schema) {
 		super();
 		this.docType = docType;
 		this.docVersion = docVersion;
-		this.breakApart = breakApart;
 		this.schema = schema;
 	}
 	
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index f072f66..f1d26fb 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -29,7 +29,7 @@ public class ModuleManager {
 	public ModuleManager(Enumeration<URL> moduleEnum, boolean isServer) throws ModuleException {
 		this.isServer = isServer;
 		try {
-			Schema moduleSchema = new Schema("Module", 0, false, 
+			Schema moduleSchema = new Schema("Module", 0,
 					FileStringUtility.url2String(Resource.getKernelResourceURL("boot/OD/Module.xsd")));
 			moduleValidator = new OutcomeValidator(moduleSchema);
 		} catch (InvalidDataException ex) {
diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
index 6832eeb..63bb3c2 100644
--- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
+++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
@@ -44,7 +44,7 @@ public class LocalObjectLoader {
 
 	    // don't bother if this is the Schema schema - for bootstrap esp.
 	    if (schemaName.equals("Schema") && schemaVersion == 0)
-	        return new Schema(docType, docVersion, false, "");
+	        return new Schema(docType, docVersion, "");
 
         ItemProxy schema = loadLocalObjectDef("/desc/OutcomeDesc/", schemaName);
         Viewpoint schemaView = (Viewpoint)schema.getObject(ClusterStorage.VIEWPOINT + "/Schema/" + schemaVersion);
@@ -54,8 +54,7 @@ public class LocalObjectLoader {
         	Logger.error(ex);
         	throw new ObjectNotFoundException("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage(), "");
         }
-        String breakApart = schema.getProperty("BreakApart");
-	    return new Schema(docType, docVersion, breakApart.equals("1"), schemaData);
+	    return new Schema(docType, docVersion, schemaData);
 	}
 
 	/**
-- 
cgit v1.2.3