You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/05/04 23:10:30 UTC
svn commit: r1099608 - in /oodt/trunk: ./
workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
workflow/src/main/java/org/apache/oodt/cas/workflow/structs/
workflow/src/main/java/org/apache/oodt/cas/workflow/util/
Author: mattmann
Date: Wed May 4 21:10:30 2011
New Revision: 1099608
URL: http://svn.apache.org/viewvc?rev=1099608&view=rev
Log:
- fix for OODT-190 WorkflowCondition configuration isn't read
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1099608&r1=1099607&r2=1099608&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed May 4 21:10:30 2011
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-190 WorkflowCondition configuration isn't read (mattmann)
+
* OODT-189 Refactor and clean up WorkflowCondition
Configuration (mattmann)
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java?rev=1099608&r1=1099607&r2=1099608&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java Wed May 4 21:10:30 2011
@@ -31,6 +31,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.HashMap;
import java.util.List;
+import java.util.Set;
import java.util.Vector;
import java.util.Iterator;
import java.util.Arrays;
@@ -320,6 +321,13 @@ public class XMLWorkflowRepository imple
+ condition.getConditionId() + ", name="
+ condition.getConditionName() + ", order="
+ condition.getOrder() + "]");
+
+ System.out.println("Configuration: ");
+ for (String cKeyName : (Set<String>) (Set<?>) condition
+ .getCondConfig().getProperties().keySet()) {
+ System.out.println("[name=" + cKeyName + ", value="
+ + condition.getCondConfig().getProperty(cKeyName) + "]");
+ }
}
}
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java?rev=1099608&r1=1099607&r2=1099608&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java Wed May 4 21:10:30 2011
@@ -72,7 +72,6 @@ public class WorkflowCondition {
*/
public WorkflowCondition(String conditionName, String conditionId,
String instanceClass, int order) {
- // TODO Auto-generated constructor stub
this.conditionName = conditionName;
this.conditionId = conditionId;
this.conditionInstanceClassName = instanceClass;
@@ -85,7 +84,7 @@ public class WorkflowCondition {
*/
@Deprecated
public WorkflowConditionConfiguration getTaskConfig() {
- return condConfig;
+ return this.condConfig;
}
/**
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java?rev=1099608&r1=1099607&r2=1099608&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java Wed May 4 21:10:30 2011
@@ -22,11 +22,13 @@ package org.apache.oodt.cas.workflow.uti
import java.util.List;
import java.util.Iterator;
import java.util.Hashtable;
+import java.util.Set;
import java.util.Vector;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
@@ -365,9 +367,24 @@ public final class XmlRpcStructFactory {
condition.put("id", c.getConditionId());
condition.put("name", c.getConditionName());
condition.put("order", String.valueOf(c.getOrder()));
+ condition.put("configuration", getXmlRpcWorkflowConditionConfig(c.getCondConfig()));
return condition;
}
+
+ /**
+ * Bulids an XML-RPC friendly version of a {@link WorkflowConditionConfiguration}.
+ *
+ * @param conf The {@link WorkflowConditionConfiguration} to transform into an XML-RPC {@link Hashtable}.
+ * @return an XML-RPC friendly version of a {@link WorkflowConditionConfiguration}.
+ */
+ public static Hashtable getXmlRpcWorkflowConditionConfig(WorkflowConditionConfiguration conf){
+ Hashtable confHash = new Hashtable();
+ for(String propName: (Set<String>)(Set<?>)conf.getProperties().keySet()){
+ confHash.put(propName, conf.getProperty(propName));
+ }
+ return confHash;
+ }
/**
* <p>
@@ -464,9 +481,28 @@ public final class XmlRpcStructFactory {
condition.setConditionName((String) cond.get("name"));
condition.setOrder(Integer.valueOf((String) cond.get("order"))
.intValue());
+ condition.setCondConfig(getWorkflowConditionConfigurationFromXmlRpc((Hashtable)cond.get("configuration")));
return condition;
}
+ /**
+ * Unravels a {@link WorkflowConditionConfiguration} from XML-RPC.
+ *
+ * @param conf
+ * XML-RPC friendly Hashtable representing a
+ * {@link WorkflowConditionConfiguration}.
+ * @return A {@link WorkflowConditionConfiguration} from XML-RPC.
+ */
+ public static WorkflowConditionConfiguration getWorkflowConditionConfigurationFromXmlRpc(
+ Hashtable conf) {
+ WorkflowConditionConfiguration config = new WorkflowConditionConfiguration();
+ for (String key : (Set<String>) (Set<?>) conf.keySet()) {
+ config.addConfigProperty(key, (String) conf.get(key));
+ }
+
+ return config;
+ }
+
/**
* <p>
* Gets a {@link List} of {@link WorkflowCondition}s from an XML-RPC