You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2012/02/25 12:57:30 UTC
svn commit: r1293583 - in /oodt/trunk/resource/src:
main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java
main/resources/cmd-line-actions.xml main/resources/cmd-line-options.xml
test/org/apache/oodt/cas/resource/cli/TestResourceCli.java
Author: bfoster
Date: Sat Feb 25 11:57:30 2012
New Revision: 1293583
URL: http://svn.apache.org/viewvc?rev=1293583&view=rev
Log:
- Updated to work with CAS-CLI OODT-379 patch
- Fixed url which was setting workflow manager property
- Lower cased command line action names
---------------
OODT-379
OODT-362
Modified:
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java
oodt/trunk/resource/src/main/resources/cmd-line-actions.xml
oodt/trunk/resource/src/main/resources/cmd-line-options.xml
oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/cli/TestResourceCli.java
Modified: oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java?rev=1293583&r1=1293582&r2=1293583&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java (original)
+++ oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/ResourceCliAction.java Sat Feb 25 11:57:30 2012
@@ -37,7 +37,7 @@ public abstract class ResourceCliAction
private XmlRpcResourceManagerClient client;
public String getUrl() {
- return System.getProperty("org.apache.oodt.cas.workflow.url");
+ return System.getProperty("org.apache.oodt.cas.resource.url");
}
protected XmlRpcResourceManagerClient getClient()
Modified: oodt/trunk/resource/src/main/resources/cmd-line-actions.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/resources/cmd-line-actions.xml?rev=1293583&r1=1293582&r2=1293583&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/resources/cmd-line-actions.xml (original)
+++ oodt/trunk/resource/src/main/resources/cmd-line-actions.xml Sat Feb 25 11:57:30 2012
@@ -21,71 +21,71 @@
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="AddNode"
+ <bean id="addNode"
class="org.apache.oodt.cas.resource.cli.action.AddNodeCliAction">
<property name="description" value="Adds a ResourceNode" />
</bean>
- <bean id="AddNodeToQueue"
+ <bean id="addNodeToQueue"
class="org.apache.oodt.cas.resource.cli.action.AddNodeToQueueCliAction">
<property name="description" value="Adds a ResourceNode to a Queue" />
</bean>
- <bean id="AddQueue"
+ <bean id="addQueue"
class="org.apache.oodt.cas.resource.cli.action.AddQueueCliAction">
<property name="description" value="Adds a queue" />
</bean>
- <bean id="GetExecNode"
+ <bean id="getExecNode"
class="org.apache.oodt.cas.resource.cli.action.GetExecNodeCliAction">
<property name="description" value="Get execution node for a job" />
</bean>
- <bean id="GetJobInfo"
+ <bean id="getJobInfo"
class="org.apache.oodt.cas.resource.cli.action.GetJobInfoCliAction">
<property name="description" value="Gets information about a job" />
</bean>
- <bean id="GetNodeById"
+ <bean id="getNodeById"
class="org.apache.oodt.cas.resource.cli.action.GetNodeByIdCliAction">
<property name="description" value="Gets information about a node" />
</bean>
- <bean id="GetNodeLoad"
+ <bean id="getNodeLoad"
class="org.apache.oodt.cas.resource.cli.action.GetNodeLoadCliAction">
<property name="description" value="Gets the current job load of a node" />
</bean>
- <bean id="GetNodes"
+ <bean id="getNodes"
class="org.apache.oodt.cas.resource.cli.action.GetNodesCliAction">
<property name="description" value="Gets a list of managed nodes" />
</bean>
- <bean id="GetNodesInQueue"
+ <bean id="getNodesInQueue"
class="org.apache.oodt.cas.resource.cli.action.GetNodesInQueueCliAction">
<property name="description"
value="Gets list of nodes which belong to given queue" />
</bean>
- <bean id="GetQueues"
+ <bean id="getQueues"
class="org.apache.oodt.cas.resource.cli.action.GetQueuesCliAction">
<property name="description" value="Gets list of queues" />
</bean>
- <bean id="GetQueuesWithNode"
+ <bean id="getQueuesWithNode"
class="org.apache.oodt.cas.resource.cli.action.GetQueuesWithNodeCliAction">
<property name="description" value="Gets list of queues which contain given node" />
</bean>
- <bean id="Kill" class="org.apache.oodt.cas.resource.cli.action.KillCliAction">
+ <bean id="kill" class="org.apache.oodt.cas.resource.cli.action.KillCliAction">
<property name="description" value="Kills a job" />
</bean>
- <bean id="RemoveNode"
+ <bean id="removeNode"
class="org.apache.oodt.cas.resource.cli.action.RemoveNodeCliAction">
<property name="description" value="Removes given node from managed nodes" />
</bean>
- <bean id="RemoveNodeFromQueue"
+ <bean id="removeNodeFromQueue"
class="org.apache.oodt.cas.resource.cli.action.RemoveNodeFromQueueCliAction">
<property name="description" value="Removes given node from given queue" />
</bean>
- <bean id="RemoveQueue"
+ <bean id="removeQueue"
class="org.apache.oodt.cas.resource.cli.action.RemoveQueueCliAction">
<property name="description" value="Removes a queue" />
</bean>
- <bean id="SetNodeCapacity"
+ <bean id="setNodeCapacity"
class="org.apache.oodt.cas.resource.cli.action.SetNodeCapacityCliAction">
<property name="description" value="Changes a nodes capacity" />
</bean>
- <bean id="SubmitJob"
+ <bean id="submitJob"
class="org.apache.oodt.cas.resource.cli.action.SubmitJobCliAction">
<property name="description" value="Submits a job for execution" />
</bean>
Modified: oodt/trunk/resource/src/main/resources/cmd-line-options.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/resources/cmd-line-options.xml?rev=1293583&r1=1293582&r2=1293583&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/resources/cmd-line-options.xml (original)
+++ oodt/trunk/resource/src/main/resources/cmd-line-options.xml Sat Feb 25 11:57:30 2012
@@ -24,7 +24,7 @@
<bean id="url" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="u" />
<property name="longOption" value="url" />
- <property name="description" value="Workflow Manager URL" />
+ <property name="description" value="Resource Manager URL" />
<property name="hasArgs" value="true" />
<property name="argsDescription" value="url" />
<property name="required" value="true" />
@@ -33,7 +33,7 @@
class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler">
<property name="propertyNames">
<list>
- <value>org.apache.oodt.cas.workflow.url</value>
+ <value>org.apache.oodt.cas.resource.url</value>
</list>
</property>
</bean>
@@ -92,17 +92,17 @@
p:isSubOption="true">
<property name="shortOption" value="nbyid" />
<property name="longOption" value="getNodeById" />
- <property name="description" value="Triggers GetNodeById Action" />
+ <property name="description" value="Triggers getNodeById Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNodeById</value>
+ <value>getNodeById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodeById" p:relation="REQUIRED" />
+ p:actionName="getNodeById" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -112,17 +112,17 @@
p:isSubOption="true">
<property name="shortOption" value="nodes" />
<property name="longOption" value="getNodes" />
- <property name="description" value="Triggers GetNodes Action" />
+ <property name="description" value="Triggers getNodes Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNodes</value>
+ <value>getNodes</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodes" p:relation="REQUIRED" />
+ p:actionName="getNodes" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -132,17 +132,17 @@
p:isSubOption="true">
<property name="shortOption" value="queues" />
<property name="longOption" value="getQueues" />
- <property name="description" value="Triggers GetQueues Action" />
+ <property name="description" value="Triggers getQueues Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetQueues</value>
+ <value>getQueues</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetQueues" p:relation="REQUIRED" />
+ p:actionName="getQueues" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -152,17 +152,17 @@
p:isSubOption="true">
<property name="shortOption" value="an" />
<property name="longOption" value="addNode" />
- <property name="description" value="Triggers AddNode Action" />
+ <property name="description" value="Triggers addNode Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>AddNode</value>
+ <value>addNode</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNode" p:relation="REQUIRED" />
+ p:actionName="addNode" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -177,7 +177,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNode" p:relation="REQUIRED" />
+ p:actionName="addNode" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -185,7 +185,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="AddNode" p:methodName="setNodeUrl" />
+ p:actionName="addNode" p:methodName="setNodeUrl" />
</list>
</property>
</bean>
@@ -197,17 +197,17 @@
p:isSubOption="true">
<property name="shortOption" value="rn" />
<property name="longOption" value="removeNode" />
- <property name="description" value="Triggers RemoveNode Action" />
+ <property name="description" value="Triggers removeNode Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>RemoveNode</value>
+ <value>removeNode</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveNode" p:relation="REQUIRED" />
+ p:actionName="removeNode" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -217,17 +217,17 @@
p:isSubOption="true">
<property name="shortOption" value="sncap" />
<property name="longOption" value="setNodeCapacity" />
- <property name="description" value="Triggers SetNodeCapacity Action" />
+ <property name="description" value="Triggers setNodeCapacity Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>SetNodeCapacity</value>
+ <value>setNodeCapacity</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SetNodeCapacity" p:relation="REQUIRED" />
+ p:actionName="setNodeCapacity" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -237,17 +237,17 @@
p:isSubOption="true">
<property name="shortOption" value="exeNode" />
<property name="longOption" value="getExecNode" />
- <property name="description" value="Triggers GetExecNode Action" />
+ <property name="description" value="Triggers getExecNode Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetExecNode</value>
+ <value>getExecNode</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetExecNode" p:relation="REQUIRED" />
+ p:actionName="getExecNode" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -257,17 +257,17 @@
p:isSubOption="true">
<property name="shortOption" value="aq" />
<property name="longOption" value="addQueue" />
- <property name="description" value="Triggers AddQueue Action" />
+ <property name="description" value="Triggers addQueue Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>AddQueue</value>
+ <value>addQueue</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddQueue" p:relation="REQUIRED" />
+ p:actionName="addQueue" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -277,17 +277,17 @@
p:isSubOption="true">
<property name="shortOption" value="rq" />
<property name="longOption" value="removeQueue" />
- <property name="description" value="Triggers RemoveQueue Action" />
+ <property name="description" value="Triggers removeQueue Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>RemoveQueue</value>
+ <value>removeQueue</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveQueue" p:relation="REQUIRED" />
+ p:actionName="removeQueue" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -297,17 +297,17 @@
p:isSubOption="true">
<property name="shortOption" value="antq" />
<property name="longOption" value="addNodeToQueue" />
- <property name="description" value="Triggers AddNodeToQueue Action" />
+ <property name="description" value="Triggers addNodeToQueue Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>AddNodeToQueue</value>
+ <value>addNodeToQueue</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNodeToQueue" p:relation="REQUIRED" />
+ p:actionName="addNodeToQueue" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -317,17 +317,17 @@
p:isSubOption="true">
<property name="shortOption" value="ninq" />
<property name="longOption" value="getNodesInQueue" />
- <property name="description" value="Triggers GetNodesInQueue Action" />
+ <property name="description" value="Triggers getNodesInQueue Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNodesInQueue</value>
+ <value>getNodesInQueue</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodesInQueue" p:relation="REQUIRED" />
+ p:actionName="getNodesInQueue" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -337,17 +337,17 @@
p:isSubOption="true">
<property name="shortOption" value="qwn" />
<property name="longOption" value="getQueuesWithNode" />
- <property name="description" value="Triggers GetQueuesWithNode Action" />
+ <property name="description" value="Triggers getQueuesWithNode Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetQueuesWithNode</value>
+ <value>getQueuesWithNode</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetQueuesWithNode" p:relation="REQUIRED" />
+ p:actionName="getQueuesWithNode" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -357,17 +357,17 @@
p:isSubOption="true">
<property name="shortOption" value="rnfq" />
<property name="longOption" value="removeNodeFromQueue" />
- <property name="description" value="Triggers RemoveNodeFromQueue Action" />
+ <property name="description" value="Triggers removeNodeFromQueue Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>RemoveNodeFromQueue</value>
+ <value>removeNodeFromQueue</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveNodeFromQueue" p:relation="REQUIRED" />
+ p:actionName="removeNodeFromQueue" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -377,17 +377,17 @@
p:isSubOption="true">
<property name="shortOption" value="load" />
<property name="longOption" value="getNodeLoad" />
- <property name="description" value="Triggers GetNodeLoad Action" />
+ <property name="description" value="Triggers getNodeLoad Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNodeLoad</value>
+ <value>getNodeLoad</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodeLoad" p:relation="REQUIRED" />
+ p:actionName="getNodeLoad" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -397,17 +397,17 @@
p:isSubOption="true">
<property name="shortOption" value="submit" />
<property name="longOption" value="submitJob" />
- <property name="description" value="Triggers SubmitJob Action" />
+ <property name="description" value="Triggers submitJob Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>SubmitJob</value>
+ <value>submitJob</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SubmitJob" p:relation="REQUIRED" />
+ p:actionName="submitJob" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -421,7 +421,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SubmitJob" p:relation="REQUIRED" />
+ p:actionName="submitJob" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -429,7 +429,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="SubmitJob" p:methodName="setJobDefinitionFile" />
+ p:actionName="submitJob" p:methodName="setJobDefinitionFile" />
</list>
</property>
</bean>
@@ -446,7 +446,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SubmitJob" p:relation="OPTIONAL" />
+ p:actionName="submitJob" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -454,7 +454,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="SubmitJob" p:methodName="setUrl" />
+ p:actionName="submitJob" p:methodName="setUrl" />
</list>
</property>
</bean>
@@ -466,17 +466,17 @@
p:isSubOption="true">
<property name="shortOption" value="info" />
<property name="longOption" value="getJobInfo" />
- <property name="description" value="Triggers GetJobInfo Action" />
+ <property name="description" value="Triggers getJobInfo Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetJobInfo</value>
+ <value>getJobInfo</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetJobInfo" p:relation="REQUIRED" />
+ p:actionName="getJobInfo" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -486,17 +486,17 @@
p:isSubOption="true">
<property name="shortOption" value="k" />
<property name="longOption" value="kill" />
- <property name="description" value="Triggers Kill Action" />
+ <property name="description" value="Triggers kill Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>Kill</value>
+ <value>kill</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="Kill" p:relation="REQUIRED" />
+ p:actionName="kill" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -511,21 +511,21 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodeById" p:relation="REQUIRED" />
+ p:actionName="getNodeById" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNode" p:relation="REQUIRED" />
+ p:actionName="addNode" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveNode" p:relation="REQUIRED" />
+ p:actionName="removeNode" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SetNodeCapacity" p:relation="REQUIRED" />
+ p:actionName="setNodeCapacity" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNodeToQueue" p:relation="REQUIRED" />
+ p:actionName="addNodeToQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetQueuesWithNode" p:relation="REQUIRED" />
+ p:actionName="getQueuesWithNode" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveNodeFromQueue" p:relation="REQUIRED" />
+ p:actionName="removeNodeFromQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodeLoad" p:relation="REQUIRED" />
+ p:actionName="getNodeLoad" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -543,9 +543,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNode" p:relation="REQUIRED" />
+ p:actionName="addNode" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SetNodeCapacity" p:relation="REQUIRED" />
+ p:actionName="setNodeCapacity" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -562,15 +562,15 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddQueue" p:relation="REQUIRED" />
+ p:actionName="addQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveQueue" p:relation="REQUIRED" />
+ p:actionName="removeQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddNodeToQueue" p:relation="REQUIRED" />
+ p:actionName="addNodeToQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNodesInQueue" p:relation="REQUIRED" />
+ p:actionName="getNodesInQueue" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="RemoveNodeFromQueue" p:relation="REQUIRED" />
+ p:actionName="removeNodeFromQueue" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -587,11 +587,11 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetJobInfo" p:relation="REQUIRED" />
+ p:actionName="getJobInfo" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetExecNode" p:relation="REQUIRED" />
+ p:actionName="getExecNode" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="Kill" p:relation="REQUIRED" />
+ p:actionName="kill" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
Modified: oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/cli/TestResourceCli.java
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/cli/TestResourceCli.java?rev=1293583&r1=1293582&r2=1293583&view=diff
==============================================================================
--- oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/cli/TestResourceCli.java (original)
+++ oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/cli/TestResourceCli.java Sat Feb 25 11:57:30 2012
@@ -22,6 +22,7 @@ import java.net.URL;
//OODT imports
import org.apache.oodt.cas.cli.CmdLineUtility;
+import org.apache.oodt.cas.cli.util.OptionPropertyRegister;
import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.JobInput;
import org.apache.oodt.cas.resource.structs.JobSpec;
@@ -50,13 +51,19 @@ public class TestResourceCli extends Tes
private CmdLineUtility cmdLineUtility;
private MockXmlRpcResourceManagerClient 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 testAddNode() throws MalformedURLException {
int capacity = 10;
String nodeId = "TestNodeId";
@@ -237,6 +244,8 @@ public class TestResourceCli extends Tes
assertEquals(spec.getIn().getClass(), actualJobInput.getClass());
assertEquals(2, methodCallDetails.getArgs().size());
+ OptionPropertyRegister.clearRegister();
+
String url = "http://localhost:9000";
cmdLineUtility.run(("--url http://localhost:9000"
+ " --operation --submitJob --def "