Author: bfoster
Date: Sat Feb 25 11:57:49 2012
New Revision: 1293584
URL: http://svn.apache.org/viewvc?rev=1293584&view=rev
Log:
- Updated to work with CAS-CLI OODT-379 patch
- Lower cased command line action names
---------------
OODT-379
OODT-362
Modified:
oodt/trunk/workflow/src/main/resources/cmd-line-actions.xml
oodt/trunk/workflow/src/main/resources/cmd-line-options.xml
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/cli/TestWorkflowCli.java
Modified: oodt/trunk/workflow/src/main/resources/cmd-line-actions.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/cmd-line-actions.xml?rev=1293584&r1=1293583&r2=1293584&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/cmd-line-actions.xml (original)
+++ oodt/trunk/workflow/src/main/resources/cmd-line-actions.xml Sat Feb 25
11:57:49 2012
@@ -21,64 +21,64 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:p="http://www.springframework.org/schema/p";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
- <bean id="SendEvent"
class="org.apache.oodt.cas.workflow.cli.action.SendEventCliAction">
+ <bean id="sendEvent"
class="org.apache.oodt.cas.workflow.cli.action.SendEventCliAction">
<property name="description" value="Triggers an event" />
</bean>
- <bean id="DynWorkflow"
class="org.apache.oodt.cas.workflow.cli.action.DynWorkflowCliAction">
+ <bean id="dynWorkflow"
class="org.apache.oodt.cas.workflow.cli.action.DynWorkflowCliAction">
<property name="description" value="Creates a workflow using the given
tasks and then executes it" />
</bean>
- <bean id="GetWorkflowInsts"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstsCliAction">
+ <bean id="getWorkflowInsts"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstsCliAction">
<property name="description" value="List all workflow instances" />
</bean>
- <bean id="GetWorkflows"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowsCliAction">
+ <bean id="getWorkflows"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowsCliAction">
<property name="description" value="List all workflow models" />
</bean>
- <bean id="GetTaskById"
class="org.apache.oodt.cas.workflow.cli.action.GetTaskByIdCliAction">
+ <bean id="getTaskById"
class="org.apache.oodt.cas.workflow.cli.action.GetTaskByIdCliAction">
<property name="description" value="Gets task information for task with
given ID" />
</bean>
- <bean id="GetConditionById"
class="org.apache.oodt.cas.workflow.cli.action.GetConditionByIdCliAction">
+ <bean id="getConditionById"
class="org.apache.oodt.cas.workflow.cli.action.GetConditionByIdCliAction">
<property name="description" value="Gets condition information for
condition with given ID" />
</bean>
- <bean id="GetWorkflowById"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowByIdCliAction">
+ <bean id="getWorkflowById"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowByIdCliAction">
<property name="description" value="Gets workflow information for workflow
with given ID" />
</bean>
- <bean id="GetWorkflowsByEvent"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowsByEventCliAction">
+ <bean id="getWorkflowsByEvent"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowsByEventCliAction">
<property name="description" value="List workflow information for
workflows with attached to event" />
</bean>
- <bean id="GetRegisteredEvents"
class="org.apache.oodt.cas.workflow.cli.action.GetRegisteredEventsCliAction">
+ <bean id="getRegisteredEvents"
class="org.apache.oodt.cas.workflow.cli.action.GetRegisteredEventsCliAction">
<property name="description" value="List registered events" />
</bean>
- <bean id="GetWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstCliAction">
+ <bean id="getWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstCliAction">
<property name="description" value="Gets workflow instance by instance ID"
/>
</bean>
- <bean id="GetWallClockTime"
class="org.apache.oodt.cas.workflow.cli.action.GetWallClockTimeCliAction">
+ <bean id="getWallClockTime"
class="org.apache.oodt.cas.workflow.cli.action.GetWallClockTimeCliAction">
<property name="description" value="Gets wall clock time for workflow
instance" />
</bean>
- <bean id="GetTaskWallClockTime"
class="org.apache.oodt.cas.workflow.cli.action.GetTaskWallClockTimeCliAction">
+ <bean id="getTaskWallClockTime"
class="org.apache.oodt.cas.workflow.cli.action.GetTaskWallClockTimeCliAction">
<property name="description" value="Gets wall clock time for workflow
instance's current task" />
</bean>
- <bean id="StopWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.StopWorkflowInstCliAction">
+ <bean id="stopWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.StopWorkflowInstCliAction">
<property name="description" value="Stops a workflow instance" />
</bean>
- <bean id="PauseWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.PauseWorkflowInstCliAction">
+ <bean id="pauseWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.PauseWorkflowInstCliAction">
<property name="description" value="Pauses a workflow instance" />
</bean>
- <bean id="ResumeWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.ResumeWorkflowInstCliAction">
+ <bean id="resumeWorkflowInst"
class="org.apache.oodt.cas.workflow.cli.action.ResumeWorkflowInstCliAction">
<property name="description" value="Resumes a paused workflow instance" />
</bean>
- <bean id="GetFirstPage"
class="org.apache.oodt.cas.workflow.cli.action.GetFirstPageCliAction">
+ <bean id="getFirstPage"
class="org.apache.oodt.cas.workflow.cli.action.GetFirstPageCliAction">
<property name="description" value="Gets first page of workflows" />
</bean>
- <bean id="GetNextPage"
class="org.apache.oodt.cas.workflow.cli.action.GetNextPageCliAction">
+ <bean id="getNextPage"
class="org.apache.oodt.cas.workflow.cli.action.GetNextPageCliAction">
<property name="description" value="Gets next page of workflows" />
</bean>
- <bean id="GetPrevPage"
class="org.apache.oodt.cas.workflow.cli.action.GetPrevPageCliAction">
+ <bean id="getPrevPage"
class="org.apache.oodt.cas.workflow.cli.action.GetPrevPageCliAction">
<property name="description" value="Gets prev page of workflows" />
</bean>
- <bean id="GetLastPage"
class="org.apache.oodt.cas.workflow.cli.action.GetLastPageCliAction">
+ <bean id="getLastPage"
class="org.apache.oodt.cas.workflow.cli.action.GetLastPageCliAction">
<property name="description" value="Gets last page of workflows" />
</bean>
- <bean id="GetWorkflowInstMet"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstMetCliAction">
+ <bean id="getWorkflowInstMet"
class="org.apache.oodt.cas.workflow.cli.action.GetWorkflowInstMetCliAction">
<property name="description" value="Gets workflow instance metadata" />
</bean>
Modified: oodt/trunk/workflow/src/main/resources/cmd-line-options.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/cmd-line-options.xml?rev=1293584&r1=1293583&r2=1293584&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/cmd-line-options.xml (original)
+++ oodt/trunk/workflow/src/main/resources/cmd-line-options.xml Sat Feb 25
11:57:49 2012
@@ -91,17 +91,17 @@
p:isSubOption="true">
<property name="shortOption" value="se" />
<property name="longOption" value="sendEvent" />
- <property name="description" value="Triggers SendEvent Action"
/>
+ <property name="description" value="Triggers sendEvent Action"
/>
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>SendEvent</value>
+ <value>sendEvent</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SendEvent"
p:relation="REQUIRED" />
+ p:actionName="sendEvent"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -111,17 +111,17 @@
p:isSubOption="true">
<property name="shortOption" value="dw" />
<property name="longOption" value="dynWorkflow" />
- <property name="description" value="Triggers DynWorkflow
Action" />
+ <property name="description" value="Triggers dynWorkflow
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>DynWorkflow</value>
+ <value>dynWorkflow</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DynWorkflow"
p:relation="REQUIRED" />
+ p:actionName="dynWorkflow"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -136,7 +136,7 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DynWorkflow"
p:relation="REQUIRED" />
+ p:actionName="dynWorkflow"
p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -153,7 +153,7 @@
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflowInsts</value>
+ <value>getWorkflowInsts</value>
</list>
</property>
<property name="requirementRules">
@@ -169,17 +169,17 @@
p:isSubOption="true">
<property name="shortOption" value="wflows" />
<property name="longOption" value="getWorkflows" />
- <property name="description" value="Triggers GetWorkflows
Action" />
+ <property name="description" value="Triggers getWorkflows
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflows</value>
+ <value>getWorkflows</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflows"
p:relation="REQUIRED" />
+ p:actionName="getWorkflows"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -189,17 +189,17 @@
p:isSubOption="true">
<property name="shortOption" value="tbyid" />
<property name="longOption" value="getTaskById" />
- <property name="description" value="Triggers GetTaskById
Action" />
+ <property name="description" value="Triggers getTaskById
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetTaskById</value>
+ <value>getTaskById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetTaskById"
p:relation="REQUIRED" />
+ p:actionName="getTaskById"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -209,17 +209,17 @@
p:isSubOption="true">
<property name="shortOption" value="cbyid" />
<property name="longOption" value="getConditionById" />
- <property name="description" value="Triggers GetConditionById
Action" />
+ <property name="description" value="Triggers getConditionById
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetConditionById</value>
+ <value>getConditionById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetConditionById"
p:relation="REQUIRED" />
+ p:actionName="getConditionById"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -229,17 +229,17 @@
p:isSubOption="true">
<property name="shortOption" value="wbyid" />
<property name="longOption" value="getWorkflowById" />
- <property name="description" value="Triggers GetWorkflowById
Action" />
+ <property name="description" value="Triggers getWorkflowById
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflowById</value>
+ <value>getWorkflowById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowById"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowById"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -249,17 +249,17 @@
p:isSubOption="true">
<property name="shortOption" value="wbye" />
<property name="longOption" value="getWorkflowsByEvent" />
- <property name="description" value="Triggers
GetWorkflowsByEvent Action" />
+ <property name="description" value="Triggers
getWorkflowsByEvent Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflowsByEvent</value>
+ <value>getWorkflowsByEvent</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowsByEvent"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowsByEvent"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -269,17 +269,17 @@
p:isSubOption="true">
<property name="shortOption" value="events" />
<property name="longOption" value="getRegisteredEvents" />
- <property name="description" value="Triggers
GetRegisteredEvents Action" />
+ <property name="description" value="Triggers
getRegisteredEvents Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetRegisteredEvents</value>
+ <value>getRegisteredEvents</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetRegisteredEvents"
p:relation="REQUIRED" />
+ p:actionName="getRegisteredEvents"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -289,17 +289,17 @@
p:isSubOption="true">
<property name="shortOption" value="inst" />
<property name="longOption" value="getWorkflowInst" />
- <property name="description" value="Triggers GetWorkflowInst
Action" />
+ <property name="description" value="Triggers getWorkflowInst
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflowInst</value>
+ <value>getWorkflowInst</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowInst"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -309,17 +309,17 @@
p:isSubOption="true">
<property name="shortOption" value="time" />
<property name="longOption" value="getWallClockTime" />
- <property name="description" value="Triggers GetWallClockTime
Action" />
+ <property name="description" value="Triggers getWallClockTime
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWallClockTime</value>
+ <value>getWallClockTime</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWallClockTime"
p:relation="REQUIRED" />
+ p:actionName="getWallClockTime"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -329,17 +329,17 @@
p:isSubOption="true">
<property name="shortOption" value="ttime" />
<property name="longOption" value="getTaskWallClockTime" />
- <property name="description" value="Triggers GetWallClockTime
Action" />
+ <property name="description" value="Triggers
getTaskWallClockTime Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetTaskWallClockTime</value>
+ <value>getTaskWallClockTime</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetTaskWallClockTime"
p:relation="REQUIRED" />
+ p:actionName="getTaskWallClockTime"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -349,17 +349,17 @@
p:isSubOption="true">
<property name="shortOption" value="stop" />
<property name="longOption" value="stopWorkflowInst" />
- <property name="description" value="Triggers StopWorkflowInst
Action" />
+ <property name="description" value="Triggers stopWorkflowInst
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>StopWorkflowInst</value>
+ <value>stopWorkflowInst</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="StopWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="stopWorkflowInst"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -369,17 +369,17 @@
p:isSubOption="true">
<property name="shortOption" value="pause" />
<property name="longOption" value="pauseWorkflowInst" />
- <property name="description" value="Triggers PauseWorkflowInst
Action" />
+ <property name="description" value="Triggers pauseWorkflowInst
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>PauseWorkflowInst</value>
+ <value>pauseWorkflowInst</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="PauseWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="pauseWorkflowInst"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -389,17 +389,17 @@
p:isSubOption="true">
<property name="shortOption" value="resume" />
<property name="longOption" value="resumeWorkflowInst" />
- <property name="description" value="Triggers ResumeWorkflowInst
Action" />
+ <property name="description" value="Triggers resumeWorkflowInst
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>ResumeWorkflowInst</value>
+ <value>resumeWorkflowInst</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="ResumeWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="resumeWorkflowInst"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -409,17 +409,17 @@
p:isSubOption="true">
<property name="shortOption" value="page1" />
<property name="longOption" value="getFirstPage" />
- <property name="description" value="Triggers GetFirstPage
Action" />
+ <property name="description" value="Triggers getFirstPage
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetFirstPage</value>
+ <value>getFirstPage</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetFirstPage"
p:relation="REQUIRED" />
+ p:actionName="getFirstPage"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -429,17 +429,17 @@
p:isSubOption="true">
<property name="shortOption" value="next" />
<property name="longOption" value="getNextPage" />
- <property name="description" value="Triggers GetNextPage
Action" />
+ <property name="description" value="Triggers getNextPage
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNextPage</value>
+ <value>getNextPage</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNextPage"
p:relation="REQUIRED" />
+ p:actionName="getNextPage"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -449,17 +449,17 @@
p:isSubOption="true">
<property name="shortOption" value="prev" />
<property name="longOption" value="getPrevPage" />
- <property name="description" value="Triggers GetPrevPage
Action" />
+ <property name="description" value="Triggers getPrevPage
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetPrevPage</value>
+ <value>getPrevPage</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetPrevPage"
p:relation="REQUIRED" />
+ p:actionName="getPrevPage"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -469,17 +469,17 @@
p:isSubOption="true">
<property name="shortOption" value="last" />
<property name="longOption" value="getLastPage" />
- <property name="description" value="Triggers GetLastPage
Action" />
+ <property name="description" value="Triggers getLastPage
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetLastPage</value>
+ <value>getLastPage</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetLastPage"
p:relation="REQUIRED" />
+ p:actionName="getLastPage"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -489,17 +489,17 @@
p:isSubOption="true">
<property name="shortOption" value="getMet" />
<property name="longOption" value="getWorkflowInstMet" />
- <property name="description" value="Triggers GetWorkflowInstMet
Action" />
+ <property name="description" value="Triggers getWorkflowInstMet
Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetWorkflowInstMet</value>
+ <value>getWorkflowInstMet</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowInstMet"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowInstMet"
p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -514,9 +514,9 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SendEvent"
p:relation="REQUIRED" />
+ p:actionName="sendEvent"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowsByEvent"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowsByEvent"
p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -532,9 +532,9 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SendEvent"
p:relation="OPTIONAL" />
+ p:actionName="sendEvent"
p:relation="OPTIONAL" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DynMetadata"
p:relation="OPTIONAL" />
+ p:actionName="dynMetadata"
p:relation="OPTIONAL" />
</list>
</property>
<property name="subOptions">
@@ -559,9 +559,9 @@
<property name="applyToActions">
<list>
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="SendEvent" p:methodName="addMetadata" />
+
p:actionName="sendEvent" p:methodName="addMetadata" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="DynWorkflow" p:methodName="addMetadata" />
+
p:actionName="dynWorkflow" p:methodName="addMetadata" />
</list>
</property>
</bean>
@@ -577,25 +577,25 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetTaskById"
p:relation="REQUIRED" />
+ p:actionName="getTaskById"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetConditionById"
p:relation="REQUIRED" />
+ p:actionName="getConditionById"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowById"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowById"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowInst"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWallClockTime"
p:relation="REQUIRED" />
+ p:actionName="getWallClockTime"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetTaskWallClockTime"
p:relation="REQUIRED" />
+ p:actionName="getTaskWallClockTime"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="StopWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="stopWorkflowInst"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="PauseWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="pauseWorkflowInst"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="ResumeWorkflowInst"
p:relation="REQUIRED" />
+ p:actionName="resumeWorkflowInst"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetWorkflowInstMet"
p:relation="REQUIRED" />
+ p:actionName="getWorkflowInstMet"
p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -603,34 +603,34 @@
<property name="applyToActions">
<list>
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetTaskById" p:methodName="setTaskId"
+
p:actionName="getTaskById" p:methodName="setTaskId"
p:argDescription="task-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetConditionById" p:methodName="setConditionId"
+
p:actionName="getConditionById" p:methodName="setConditionId"
p:argDescription="condition-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetWorkflowById" p:methodName="setWorkflowId"
+
p:actionName="getWorkflowById" p:methodName="setWorkflowId"
p:argDescription="workflow-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetWorkflowInst" p:methodName="setInstanceId"
+
p:actionName="getWorkflowInst" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetWallClockTime" p:methodName="setInstanceId"
+
p:actionName="getWallClockTime" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetTaskWallClockTime" p:methodName="setInstanceId"
+
p:actionName="getTaskWallClockTime" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="StopWorkflowInst" p:methodName="setInstanceId"
+
p:actionName="stopWorkflowInst" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="PauseWorkflowInst" p:methodName="setInstanceId"
+
p:actionName="pauseWorkflowInst" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="ResumeWorkflowInst" p:methodName="setInstanceId"
+
p:actionName="resumeWorkflowInst" p:methodName="setInstanceId"
p:argDescription="instance-id" />
<bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-
p:actionName="GetWorkflowInstMet" p:methodName="setInstanceId"
+
p:actionName="getWorkflowInstMet" p:methodName="setInstanceId"
p:argDescription="instance-id" />
</list>
</property>
@@ -647,13 +647,13 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetFirstPage"
p:relation="OPTIONAL" />
+ p:actionName="getFirstPage"
p:relation="OPTIONAL" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNextPage"
p:relation="OPTIONAL" />
+ p:actionName="getNextPage"
p:relation="OPTIONAL" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetPrevPage"
p:relation="OPTIONAL" />
+ p:actionName="getPrevPage"
p:relation="OPTIONAL" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetLastPage"
p:relation="OPTIONAL" />
+ p:actionName="getLastPage"
p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -671,9 +671,9 @@
<property name="requirementRules">
<list>
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNextPage"
p:relation="REQUIRED" />
+ p:actionName="getNextPage"
p:relation="REQUIRED" />
<bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetPrevPage"
p:relation="REQUIRED" />
+ p:actionName="getPrevPage"
p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
Modified:
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/cli/TestWorkflowCli.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/cli/TestWorkflowCli.java?rev=1293584&r1=1293583&r2=1293584&view=diff
==============================================================================
---
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/cli/TestWorkflowCli.java
(original)
+++
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/cli/TestWorkflowCli.java
Sat Feb 25 11:57:49 2012
@@ -18,6 +18,7 @@ package org.apache.oodt.cas.workflow.cli
//OODT imports
import org.apache.oodt.cas.cli.CmdLineUtility;
+import org.apache.oodt.cas.cli.util.OptionPropertyRegister;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.repository.MockWorkflowRepository;
import org.apache.oodt.cas.workflow.system.MockXmlRpcWorkflowManagerClient;
@@ -48,13 +49,19 @@ public class TestWorkflowCli extends Tes
private CmdLineUtility cmdLineUtility;
private MockXmlRpcWorkflowManagerClient client;
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
cmdLineUtility = new CmdLineUtility();
UseMockClientCmdLineActionStore actionStore = new
UseMockClientCmdLineActionStore();
client = actionStore.getClient();
cmdLineUtility.setActionStore(actionStore);
}
+ @Override
+ public void tearDown() throws Exception {
+ OptionPropertyRegister.clearRegister();
+ }
+
public void testDynWorkflow() throws Exception {
cmdLineUtility
.run(("--url http://localhost:9000";
@@ -91,6 +98,9 @@ public class TestWorkflowCli extends Tes
+ " --operation --getFirstPage").split(" "));
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
assertEquals("getFirstPage", methodCallDetails.getMethodName());
+
+ OptionPropertyRegister.clearRegister();
+
String status = "DONE";
cmdLineUtility.run(("--url http://localhost:9000";
+ " --operation --getFirstPage --status " + status).split(" "));
@@ -105,6 +115,9 @@ public class TestWorkflowCli extends Tes
+ " --operation --getLastPage").split(" "));
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
assertEquals("getLastPage", methodCallDetails.getMethodName());
+
+ OptionPropertyRegister.clearRegister();
+
String status = "DONE";
cmdLineUtility.run(("--url http://localhost:9000";
+ " --operation --getLastPage --status " + status).split(" "));
@@ -119,6 +132,9 @@ public class TestWorkflowCli extends Tes
+ " --operation --getNextPage --pageNum 1").split(" "));
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
assertEquals("paginateWorkflowInstances",
methodCallDetails.getMethodName());
+
+ OptionPropertyRegister.clearRegister();
+
String status = "DONE";
cmdLineUtility.run(("--url http://localhost:9000";
+ " --operation --getNextPage --pageNum 1 --status " +
status).split(" "));
@@ -133,6 +149,9 @@ public class TestWorkflowCli extends Tes
+ " --operation --getPrevPage --pageNum 1").split(" "));
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
assertEquals("paginateWorkflowInstances",
methodCallDetails.getMethodName());
+
+ OptionPropertyRegister.clearRegister();
+
String status = "DONE";
cmdLineUtility.run(("--url http://localhost:9000";
+ " --operation --getPrevPage --pageNum 1 --status " +
status).split(" "));
@@ -255,6 +274,8 @@ public class TestWorkflowCli extends Tes
assertEquals("sendEvent", methodCallDetails.getMethodName());
assertEquals(eventName, methodCallDetails.getArgs().get(0));
+ OptionPropertyRegister.clearRegister();
+
cmdLineUtility.run(("--url http://localhost:9000";
+ " --operation --sendEvent --eventName " + eventName
+ " --metaData --key Filename data.dat --key NominalDate
2001-02-20").split(" "));
