Remove XML parsing from module processing, use Castor unmarshalling

instead.
Create module item with collection of imported Items and module XML
registered as an outcome.

1 files changed, 4 insertions, 22 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
index a0d7a1e..9cb3894 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
@@ -2,10 +2,6 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 import java.util.ArrayList;

 

-import org.w3c.dom.Element;

-import org.w3c.dom.NodeList;

-import org.w3c.dom.Text;

-

 import com.c2kernel.collection.MembershipException;

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lookup.DomainPath;

@@ -14,6 +10,7 @@ import com.c2kernel.property.PropertyDescriptionList;
 import com.c2kernel.property.PropertyUtility;

 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

+import com.c2kernel.utils.Logger;

 

 public class Dependency implements java.io.Serializable {

 

@@ -22,32 +19,16 @@ public class Dependency implements java.io.Serializable {
     public String itemDescriptionPath;

     public ArrayList<DependencyMember> dependencyMemberList = new ArrayList<DependencyMember>();

     public CastorHashMap props = new CastorHashMap();

-    Element elem;

 

     public Dependency() {

         super();

     }

 

-    public Dependency(String itemDesc) {

+    public Dependency(String name) {

         this();

-        this.itemDescriptionPath = itemDesc;

+        this.name = name;

     }

 

-    public Dependency(Element dep) {

-    	elem = dep;

-    	name = dep.getAttribute("name");

-		isDescription = dep.getAttribute("isDescription").equals("true");

-		NodeList cpnl = dep.getElementsByTagName("CollectionProperty");

-		for (int k=0; k<cpnl.getLength(); k++) {

-			Element p = (Element)cpnl.item(k);

-			props.put(p.getAttribute("name"), ((Text)p.getFirstChild()).getData());

-		}

-		NodeList depmemnl = dep.getElementsByTagName("DependencyMember");

-		for (int k=0; k<depmemnl.getLength(); k++) {

-			Element p = (Element)depmemnl.item(k);

-			dependencyMemberList.add(new DependencyMember(p));

-		}

-	}

     public KeyValuePair[] getKeyValuePairs() {

         return props.getKeyValuePairs();

     }

@@ -62,6 +43,7 @@ public class Dependency implements java.io.Serializable {
     public com.c2kernel.collection.Dependency create() throws MembershipException, ObjectNotFoundException {

         com.c2kernel.collection.Dependency newDep = isDescription?new com.c2kernel.collection.DependencyDescription(name):new com.c2kernel.collection.Dependency(name);

         if (itemDescriptionPath != null && itemDescriptionPath.length()>0) {

+        	Logger.debug(itemDescriptionPath);

         	PropertyDescriptionList propList = PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(itemDescriptionPath).getSysKey());

             StringBuffer classProps = new StringBuffer();

              for (PropertyDescription pd : propList.list) {