Do not use Node.ELEMENT_NODE constant (FF only!), use 1 instead.

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / argeo-ria-lib / slc / class / org / argeo / slc / ria / execution / Module.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
index bd5c4c815f2049a4f47835409d40b2987aa2ee7f..c95b9915b6016cc157ab0571e7ec8418271b793e 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
@@ -1,7 +1,7 @@
 /**\r
  * Wrapper for ExecutionModule server object\r
  */\r
-qx.Class.define("org.argeo.slc.ria.module.ExecutionModule", {\r
+qx.Class.define("org.argeo.slc.ria.execution.Module", {\r
        \r
        extend : qx.core.Object,\r
        \r
@@ -46,15 +46,17 @@ qx.Class.define("org.argeo.slc.ria.module.ExecutionModule", {
                XPATH_NAME : "slc:execution-module-descriptor/slc:name",\r
                XPATH_VERSION : "slc:execution-module-descriptor/slc:version",\r
                XPATH_EXECUTION_FLOWS : "slc:execution-module-descriptor/slc:executionFlows/slc:execution-flow-descriptor",\r
-               XPATH_EXECUTION_SPECS : "slc:execution-module-descriptor/slc:executionSpecs/slc:simple-execution-spec"\r
+               XPATH_EXECUTION_SPECS : "slc:execution-module-descriptor/slc:executionSpecs/slc:default-execution-spec"\r
        },\r
        \r
-       construct : function(){},\r
+       construct : function(){\r
+               this.base(arguments);\r
+       },\r
        \r
        members : {\r
                /**\r
                 * Add an execution flow to this module\r
-                * @param executionFlow {org.argeo.slc.ria.module.ExecutionFlow}\r
+                * @param executionFlow {org.argeo.slc.ria.execution.Flow}\r
                 */\r
                addExecutionFlow : function(executionFlow){\r
                        var spec = this.getExecutionSpecByName(executionFlow.getExecutionSpecName());\r
@@ -68,7 +70,7 @@ qx.Class.define("org.argeo.slc.ria.module.ExecutionModule", {
                \r
                /**\r
                 * Add an execution Spec to this module\r
-                * @param executionSpec {org.argeo.slc.ria.module.ExecutionSpec}\r
+                * @param executionSpec {org.argeo.slc.ria.execution.Spec}\r
                 */\r
                addExecutionSpec : function(executionSpec){\r
                        this.getExecutionSpecs()[executionSpec.getName()] = executionSpec;\r
@@ -93,14 +95,14 @@ qx.Class.define("org.argeo.slc.ria.module.ExecutionModule", {
                        // Parse Specs first\r
                        var specs = org.argeo.ria.util.Element.selectNodes(xmlNode, this.self(arguments).XPATH_EXECUTION_SPECS);\r
                        for(i=0; i< specs.length;i++){\r
-                               var execSpec = new org.argeo.slc.ria.module.ExecutionSpec();\r
+                               var execSpec = new org.argeo.slc.ria.execution.Spec();\r
                                execSpec.setXmlNode(specs[i]);\r
                                this.addExecutionSpec(execSpec);\r
                        }\r
                        // Now parse Flows : to do AFTER specs\r
                        var flows = org.argeo.ria.util.Element.selectNodes(xmlNode, this.self(arguments).XPATH_EXECUTION_FLOWS);\r
                        for(var i=0;i<flows.length;i++){\r
-                               var execFlow = new org.argeo.slc.ria.module.ExecutionFlow();\r
+                               var execFlow = new org.argeo.slc.ria.execution.Flow();\r
                                execFlow.setXmlNode(flows[i]);\r
                                this.addExecutionFlow(execFlow);\r
                        }\r