From 20aab0c365e87cdefadbb2c5c9325c530761a320 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 6 Mar 2014 16:46:11 +0100
Subject: New ModuleFactory - not finished yet. Can collect module info but not
 export. Contents collection to be added. Pretty-printed XML - an example
 module should be easy to read.

---
 src/main/resources/boot/SC/InstantiateItem.xml     | 33 +++++++++++-----------
 .../resources/boot/SC/LocalObjectDefCreator.xml    |  2 +-
 src/main/resources/boot/SC/New.xml                 |  2 +-
 src/main/resources/boot/SC/SetWorkflow.xml         |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'src/main/resources/boot/SC')

diff --git a/src/main/resources/boot/SC/InstantiateItem.xml b/src/main/resources/boot/SC/InstantiateItem.xml
index 1ad7b6c..d4920f4 100644
--- a/src/main/resources/boot/SC/InstantiateItem.xml
+++ b/src/main/resources/boot/SC/InstantiateItem.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
-	<script language="javascript" name="InstantiateItem"><![CDATA[
-		importClass(Packages.com.c2kernel.lookup.DomainPath);
-
+<cristalscript>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
+	<script language="javascript" name="InstantiateItem"><![CDATA[
+		importClass(Packages.com.c2kernel.lookup.DomainPath);
+
 		// Get parameters from outcome
 		var name = job.getOutcome().getField("ObjectName");
 		var folder = job.getOutcome().getField("SubFolder");
-		var domPath = "/" + (folder != null?folder:"");
-		
		// Create new Item
+		var root = job.getActPropString("Root");
+		var domPath = (root != null?root:"") + "/" + (folder != null?folder:"");
+		
+		// Create new Item
 		var params = new Array(2);
 		params[0] = name;
 		params[1] = domPath;
@@ -18,11 +19,11 @@
 		} catch (e) {
 			throw "Could not create "+name+": "+e.message;
 		}
-		
-		// If this script is running in the Cristal GUI, open the new item.
-		//try {
-		//	Packages.com.c2kernel.gui.MainFrame.treeBrowser.push(new DomainPath(domPath+"/"+name));
-		//} catch (e) { }
-
-		]]></script>
-</cristalscript>
+		
+		// If this script is running in the Cristal GUI, open the new item.
+		//try {
+		//	Packages.com.c2kernel.gui.MainFrame.treeBrowser.push(new DomainPath(domPath+"/"+name));
+		//} catch (e) { }
+
+		]]></script>
+</cristalscript>
\ No newline at end of file
diff --git a/src/main/resources/boot/SC/LocalObjectDefCreator.xml b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
index d47789d..de082dc 100644
--- a/src/main/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="LocalObjectDefCreator"><![CDATA[
 		importClass(Packages.com.c2kernel.process.Gateway);
 		importClass(Packages.com.c2kernel.process.Bootstrap);
diff --git a/src/main/resources/boot/SC/New.xml b/src/main/resources/boot/SC/New.xml
index a07a7b9..385f410 100644
--- a/src/main/resources/boot/SC/New.xml
+++ b/src/main/resources/boot/SC/New.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name=""><![CDATA[
 
 		]]></script>
diff --git a/src/main/resources/boot/SC/SetWorkflow.xml b/src/main/resources/boot/SC/SetWorkflow.xml
index 684b813..704d732 100644
--- a/src/main/resources/boot/SC/SetWorkflow.xml
+++ b/src/main/resources/boot/SC/SetWorkflow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="SetWorkflow"><![CDATA[
 
		importClass(Packages.com.c2kernel.lookup.DomainPath);
 
-- 
cgit v1.2.3