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:56:53 UTC
svn commit: r1293582 - in /oodt/trunk/filemgr: ./
src/main/java/org/apache/oodt/cas/filemgr/cli/action/ src/main/resources/
src/test/org/apache/oodt/cas/filemgr/cli/
Author: bfoster
Date: Sat Feb 25 11:56:52 2012
New Revision: 1293582
URL: http://svn.apache.org/viewvc?rev=1293582&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/filemgr/pom.xml
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/FileManagerCliAction.java
oodt/trunk/filemgr/src/main/resources/cmd-line-actions.xml
oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java
Modified: oodt/trunk/filemgr/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/pom.xml?rev=1293582&r1=1293581&r2=1293582&view=diff
==============================================================================
--- oodt/trunk/filemgr/pom.xml (original)
+++ oodt/trunk/filemgr/pom.xml Sat Feb 25 11:56:52 2012
@@ -126,7 +126,27 @@
<groupId>org.apache.oodt</groupId>
<artifactId>cas-cli</artifactId>
<version>${project.parent.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/FileManagerCliAction.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/FileManagerCliAction.java?rev=1293582&r1=1293581&r2=1293582&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/FileManagerCliAction.java (original)
+++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/FileManagerCliAction.java Sat Feb 25 11:56:52 2012
@@ -38,7 +38,7 @@ public abstract class FileManagerCliActi
private XmlRpcFileManagerClient client;
public String getUrl() {
- return System.getProperty("org.apache.oodt.cas.workflow.url");
+ return System.getProperty("org.apache.oodt.cas.filemgr.url");
}
protected XmlRpcFileManagerClient getClient()
Modified: oodt/trunk/filemgr/src/main/resources/cmd-line-actions.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/cmd-line-actions.xml?rev=1293582&r1=1293581&r2=1293582&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/cmd-line-actions.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/cmd-line-actions.xml Sat Feb 25 11:56:52 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="AddProductType" class="org.apache.oodt.cas.filemgr.cli.action.AddProductTypeCliAction">
+ <bean id="addProductType" class="org.apache.oodt.cas.filemgr.cli.action.AddProductTypeCliAction">
<property name="description" value="Adds a ProductType to list of supported ProductTypes" />
</bean>
- <bean id="DeleteProductByName" class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByNameCliAction">
+ <bean id="deleteProductByName" class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByNameCliAction">
<property name="description" value="Delete Product by name" />
</bean>
- <bean id="DeleteProductById" class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByIdCliAction">
+ <bean id="deleteProductById" class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByIdCliAction">
<property name="description" value="Delete Product by ID" />
</bean>
- <bean id="DumpMetadata" class="org.apache.oodt.cas.filemgr.cli.action.DumpMetadataCliAction">
+ <bean id="dumpMetadata" class="org.apache.oodt.cas.filemgr.cli.action.DumpMetadataCliAction">
<property name="description" value="Dumps Product Metadata out to XML" />
</bean>
- <bean id="GetCurrentTransfer" class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransferCliAction">
+ <bean id="getCurrentTransfer" class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransferCliAction">
<property name="description" value="Gets the status of the current Product file transfer" />
</bean>
- <bean id="GetCurrentTransfers" class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransfersCliAction">
+ <bean id="getCurrentTransfers" class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransfersCliAction">
<property name="description" value="Gets the status of the current Product file transfers" />
</bean>
- <bean id="GetFilePercentTransferred" class="org.apache.oodt.cas.filemgr.cli.action.GetFilePercentTransferredCliAction">
+ <bean id="getFilePercentTransferred" class="org.apache.oodt.cas.filemgr.cli.action.GetFilePercentTransferredCliAction">
<property name="description" value="Gets the percent amount transferred of given file" />
</bean>
- <bean id="GetFirstPage" class="org.apache.oodt.cas.filemgr.cli.action.GetFirstPageCliAction">
+ <bean id="getFirstPage" class="org.apache.oodt.cas.filemgr.cli.action.GetFirstPageCliAction">
<property name="description" value="Gets first page of Products of given ProductType" />
</bean>
- <bean id="GetLastPage" class="org.apache.oodt.cas.filemgr.cli.action.GetLastPageCliAction">
+ <bean id="getLastPage" class="org.apache.oodt.cas.filemgr.cli.action.GetLastPageCliAction">
<property name="description" value="Gets last page of Products of given ProductType" />
</bean>
- <bean id="GetNextPage" class="org.apache.oodt.cas.filemgr.cli.action.GetNextPageCliAction">
+ <bean id="getNextPage" class="org.apache.oodt.cas.filemgr.cli.action.GetNextPageCliAction">
<property name="description" value="Gets next page of Products of given ProductType" />
</bean>
- <bean id="GetNumProducts" class="org.apache.oodt.cas.filemgr.cli.action.GetNumProductsCliAction">
+ <bean id="getNumProducts" class="org.apache.oodt.cas.filemgr.cli.action.GetNumProductsCliAction">
<property name="description" value="Gets number of Products ingested for a given ProductType" />
</bean>
- <bean id="GetPrevPage" class="org.apache.oodt.cas.filemgr.cli.action.GetPrevPageCliAction">
+ <bean id="getPrevPage" class="org.apache.oodt.cas.filemgr.cli.action.GetPrevPageCliAction">
<property name="description" value="Gets prev page of Products of given ProductType" />
</bean>
- <bean id="GetProductByName" class="org.apache.oodt.cas.filemgr.cli.action.GetProductByNameCliAction">
+ <bean id="getProductByName" class="org.apache.oodt.cas.filemgr.cli.action.GetProductByNameCliAction">
<property name="description" value="Get Product info by name" />
</bean>
- <bean id="GetProductById" class="org.apache.oodt.cas.filemgr.cli.action.GetProductByIdCliAction">
+ <bean id="getProductById" class="org.apache.oodt.cas.filemgr.cli.action.GetProductByIdCliAction">
<property name="description" value="Gets Product info by ID" />
</bean>
- <bean id="GetProductPercentTransferred" class="org.apache.oodt.cas.filemgr.cli.action.GetProductPercentTransferredCliAction">
+ <bean id="getProductPercentTransferred" class="org.apache.oodt.cas.filemgr.cli.action.GetProductPercentTransferredCliAction">
<property name="description" value="Gets percent amount transferred of a Products data files" />
</bean>
- <bean id="GetProductTypeByName" class="org.apache.oodt.cas.filemgr.cli.action.GetProductTypeByNameCliAction">
+ <bean id="getProductTypeByName" class="org.apache.oodt.cas.filemgr.cli.action.GetProductTypeByNameCliAction">
<property name="description" value="Gets a ProductType by its name" />
</bean>
- <bean id="HasProduct" class="org.apache.oodt.cas.filemgr.cli.action.HasProductCliAction">
+ <bean id="hasProduct" class="org.apache.oodt.cas.filemgr.cli.action.HasProductCliAction">
<property name="description" value="Checks if Product with given name has been ingested" />
</bean>
- <bean id="IngestProduct" class="org.apache.oodt.cas.filemgr.cli.action.IngestProductCliAction">
+ <bean id="ingestProduct" class="org.apache.oodt.cas.filemgr.cli.action.IngestProductCliAction">
<property name="description" value="Ingests a Product" />
</bean>
- <bean id="LuceneQuery" class="org.apache.oodt.cas.filemgr.cli.action.LuceneQueryCliAction">
+ <bean id="luceneQuery" class="org.apache.oodt.cas.filemgr.cli.action.LuceneQueryCliAction">
<property name="description" value="Queries by parsing an Lucene-like query into a FileManager Query" />
</bean>
- <bean id="SqlQuery" class="org.apache.oodt.cas.filemgr.cli.action.SqlQueryCliAction">
+ <bean id="sqlQuery" class="org.apache.oodt.cas.filemgr.cli.action.SqlQueryCliAction">
<property name="description" value="Queries by parsing an SQL-like query into a FileManager Query" />
<property name="detailedDescription">
<value>
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=1293582&r1=1293581&r2=1293582&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml Sat Feb 25 11:56:52 2012
@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. Author:
- bfoster (Brian Foster) -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Author: bfoster (Brian Foster)
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
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">
@@ -17,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="File Manager URL" />
<property name="hasArgs" value="true" />
<property name="argsDescription" value="url" />
<property name="required" value="true" />
@@ -26,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.filemgr.url</value>
</list>
</property>
</bean>
@@ -91,17 +98,17 @@
p:isSubOption="true">
<property name="shortOption" value="addPT" />
<property name="longOption" value="addProductType" />
- <property name="description" value="Triggers AddProductType Action" />
+ <property name="description" value="Triggers addProductType Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>AddProductType</value>
+ <value>addProductType</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddProductType" p:relation="REQUIRED" />
+ p:actionName="addProductType" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -115,7 +122,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddProductType" p:relation="REQUIRED" />
+ p:actionName="addProductType" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -123,7 +130,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="AddProductType" p:methodName="setProductTypeName" />
+ p:actionName="addProductType" p:methodName="setProductTypeName" />
</list>
</property>
</bean>
@@ -139,7 +146,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddProductType" p:relation="REQUIRED" />
+ p:actionName="addProductType" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -147,7 +154,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="AddProductType" p:methodName="setProductTypeDescription" />
+ p:actionName="addProductType" p:methodName="setProductTypeDescription" />
</list>
</property>
</bean>
@@ -163,7 +170,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddProductType" p:relation="REQUIRED" />
+ p:actionName="addProductType" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -171,7 +178,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="AddProductType" p:methodName="setFileRepositoryPath" />
+ p:actionName="addProductType" p:methodName="setFileRepositoryPath" />
</list>
</property>
</bean>
@@ -187,7 +194,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="AddProductType" p:relation="REQUIRED" />
+ p:actionName="addProductType" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -195,7 +202,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="AddProductType" p:methodName="setVersioner" />
+ p:actionName="addProductType" p:methodName="setVersioner" />
</list>
</property>
</bean>
@@ -207,17 +214,17 @@
p:isSubOption="true">
<property name="shortOption" value="ingest" />
<property name="longOption" value="ingestProduct" />
- <property name="description" value="Triggers IngestProduct Action" />
+ <property name="description" value="Triggers ingestProduct Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>IngestProduct</value>
+ <value>ingestProduct</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -231,7 +238,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -239,7 +246,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="IngestProduct" p:methodName="setProductStructure" />
+ p:actionName="ingestProduct" p:methodName="setProductStructure" />
</list>
</property>
</bean>
@@ -255,7 +262,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -271,7 +278,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="OPTIONAL" />
+ p:actionName="ingestProduct" p:relation="OPTIONAL" />
</list>
</property>
<property name="subOptions">
@@ -292,7 +299,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -300,7 +307,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="IngestProduct" p:methodName="setDataTransferer" />
+ p:actionName="ingestProduct" p:methodName="setDataTransferer" />
</list>
</property>
</bean>
@@ -317,7 +324,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -325,7 +332,7 @@
<property name="applyToActions">
<list>
<bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="IngestProduct" p:methodName="setReferences" />
+ p:actionName="ingestProduct" p:methodName="setReferences" />
</list>
</property>
</bean>
@@ -337,17 +344,17 @@
p:isSubOption="true">
<property name="shortOption" value="product" />
<property name="longOption" value="hasProduct" />
- <property name="description" value="Triggers HasProduct Action" />
+ <property name="description" value="Triggers hasProduct Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>HasProduct</value>
+ <value>hasProduct</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="HasProduct" p:relation="REQUIRED" />
+ p:actionName="hasProduct" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -357,17 +364,17 @@
p:isSubOption="true">
<property name="shortOption" value="ptbyn" />
<property name="longOption" value="getProductTypeByName" />
- <property name="description" value="Triggers GetProductTypeByName Action" />
+ <property name="description" value="Triggers getProductTypeByName Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetProductTypeByName</value>
+ <value>getProductTypeByName</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductTypeByName" p:relation="REQUIRED" />
+ p:actionName="getProductTypeByName" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -377,17 +384,17 @@
p:isSubOption="true">
<property name="shortOption" value="num" />
<property name="longOption" value="getNumProducts" />
- <property name="description" value="Triggers GetNumProducts Action" />
+ <property name="description" value="Triggers getNumProducts Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetNumProducts</value>
+ <value>getNumProducts</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNumProducts" p:relation="REQUIRED" />
+ p:actionName="getNumProducts" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -397,17 +404,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>
@@ -417,17 +424,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>
@@ -437,17 +444,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>
@@ -457,17 +464,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>
@@ -477,17 +484,17 @@
p:isSubOption="true">
<property name="shortOption" value="curTran" />
<property name="longOption" value="getCurrentTransfer" />
- <property name="description" value="Triggers GetCurrentTransfer Action" />
+ <property name="description" value="Triggers getCurrentTransfer Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetCurrentTransfer</value>
+ <value>getCurrentTransfer</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetCurrentTransfer" p:relation="REQUIRED" />
+ p:actionName="getCurrentTransfer" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -497,17 +504,17 @@
p:isSubOption="true">
<property name="shortOption" value="curTrans" />
<property name="longOption" value="getCurrentTransfers" />
- <property name="description" value="Triggers GetCurrentTransfers Action" />
+ <property name="description" value="Triggers getCurrentTransfers Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetCurrentTransfers</value>
+ <value>getCurrentTransfers</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetCurrentTransfers" p:relation="REQUIRED" />
+ p:actionName="getCurrentTransfers" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -517,17 +524,17 @@
p:isSubOption="true">
<property name="shortOption" value="pctTrans" />
<property name="longOption" value="getProductPctTransferred" />
- <property name="description" value="Triggers GetProductPercentTransferred Action" />
+ <property name="description" value="Triggers getProductPercentTransferred Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetProductPercentTransferred</value>
+ <value>getProductPercentTransferred</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductPercentTransferred" p:relation="REQUIRED" />
+ p:actionName="getProductPercentTransferred" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -537,17 +544,17 @@
p:isSubOption="true">
<property name="shortOption" value="filePctTrans" />
<property name="longOption" value="getFilePctTransferred" />
- <property name="description" value="Triggers GetFilePercentTransferred Action" />
+ <property name="description" value="Triggers getFilePercentTransferred Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetFilePercentTransferred</value>
+ <value>getFilePercentTransferred</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetFilePercentTransferred" p:relation="REQUIRED" />
+ p:actionName="getFilePercentTransferred" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -561,7 +568,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetFilePercentTransferred" p:relation="REQUIRED" />
+ p:actionName="getFilePercentTransferred" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -574,17 +581,17 @@
p:isSubOption="true">
<property name="shortOption" value="sql" />
<property name="longOption" value="sqlQuery" />
- <property name="description" value="Triggers SqlQuery Action" />
+ <property name="description" value="Triggers sqlQuery Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>SqlQuery</value>
+ <value>sqlQuery</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="REQUIRED" />
+ p:actionName="sqlQuery" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -596,17 +603,17 @@
p:isSubOption="true">
<property name="shortOption" value="pbyid" />
<property name="longOption" value="getProductById" />
- <property name="description" value="Triggers GetProductById Action" />
+ <property name="description" value="Triggers getProductById Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetProductById</value>
+ <value>getProductById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductById" p:relation="REQUIRED" />
+ p:actionName="getProductById" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -616,17 +623,17 @@
p:isSubOption="true">
<property name="shortOption" value="pbyn" />
<property name="longOption" value="getProductByName" />
- <property name="description" value="Triggers GetProductByName Action" />
+ <property name="description" value="Triggers getProductByName Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>GetProductByName</value>
+ <value>getProductByName</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductByName" p:relation="REQUIRED" />
+ p:actionName="getProductByName" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -636,17 +643,17 @@
p:isSubOption="true">
<property name="shortOption" value="dbyid" />
<property name="longOption" value="deleteProductById" />
- <property name="description" value="Triggers DeleteProductById Action" />
+ <property name="description" value="Triggers deleteProductById Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>DeleteProductById</value>
+ <value>deleteProductById</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DeleteProductById" p:relation="REQUIRED" />
+ p:actionName="deleteProductById" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -656,17 +663,17 @@
p:isSubOption="true">
<property name="shortOption" value="dbyn" />
<property name="longOption" value="deleteProductByName" />
- <property name="description" value="Triggers DeleteProductByName Action" />
+ <property name="description" value="Triggers deleteProductByName Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>DeleteProductByName</value>
+ <value>deleteProductByName</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DeleteProductByName" p:relation="REQUIRED" />
+ p:actionName="deleteProductByName" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -676,17 +683,17 @@
p:isSubOption="true">
<property name="shortOption" value="dmet" />
<property name="longOption" value="dumpMetadata" />
- <property name="description" value="Triggers DumpMetadata Action" />
+ <property name="description" value="Triggers dumpMetadata Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>DumpMetadata</value>
+ <value>dumpMetadata</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DumpMetadata" p:relation="REQUIRED" />
+ p:actionName="dumpMetadata" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -701,7 +708,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DumpMetadata" p:relation="OPTIONAL" />
+ p:actionName="dumpMetadata" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -714,17 +721,17 @@
p:isSubOption="true">
<property name="shortOption" value="lucene" />
<property name="longOption" value="luceneQuery" />
- <property name="description" value="Triggers LuceneQuery Action" />
+ <property name="description" value="Triggers luceneQuery Action" />
<property name="hasArgs" value="false" />
<property name="staticArgs">
<list>
- <value>LuceneQuery</value>
+ <value>luceneQuery</value>
</list>
</property>
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="REQUIRED" />
+ p:actionName="luceneQuery" p:relation="REQUIRED" />
</list>
</property>
</bean>
@@ -739,7 +746,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -757,7 +764,7 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -775,13 +782,13 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductPercentTransferred" p:relation="REQUIRED" />
+ p:actionName="getProductPercentTransferred" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductById" p:relation="REQUIRED" />
+ p:actionName="getProductById" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DeleteProductById" p:relation="REQUIRED" />
+ p:actionName="deleteProductById" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DumpMetadata" p:relation="REQUIRED" />
+ p:actionName="dumpMetadata" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -798,13 +805,13 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="HasProduct" p:relation="REQUIRED" />
+ p:actionName="hasProduct" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductByName" p:relation="REQUIRED" />
+ p:actionName="getProductByName" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="DeleteProductByName" p:relation="REQUIRED" />
+ p:actionName="deleteProductByName" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -821,21 +828,21 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="IngestProduct" p:relation="REQUIRED" />
+ p:actionName="ingestProduct" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductTypeByName" p:relation="REQUIRED" />
+ p:actionName="getProductTypeByName" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetNumProducts" p:relation="REQUIRED" />
+ p:actionName="getNumProducts" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetFirstPage" p:relation="REQUIRED" />
+ p:actionName="getFirstPage" p:relation="REQUIRED" />
<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" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetLastPage" p:relation="REQUIRED" />
+ p:actionName="getLastPage" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="GetProductPercentTransferred" p:relation="REQUIRED" />
+ p:actionName="getProductPercentTransferred" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -853,9 +860,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">
@@ -872,9 +879,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="REQUIRED" />
+ p:actionName="sqlQuery" p:relation="REQUIRED" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="REQUIRED" />
+ p:actionName="luceneQuery" p:relation="REQUIRED" />
</list>
</property>
<property name="handler">
@@ -891,9 +898,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -910,9 +917,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -929,9 +936,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -947,9 +954,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="subOptions">
@@ -979,9 +986,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -1000,9 +1007,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -1020,9 +1027,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -1040,9 +1047,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
@@ -1060,9 +1067,9 @@
<property name="requirementRules">
<list>
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="SqlQuery" p:relation="OPTIONAL" />
+ p:actionName="sqlQuery" p:relation="OPTIONAL" />
<bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="LuceneQuery" p:relation="OPTIONAL" />
+ p:actionName="luceneQuery" p:relation="OPTIONAL" />
</list>
</property>
<property name="handler">
Modified: oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java?rev=1293582&r1=1293581&r2=1293582&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java (original)
+++ oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java Sat Feb 25 11:56:52 2012
@@ -29,6 +29,7 @@ import org.apache.commons.io.FileUtils;
//OODT imports
import org.apache.oodt.cas.cli.CmdLineUtility;
+import org.apache.oodt.cas.cli.util.OptionPropertyRegister;
import org.apache.oodt.cas.filemgr.datatransfer.InPlaceDataTransferFactory;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
@@ -72,6 +73,11 @@ public class TestFileManagerCli extends
cmdLineUtility.setActionStore(actionStore);
}
+ @Override
+ public void tearDown() throws Exception {
+ OptionPropertyRegister.clearRegister();
+ }
+
public void testAddProductType() throws MalformedURLException,
ConnectionException {
String productTypeName = "TestProductType";
@@ -307,6 +313,9 @@ public class TestFileManagerCli extends
cmdLineUtility
.run(("--url http://localhost:9000 --operation --dumpMetadata"
+ " --productId " + productId).split(" "));
+
+ OptionPropertyRegister.clearRegister();
+
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
assertEquals("getMetadata", methodCallDetails.getMethodName());
assertEquals(productId,
@@ -331,6 +340,8 @@ public class TestFileManagerCli extends
((TermQueryCriteria) ((Query) methodCallDetails.getArgs().get(0))
.getCriteria().get(0)).getValue());
+ OptionPropertyRegister.clearRegister();
+
String reducedMetadataKeys = "ProductId ProductType";
String outputFormat = "$ProductId";
String reducedProductTypes = "TestProductType";