Author: rlaidlaw
Date: Wed Aug 6 07:00:40 2014
New Revision: 1616113
URL: http://svn.apache.org/r1616113
Log:
OODT-737: reverted cmd-line-options.xml to include typeName definition
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml
oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1616113&r1=1616112&r2=1616113&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Aug 6 07:00:40 2014
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.7 - Current Development
--------------------------------------------
+* OODT-737 Copied over latest cmd-line-options.xml with typeName (rlaidlaw)
+
* OODT-739 Fix File Manager unit tests (step 12) - fix test classes in
'metadata' and 'versioning' packages (rlaidlaw)
Modified: oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml?rev=1616113&r1=1616112&r2=1616113&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml Wed Aug 6
07:00:40 2014
@@ -117,6 +117,30 @@
</property>
</bean>
+ <bean id="typeName"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+ <property name="shortOption" value="tn" />
+ <property name="longOption" value="typeName" />
+ <property name="description" value="ProductType name" />
+ <property name="hasArgs" value="true" />
+ <property name="argsDescription" value="product-type-name" />
+ <property name="requirementRules">
+ <list>
+ <bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+ p:actionName="addProductType" p:relation="REQUIRED" />
+ </list>
+ </property>
+ <property name="handler">
+ <bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler">
+ <property name="applyToActions">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+ p:actionName="addProductType" p:methodName="setProductTypeName"
/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
<bean id="typeDesc"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="td" />
<property name="longOption" value="typeDesc" />
Modified: oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml?rev=1616113&r1=1616112&r2=1616113&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml (original)
+++ oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml Wed Aug 6
07:00:40 2014
@@ -117,6 +117,30 @@
</property>
</bean>
+ <bean id="typeName"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+ <property name="shortOption" value="tn" />
+ <property name="longOption" value="typeName" />
+ <property name="description" value="ProductType name" />
+ <property name="hasArgs" value="true" />
+ <property name="argsDescription" value="product-type-name" />
+ <property name="requirementRules">
+ <list>
+ <bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+ p:actionName="addProductType" p:relation="REQUIRED" />
+ </list>
+ </property>
+ <property name="handler">
+ <bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler">
+ <property name="applyToActions">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+ p:actionName="addProductType" p:methodName="setProductTypeName"
/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
<bean id="typeDesc"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="td" />
<property name="longOption" value="typeDesc" />
