Removed CERN schema 'BreakApart' property

5 files changed, 5 insertions, 11 deletions

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);

 	}

 

 	/**

diff --git a/src/main/resources/boot/property/ODProp.xml b/src/main/resources/boot/property/ODProp.xml
index 23b6082..894a6ee 100644
--- a/src/main/resources/boot/property/ODProp.xml
+++ b/src/main/resources/boot/property/ODProp.xml
@@ -1,6 +1,5 @@
 <AllProperties>

 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>

 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="OutcomeDesc" IsMutable="false"/>

-	<PropertyDescription Name="Breakapart" IsClassIdentifier="false" DefaultValue="0" IsMutable="false"/>

 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>

 </AllProperties>

diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java
index f9dd603..ce15527 100644
--- a/src/test/java/MainTest.java
+++ b/src/test/java/MainTest.java
@@ -73,7 +73,7 @@ public class MainTest {
 	}

         

     private static Schema getSchema(String name, int version, String resPath) throws ObjectNotFoundException {

-    	return new Schema(name, version, false, Resource.getTextResource(null, resPath));

+    	return new Schema(name, version, Resource.getTextResource(null, resPath));

     }

 	

 	public void testScriptParsing() throws Exception {