oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattm...@apache.org
Subject [41/52] [abbrv] oodt git commit: Added maven-resource-plugin for example resource copying and CLI improvements
Date Wed, 30 Aug 2017 16:40:10 GMT
Added maven-resource-plugin for example resource copying and CLI improvements


Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d2f2d49d
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d2f2d49d
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d2f2d49d

Branch: refs/heads/master
Commit: d2f2d49d119abfaf07407422a9df1779df236027
Parents: 0133112
Author: Imesha Sudasingha <imesha.sudasingha@gmail.com>
Authored: Thu Jul 27 22:03:48 2017 +0530
Committer: Imesha Sudasingha <imesha.sudasingha@gmail.com>
Committed: Fri Jul 28 21:20:43 2017 +0530

----------------------------------------------------------------------
 config/pom.xml                                  |   57 +
 config/src/main/assembly/assembly.xml           |   31 +-
 .../java/org/apache/oodt/config/Constants.java  |    2 +-
 .../DistributedConfigurationPublisher.java      |    8 +-
 .../oodt/config/distributed/cli/CLIAction.java  |   14 +-
 .../config/distributed/utils/CuratorUtils.java  |    2 +-
 config/src/main/resources/cmd-line-options.xml  |   37 +-
 config/src/main/resources/config-publisher.xml  |   48 +-
 .../examples/filemgr/cmd-line-actions.xml       |  123 -
 .../examples/filemgr/cmd-line-options.xml       | 1175 -----
 .../examples/filemgr/filemgr.properties         |  114 -
 .../resources/examples/filemgr/mime-types.xml   | 4119 ------------------
 .../examples/filemgr/oodt/elements.xml          |   77 -
 .../filemgr/oodt/product-type-element-map.xml   |   33 -
 .../examples/filemgr/oodt/product-types.xml     |   53 -
 .../examples/resmgr/cmd-line-actions.xml        |   92 -
 .../examples/resmgr/cmd-line-options.xml        |  601 ---
 .../resources/examples/resmgr/jobs/exJob.xml    |   30 -
 .../examples/resmgr/jobs/exLongJob.xml          |   30 -
 .../examples/resmgr/logging.properties          |   67 -
 .../examples/resmgr/node-to-queue-mapping.xml   |   26 -
 .../main/resources/examples/resmgr/nodes.xml    |   23 -
 .../examples/resmgr/resource.properties         |   61 -
 .../AbstractDistributedConfigurationTest.java   |    2 +
 .../DistributedConfigurationManagerTest.java    |    3 +-
 .../DistributedConfigurationPublisherTest.java  |    4 +-
 config/src/test/resources/config-publisher.xml  |   74 +
 .../src/test/resources/etc/config-publisher.xml |   61 -
 28 files changed, 260 insertions(+), 6707 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/pom.xml
----------------------------------------------------------------------
diff --git a/config/pom.xml b/config/pom.xml
index 438efc4..21d28d8 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -79,6 +79,63 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-filemgr-resources</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/resources/examples/filemgr</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>../filemgr/src/main/resources/examples</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../filemgr/src/main/resources</directory>
+                                    <includes>
+                                        <include>filemgr.properties</include>
+                                        <include>logging.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resource-manager-resources</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/resources/examples/resmgr</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>../resource/src/main/resources/examples</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>../resource/src/main/resources</directory>
+                                    <includes>
+                                        <include>resource.properties</include>
+                                        <include>logging.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/config/src/main/assembly/assembly.xml b/config/src/main/assembly/assembly.xml
index a6db0fc..a1bc3dd 100644
--- a/config/src/main/assembly/assembly.xml
+++ b/config/src/main/assembly/assembly.xml
@@ -55,9 +55,34 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${basedir}/src/main/resources/examples</directory>
-            <outputDirectory>examples</outputDirectory>
-            <includes/>
+            <directory>${basedir}/../filemgr/src/main/resources/examples</directory>
+            <outputDirectory>examples/filemgr</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../filemgr/src/main/resources</directory>
+            <outputDirectory>examples/filemgr</outputDirectory>
+            <includes>
+                <include>filemgr.properties</include>
+                <include>logging.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../resource/src/main/resources/examples</directory>
+            <outputDirectory>examples/resmgr</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../resource/src/main/resources</directory>
+            <outputDirectory>examples/resmgr</outputDirectory>
+            <includes>
+                <include>resource.properties</include>
+                <include>logging.properties</include>
+            </includes>
         </fileSet>
     </fileSets>
     <dependencySets>

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/java/org/apache/oodt/config/Constants.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/Constants.java b/config/src/main/java/org/apache/oodt/config/Constants.java
index 0453eaa..53a1116 100644
--- a/config/src/main/java/org/apache/oodt/config/Constants.java
+++ b/config/src/main/java/org/apache/oodt/config/Constants.java
@@ -38,7 +38,7 @@ public class Constants {
     public static final String DEFAULT_ENVIRONMENT = "default";
 
     /** The XML file name in which the configuration to be published to zookeeper is defined */
-    public static final String CONFIG_PUBLISHER_XML = "etc" + SEPARATOR + "config-publisher.xml";
+    public static final String DEFAULT_CONFIG_PUBLISHER_XML = "etc" + SEPARATOR + "config-publisher.xml";
 
     public static class Properties {
         /** The system property to be set in order to enable distributed configuration management */

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisher.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisher.java b/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisher.java
index 81fe2af..a36aee2 100644
--- a/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisher.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisher.java
@@ -161,7 +161,7 @@ public class DistributedConfigurationPublisher {
         for (Map.Entry<String, String> entry : fileMapping.entrySet()) {
             String filePath = entry.getKey();
             String relativeZNodePath = entry.getValue();
-            logger.info("Publishing configuration {} - {}", filePath, relativeZNodePath);
+            logger.info("Publishing configuration {} to {}", filePath, relativeZNodePath);
 
             String content = getFileContent(filePath);
 
@@ -174,9 +174,9 @@ public class DistributedConfigurationPublisher {
                 } else {
                     Stat stat = client.setData().forPath(zNodePath, content.getBytes());
                     if (stat != null) {
-                        logger.info("Published configuration file {} to {}", filePath, relativeZNodePath);
+                        logger.info("Replaced old published configuration at {} with content of file : {}", relativeZNodePath, filePath);
                     } else {
-                        logger.warn("Unable to publish configuration file {} to {}", filePath, relativeZNodePath);
+                        logger.warn("Unable to replace published configuration at {} with file: {}", relativeZNodePath, filePath);
                     }
                 }
             } else {
@@ -185,7 +185,7 @@ public class DistributedConfigurationPublisher {
                  * when no child node is present under them.
                  */
                 client.create().creatingParentContainersIfNeeded().forPath(zNodePath, content.getBytes());
-                logger.info("Replaced old published configuration at {} with content of file : {}", relativeZNodePath, filePath);
+                logger.info("Published configuration file {} to {}", filePath, relativeZNodePath);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/java/org/apache/oodt/config/distributed/cli/CLIAction.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/distributed/cli/CLIAction.java b/config/src/main/java/org/apache/oodt/config/distributed/cli/CLIAction.java
index 32fd640..1ab1b30 100644
--- a/config/src/main/java/org/apache/oodt/config/distributed/cli/CLIAction.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/cli/CLIAction.java
@@ -19,7 +19,6 @@ package org.apache.oodt.config.distributed.cli;
 
 import org.apache.oodt.cas.cli.action.CmdLineAction;
 import org.apache.oodt.cas.cli.exception.CmdLineActionException;
-import org.apache.oodt.config.Constants;
 import org.apache.oodt.config.distributed.DistributedConfigurationPublisher;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -27,6 +26,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import java.util.Map;
 
+import static org.apache.oodt.config.Constants.DEFAULT_CONFIG_PUBLISHER_XML;
 import static org.apache.oodt.config.Constants.Properties.ZK_CONNECT_STRING;
 
 /**
@@ -41,6 +41,8 @@ public class CLIAction extends CmdLineAction {
     }
 
     private String connectString;
+    private String configFile = DEFAULT_CONFIG_PUBLISHER_XML;
+
     private Action action;
 
     public CLIAction(Action action) {
@@ -50,7 +52,7 @@ public class CLIAction extends CmdLineAction {
     @Override
     public void execute(ActionMessagePrinter printer) throws CmdLineActionException {
         try {
-            ApplicationContext applicationContext = new ClassPathXmlApplicationContext(Constants.CONFIG_PUBLISHER_XML);
+            ApplicationContext applicationContext = new ClassPathXmlApplicationContext(configFile);
             Map distributedConfigurationPublisher = applicationContext.getBeansOfType(DistributedConfigurationPublisher.class);
 
             for (Object bean : distributedConfigurationPublisher.values()) {
@@ -113,4 +115,12 @@ public class CLIAction extends CmdLineAction {
         System.setProperty(ZK_CONNECT_STRING, connectString);
         this.connectString = connectString;
     }
+
+    public String getConfigFile() {
+        return configFile;
+    }
+
+    public void setConfigFile(String configFile) {
+        this.configFile = configFile;
+    }
 }

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/java/org/apache/oodt/config/distributed/utils/CuratorUtils.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/distributed/utils/CuratorUtils.java b/config/src/main/java/org/apache/oodt/config/distributed/utils/CuratorUtils.java
index 6f2ff27..c559f55 100644
--- a/config/src/main/java/org/apache/oodt/config/distributed/utils/CuratorUtils.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/utils/CuratorUtils.java
@@ -187,7 +187,7 @@ public class CuratorUtils {
             }
             logger.debug("Deleted children ZNodes of {}", parentZNodePath);
         } else {
-            logger.warn("ZNode - {} doesn't exist. Nothing to delete");
+            logger.warn("ZNode - {} doesn't exist. Nothing to delete", parentZNodePath);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/cmd-line-options.xml
----------------------------------------------------------------------
diff --git a/config/src/main/resources/cmd-line-options.xml b/config/src/main/resources/cmd-line-options.xml
index 9aff21e..698ad32 100644
--- a/config/src/main/resources/cmd-line-options.xml
+++ b/config/src/main/resources/cmd-line-options.xml
@@ -29,7 +29,11 @@
         <property name="requirementRules">
             <list>
                 <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-                      p:actionName="publishConfiguration" p:relation="REQUIRED"/>
+                      p:actionName="publish" p:relation="REQUIRED"/>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                      p:actionName="clear" p:relation="REQUIRED"/>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                      p:actionName="verify" p:relation="REQUIRED"/>
             </list>
         </property>
         <property name="handler">
@@ -47,4 +51,35 @@
             </bean>
         </property>
     </bean>
+
+    <bean id="publisherXML" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="c"/>
+        <property name="longOption" value="config"/>
+        <property name="description" value="Configuration publisher spring configuration XML"/>
+        <property name="hasArgs" value="true"/>
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                      p:actionName="publish" p:relation="OPTIONAL"/>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                      p:actionName="clear" p:relation="OPTIONAL"/>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                      p:actionName="verify" p:relation="OPTIONAL"/>
+            </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="publish" p:methodName="setConfigFile"/>
+                        <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+                              p:actionName="verify" p:methodName="setConfigFile"/>
+                        <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+                              p:actionName="clear" p:methodName="setConfigFile"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
 </beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/config-publisher.xml
----------------------------------------------------------------------
diff --git a/config/src/main/resources/config-publisher.xml b/config/src/main/resources/config-publisher.xml
index 88ba33b..d5b387a 100644
--- a/config/src/main/resources/config-publisher.xml
+++ b/config/src/main/resources/config-publisher.xml
@@ -19,22 +19,56 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <!-- Configuration publisher for File Manager OODT Component -->
+    <!-- File Manager example configuration publisher -->
     <bean id="filemgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher">
         <constructor-arg value="FILE_MANAGER"/>
         <property name="propertiesFiles">
             <map key-type="java.lang.String" value-type="java.lang.String">
                 <entry key="examples/filemgr/filemgr.properties" value="/etc/filemgr.properties"/>
+                <entry key="examples/filemgr/logging.properties" value="/etc/logging.properties"/>
             </map>
         </property>
         <property name="configFiles">
             <map key-type="java.lang.String" value-type="java.lang.String">
-                <entry key="examples/filemgr/mime-types.xml" value="/etc/mime-types.xml"/>
-                <entry key="examples/filemgr/cmd-line-actions.xml" value="/policy/cmd-line-actions.xml"/>
-                <entry key="examples/filemgr/cmd-line-options.xml" value="/policy/cmd-line-options.xml"/>
-                <entry key="examples/filemgr/oodt/elements.xml" value="/policy/oodt/elements.xml"/>
-                <entry key="examples/filemgr/oodt/product-types.xml" value="/policy/oodt/product-types.xml"/>
-                <entry key="examples/filemgr/oodt/product-type-element-map.xml" value="/policy/oodt/product-type-element-map.xml"/>
+                <!-- Examples - Core-->
+                <entry key="examples/filemgr/core/elements.xml" value="/policy/core/elements.xml"/>
+                <entry key="examples/filemgr/core/product-types.xml" value="/policy/core/product-types.xml"/>
+                <entry key="examples/filemgr/core/product-type-element-map.xml" value="/policy/core/product-type-element-map.xml"/>
+
+                <!-- Examples - Geo-->
+                <entry key="examples/filemgr/geo/elements.xml" value="/policy/geo/elements.xml"/>
+                <entry key="examples/filemgr/geo/product-types.xml" value="/policy/geo/product-types.xml"/>
+                <entry key="examples/filemgr/geo/product-type-element-map.xml" value="/policy/geo/product-type-element-map.xml"/>
+
+                <!-- Examples - Trace-->
+                <entry key="examples/filemgr/trace/elements.xml" value="/policy/trace/elements.xml"/>
+                <entry key="examples/filemgr/trace/product-types.xml" value="/policy/trace/product-types.xml"/>
+                <entry key="examples/filemgr/trace/product-type-element-map.xml" value="/policy/trace/product-type-element-map.xml"/>
+            </map>
+        </property>
+    </bean>
+
+    <!-- Resource Manager example configuration publisher -->
+    <bean id="resmgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher">
+        <constructor-arg value="RESOURCE_MANAGER"/>
+        <property name="propertiesFiles">
+            <map key-type="java.lang.String" value-type="java.lang.String">
+                <entry key="examples/resmgr/resource.properties" value="/etc/resource.properties"/>
+                <entry key="examples/resmgr/logging.properties" value="/etc/logging.properties"/>
+            </map>
+        </property>
+        <property name="configFiles">
+            <map key-type="java.lang.String" value-type="java.lang.String">
+                <entry key="examples/resmgr/node-to-queue-mapping.xml" value="/policy/node-to-queue-mapping.xml"/>
+                <entry key="examples/resmgr/nodes.xml" value="/policy/nodes.xml"/>
+                <entry key="examples/resmgr/queue-to-backend-mapping.xml" value="/policy/queue-to-backend-mapping.xml"/>
+
+                <entry key="examples/resmgr/jobs/exJob.xml" value="/policy/jobs/exJob.xml"/>
+                <entry key="examples/resmgr/jobs/exLongJob.xml" value="/policy/jobs/exLongJob.xml"/>
+                <entry key="examples/resmgr/jobs/exPalindrome.xml" value="/policy/jobs/exPalindrome.xml"/>
+                <entry key="examples/resmgr/jobs/exSparkJob.xml" value="/policy/jobs/exSparkJob.xml"/>
+                <entry key="examples/resmgr/jobs/exSparkPalindrome.xml" value="/policy/jobs/exSparkPalindrome.xml"/>
+                <entry key="examples/resmgr/jobs/exStreamingPalindrome.xml" value="/policy/jobs/exStreamingPalindrome.xml"/>
             </map>
         </property>
     </bean>

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/cmd-line-actions.xml
----------------------------------------------------------------------
diff --git a/config/src/main/resources/examples/filemgr/cmd-line-actions.xml b/config/src/main/resources/examples/filemgr/cmd-line-actions.xml
deleted file mode 100755
index cf66c9d..0000000
--- a/config/src/main/resources/examples/filemgr/cmd-line-actions.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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)
--->
-<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">
-
-    <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">
-    <property name="description" value="Delete Product by name" />
-  </bean>
-  <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">
-    <property name="description" value="Dumps Product Metadata out to XML" />
-  </bean>
-    <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">
-    <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">
-    <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">
-    <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">
-    <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">
-    <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">
-    <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">
-    <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">
-    <property name="description" value="Get Product info by name" />
-  </bean>
-  <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">
-    <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">
-    <property name="description" value="Gets a ProductType by its name" />
-  </bean>
-  <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">
-    <property name="description" value="Ingests a Product" />
-  </bean>
-  <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="retrieveFilesById" class="org.apache.oodt.cas.filemgr.cli.action.RetrieveFilesCliAction">
-    <property name="description" value="Retrieve a Product's files by Product ID" />
-  </bean>
-  <bean id="retrieveFilesByName" class="org.apache.oodt.cas.filemgr.cli.action.RetrieveFilesCliAction">
-    <property name="description" value="Retrieve a Product's files by Product name" />
-  </bean>
-  <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>
- This supports sending queries to the FileManager in form of
-  SELECT [Elements] FROM [ProductTypes] WHERE [where-clause], where:
-   - [Elements]: is a comma separated list of Element names; may also be * which
-    represents all Elements
-   - [ProductTypes]: is a comma separated list of ProductType names; may also
-    be * which represents all ProductTypes
-   - [where-clause]: is an optional Element name filter supporting the following:
-      * AND and OR boolean operators
-      * () grouping of queries
-      * element-name == 'element-value'
-      * element-name &#60; 'element-value'
-      * element-name &#62; 'element-value'
-      * element-name &#60;= 'element-value'
-      * element-name &#62;= 'element-value'"
-
- An additional post-query FilterAlgor can also be specified where you specify
-  which Metadata fields which should be used as each Product's StartDateTime,
-  EndDateTime, and Priority values
-      </value>
-    </property>
-    <property name="examples">
-      <value>
- (Assume you have a ProductType, GenericFile, which supports the
-    Elements: Filename, NominalDate, Group, and DataVersion)
-  $ ./filemgr-client -u http://localhost:9000 -op -sql
-    -q "SELECT Filename FROM GenericFile WHERE (NominalDate == '2011-20-10' OR
-      NominalDate == '2011-20-11') AND Group == 'Test' AND DataVersion > '1.0'"
- (Returns all Products in FileManager -- use with care)
-  $ ./filemgr-client -u http://localhost:9000 -op -sql -q "SELECT * FROM *"
-      </value>
-    </property>
-  </bean>
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/cmd-line-options.xml
----------------------------------------------------------------------
diff --git a/config/src/main/resources/examples/filemgr/cmd-line-options.xml b/config/src/main/resources/examples/filemgr/cmd-line-options.xml
deleted file mode 100755
index 227def2..0000000
--- a/config/src/main/resources/examples/filemgr/cmd-line-options.xml
+++ /dev/null
@@ -1,1175 +0,0 @@
-<?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)
--->
-<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">
-
-    <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="File Manager URL" />
-        <property name="hasArgs" value="true" />
-        <property name="argsDescription" value="url" />
-        <property name="required" value="true" />
-        <property name="handler">
-            <bean
-                class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler">
-                <property name="propertyNames">
-                    <list>
-                        <value>org.apache.oodt.cas.filemgr.url</value>
-                    </list>
-                </property>
-            </bean>
-        </property>
-    </bean>
-
-    <bean id="operation" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption">
-        <property name="shortOption" value="op" />
-        <property name="longOption" value="operation" />
-        <property name="description"
-            value="Declare that you wish to present an operation" />
-        <property name="hasArgs" value="false" />
-        <property name="required" value="true" />
-        <property name="subOptions">
-            <list>
-                <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-                    p:option-ref="addProductType" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="deleteProductById" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="deleteProductByName" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="ingestProduct" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="hasProduct" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getProductTypeByName" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getNumProducts" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getFirstPage" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getNextPage" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getPrevPage" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getLastPage" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getCurrentTransfer" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getCurrentTransfers" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getProductById" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getProductByName" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getProductPctTransferred" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="getFilePctTransferred" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="sqlQuery" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="dumpMetadata" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="luceneQuery" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="retrieveFilesById" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="retrieveFilesByName" p:required="false" />
-            </list>
-        </property>
-    </bean>
-
-    <!-- AddProductType Options -->
-    <bean id="addProductType" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-        p:isSubOption="true">
-        <property name="shortOption" value="addPT" />
-        <property name="longOption" value="addProductType" />
-        <property name="description" value="Triggers addProductType Action" />
-        <property name="hasArgs" value="false" />
-        <property name="staticArgs">
-            <list>
-                <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" />
-            </list>
-        </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" />
-    <property name="description" value="ProductType description" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="description" />
-    <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="setProductTypeDescription" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="repository" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="repo" />
-    <property name="longOption" value="repository" />
-    <property name="description" value="ProductType repository" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="file-path" />
-    <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="setFileRepositoryPath" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="versionClass" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="vc" />
-    <property name="longOption" value="versionClass" />
-    <property name="description" value="ProductType versioner class" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="classpath" />
-    <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="setVersioner" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <!-- IngestProduct Options -->
-  <bean id="ingestProduct" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="ingest" />
-    <property name="longOption" value="ingestProduct" />
-    <property name="description" value="Triggers ingestProduct Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="productStructure" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="ps" />
-    <property name="longOption" value="productStructure" />
-    <property name="description" value="Hierarchical | Flat" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="structure-type" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" 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="ingestProduct" p:methodName="setProductStructure" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="metadataFile" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="mf" />
-    <property name="longOption" value="metadataFile" />
-    <property name="description" value="Metadata XML file path or URL" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="file-path-or-url" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="clientTransfer" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption">
-    <property name="shortOption" value="ct" />
-    <property name="longOption" value="clientTransfer" />
-    <property name="description" value="User client transferer" />
-    <property name="hasArgs" value="false" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="subOptions">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="dataTransfer" p:required="true" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="dataTransfer" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="dt" />
-    <property name="longOption" value="dataTransfer" />
-    <property name="description" value="DataTransferer factory class" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="classpath" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" 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="ingestProduct" p:methodName="setDataTransferer" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="refs" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="rs" />
-    <property name="longOption" value="refs" />
-    <property name="description" value="Data file path or URL" />
-    <property name="type" value="java.util.List" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="file-path-or-url" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" 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="ingestProduct" p:methodName="setReferences" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <!-- HasProduct Options -->
-  <bean id="hasProduct" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="product" />
-    <property name="longOption" value="hasProduct" />
-    <property name="description" value="Triggers hasProduct Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetProductTypeByName Options -->
-  <bean id="getProductTypeByName" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="ptbyn" />
-    <property name="longOption" value="getProductTypeByName" />
-    <property name="description" value="Triggers getProductTypeByName Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetNumProducts Options -->
-  <bean id="getNumProducts" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="num" />
-    <property name="longOption" value="getNumProducts" />
-    <property name="description" value="Triggers getNumProducts Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetFirstPage Options -->
-  <bean id="getFirstPage" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="page1" />
-    <property name="longOption" value="getFirstPage" />
-    <property name="description" value="Triggers getFirstPage Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetNextPage Options -->
-  <bean id="getNextPage" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="next" />
-    <property name="longOption" value="getNextPage" />
-    <property name="description" value="Triggers getNextPage Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetPrevPage Options -->
-  <bean id="getPrevPage" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="prev" />
-    <property name="longOption" value="getPrevPage" />
-    <property name="description" value="Triggers getPrevPage Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetLastPage Options -->
-  <bean id="getLastPage" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="last" />
-    <property name="longOption" value="getLastPage" />
-    <property name="description" value="Triggers getLastPage Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetCurrentTransfer Options -->
-  <bean id="getCurrentTransfer" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="curTran" />
-    <property name="longOption" value="getCurrentTransfer" />
-    <property name="description" value="Triggers getCurrentTransfer Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetCurrentTransfers Options -->
-  <bean id="getCurrentTransfers" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="curTrans" />
-    <property name="longOption" value="getCurrentTransfers" />
-    <property name="description" value="Triggers getCurrentTransfers Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetProductPercentTransferred Options -->
-  <bean id="getProductPctTransferred" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="pctTrans" />
-    <property name="longOption" value="getProductPctTransferred" />
-    <property name="description" value="Triggers getProductPercentTransferred Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetFilePercentTransferred Options -->
-  <bean id="getFilePctTransferred" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="filePctTrans" />
-    <property name="longOption" value="getFilePctTransferred" />
-    <property name="description" value="Triggers getFilePercentTransferred Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="origRef" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="or" />
-    <property name="longOption" value="origRef" />
-    <property name="description" value="Original reference" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="file-path-or-url" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getFilePercentTransferred" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <!-- SqlQuery Options -->
-  <bean id="sqlQuery" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="sql" />
-    <property name="longOption" value="sqlQuery" />
-    <property name="description" value="Triggers sqlQuery Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-
-
-  <!-- GetProductById Options -->
-  <bean id="getProductById" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="pbyid" />
-    <property name="longOption" value="getProductById" />
-    <property name="description" value="Triggers getProductById Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- GetProductByName Options -->
-  <bean id="getProductByName" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="pbyn" />
-    <property name="longOption" value="getProductByName" />
-    <property name="description" value="Triggers getProductByName Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- DeleteProductById Options -->
-  <bean id="deleteProductById" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="dbyid" />
-    <property name="longOption" value="deleteProductById" />
-    <property name="description" value="Triggers deleteProductById Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- DeleteProductByName Options -->
-  <bean id="deleteProductByName" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="dbyn" />
-    <property name="longOption" value="deleteProductByName" />
-    <property name="description" value="Triggers deleteProductByName Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- DumpMetadata Options -->
-  <bean id="dumpMetadata" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="dmet" />
-    <property name="longOption" value="dumpMetadata" />
-    <property name="description" value="Triggers dumpMetadata Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="outputDir" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="out" />
-    <property name="longOption" value="outputDir" />
-    <property name="description" value="Output directory" />
-    <property name="type" value="java.io.File" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="file-dir" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="dumpMetadata" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <!-- LuceneQuery Options -->
-  <bean id="luceneQuery" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="lucene" />
-    <property name="longOption" value="luceneQuery" />
-    <property name="description" value="Triggers luceneQuery Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <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" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="reducedProductTypes" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="pts" />
-    <property name="longOption" value="reducedProductTypes" />
-    <property name="description" value="Limit query ProductTypes queried against" />
-    <property name="type" value="java.util.List" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="list-of-product-types" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="reducedMetadataKeys" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="metKeys" />
-    <property name="longOption" value="reducedMetadataKeys" />
-    <property name="description" value="Limit Elements returned by query" />
-    <property name="type" value="java.util.List" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="list-of-elements" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <!-- retrieveFiles Options -->
-  <bean id="retrieveFilesById" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="rfbyid" />
-    <property name="longOption" value="retrieveFilesById" />
-    <property name="description" value="Triggers retrieveFilesById Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <value>retrieveFilesById</value>
-      </list>
-    </property>
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesById" p:relation="REQUIRED" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="retrieveFilesByName" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
-    p:isSubOption="true">
-    <property name="shortOption" value="rfbyn" />
-    <property name="longOption" value="retrieveFilesByName" />
-    <property name="description" value="Triggers retrieveFilesByName Action" />
-    <property name="hasArgs" value="false" />
-    <property name="staticArgs">
-      <list>
-        <value>retrieveFilesByName</value>
-      </list>
-    </property>
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesByName" p:relation="REQUIRED" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="transferer" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="trans" />
-    <property name="longOption" value="transferer" />
-    <property name="description" value="Factory for creating DataTransfer which will perform the file transfer(s)" />
-    <property name="type" value="org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="transfer factory class" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesById" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesByName" 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="retrieveFilesById" p:methodName="setDataTransferFactory" />
-            <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
-              p:actionName="retrieveFilesByName" p:methodName="setDataTransferFactory" />
-          </list>
-        </property>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="destination" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="dest" />
-    <property name="longOption" value="destination" />
-    <property name="description" value="Directory to transfer Product file to" />
-    <property name="type" value="java.io.File" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="directory" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesById" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesByName" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-    <!-- Options used for multiple Actions -->
-  <bean id="productId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="pid" />
-    <property name="longOption" value="productId" />
-    <property name="description" value="Product ID" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="product-id" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getProductPercentTransferred" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getProductById" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="deleteProductById" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="dumpMetadata" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesById" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-    
-  <bean id="productName" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="pn" />
-    <property name="longOption" value="productName" />
-    <property name="description" value="Product name" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="product-name" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="ingestProduct" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="hasProduct" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getProductByName" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="deleteProductByName" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="retrieveFilesByName" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="productTypeName" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="ptn" />
-    <property name="longOption" value="productTypeName" />
-    <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="ingestProduct" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getProductTypeByName" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getNumProducts" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getFirstPage" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getNextPage" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getPrevPage" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getLastPage" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getProductPercentTransferred" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-  
-  <bean id="currentPageNum" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="curPage" />
-    <property name="longOption" value="currentPageNum" />
-    <property name="description" value="Current Page Number" />
-    <property name="type" value="int" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="page-number" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getNextPage" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="getPrevPage" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="query" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="q" />
-    <property name="longOption" value="query" />
-    <property name="description" value="File Manager query" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="query" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="REQUIRED" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="REQUIRED" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="sortBy" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="sb" />
-    <property name="longOption" value="sortBy" />
-    <property name="description" value="Metadata field to sort query results by" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="metadata field" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="outputFormat" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="of" />
-    <property name="longOption" value="outputFormat" />
-    <property name="description" value="Output format string (i.e. Filename = $Filename)" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="output-format-string" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="delimiter" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
-    <property name="shortOption" value="dlmtr" />
-    <property name="longOption" value="delimiter" />
-    <property name="description" value="String to use the separate query results" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="delimiter-string" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="filter" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption">
-    <property name="shortOption" value="f" />
-    <property name="longOption" value="filter" />
-    <property name="description" value="Query filter" />
-    <property name="hasArgs" value="false" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="subOptions">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="algor" p:required="true" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="converter" p:required="false" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="startDateTimeMetKey" p:required="true" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="endDateTimeMetKey" p:required="true" />
-        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
-          p:option-ref="priorityMetKey" p:required="true" />
-      </list>
-    </property>
-  </bean>
-
-  <bean id="algor" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="algor" />
-    <property name="longOption" value="algor" />
-    <property name="description" value="FilterAlgor class" />
-    <property name="type" value="org.apache.oodt.cas.filemgr.structs.query.filter.FilterAlgor" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="classpath" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-  
-  <bean id="converter" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="conv" />
-    <property name="longOption" value="converter" />
-    <property name="description" value="VersionConverter class" />
-    <property name="type" value="org.apache.oodt.cas.filemgr.structs.query.conv.VersionConverter" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="classpath" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-
-  <bean id="startDateTimeMetKey" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="sdtMetKey" />
-    <property name="longOption" value="startDateTimeMetKey" />
-    <property name="description" value="Start date time metadata key" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="metadata-key" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-  
-  <bean id="endDateTimeMetKey" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="edtMetKey" />
-    <property name="longOption" value="endDateTimeMetKey" />
-    <property name="description" value="End date time metadata key" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="metadata-key" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-  
-  <bean id="priorityMetKey" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
-      p:isSubOption="true">
-    <property name="shortOption" value="prMetKey" />
-    <property name="longOption" value="priorityMetKey" />
-    <property name="description" value="Priority metadata key" />
-    <property name="hasArgs" value="true" />
-    <property name="argsDescription" value="metadata-key" />
-    <property name="requirementRules">
-      <list>
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="sqlQuery" p:relation="OPTIONAL" />
-        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
-          p:actionName="luceneQuery" p:relation="OPTIONAL" />
-      </list>
-    </property>
-    <property name="handler">
-      <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" />
-    </property>
-  </bean>
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/filemgr.properties
----------------------------------------------------------------------
diff --git a/config/src/main/resources/examples/filemgr/filemgr.properties b/config/src/main/resources/examples/filemgr/filemgr.properties
deleted file mode 100644
index 4d8d957..0000000
--- a/config/src/main/resources/examples/filemgr/filemgr.properties
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# 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.
-#
-
-# Configuration properties for the File Manager
-
-# repository factory
-filemgr.repository.factory=org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory
-
-# Lucene catalog factory
-filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory
-
-# data transfer factory
-filemgr.datatransfer.factory=org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
-
-# validation layer factory
-filemgr.validationLayer.factory=org.apache.oodt.cas.filemgr.validation.XMLValidationLayerFactory
-
-# xml rpc client configuration
-org.apache.oodt.cas.filemgr.system.xmlrpc.connectionTimeout.minutes=20
-org.apache.oodt.cas.filemgr.system.xmlrpc.requestTimeout.minutes=60
-#org.apache.oodt.cas.filemgr.system.xmlrpc.connection.retries=0
-#org.apache.oodt.cas.filemgr.system.xmlrpc.connection.retry.interval.seconds=3
-
-# mapped data source catalog configuration
-#org.apache.oodt.cas.filemgr.catalog.mappeddatasource.mapFile=/path/to/ops.catalog.typemap.properties
-
-# lucene catalog configuration
-org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=[OODT_HOME]/data/catalog
-org.apache.oodt.cas.filemgr.catalog.lucene.pageSize=20
-org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds=60
-org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds=60
-org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor=20
-
-# XML repository manager configuration
-org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:[FILEMGR_HOME]/policy/oodt
-
-# XML validation layer configuration
-org.apache.oodt.cas.filemgr.validation.dirs=file:[FILEMGR_HOME]/policy/oodt
-
-# remote data transfer configuration
-org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize=1024
-
-# location of Mime-Type repository
-org.apache.oodt.cas.filemgr.mime.type.repository=[FILEMGR_HOME]/etc/mime-types.xml
-
-
-############ data source configuration ##################################
-#
-# These 3 blocks of config properties can be used to setup a catalog,
-# repository manager, and validation layer based on a RDBMS such as
-# Oracle, MySQL, PostgreSQL, or any others that support a jdbc connection.
-# Just un-comment the following blocks of properties and configure as
-# needed.
-#
-#########################################################################
-
-# datasource catalog config
-#org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.url=some_jdbc_url
-#org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.user=user
-#org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.pass=pass
-#org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.driver=driver.class.name
-#org.apache.oodt.cas.filemgr.catalog.datasource.quoteFields=false
-#org.apache.oodt.cas.filemgr.catalog.datasource.pageSize=20
-#org.apache.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes=5
-
-# data source repository manager configuration
-#org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.url=some_jdbc_url
-#org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.user=user
-#org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.pass=pass
-#org.apache.oodt.cas.filemgr.repositorymgr.datasource.jdbc.driver=driver.class.name
-
-# data source validation layer configuration
-#org.apache.oodt.cas.filemgr.validation.datasource.jdbc.url=some_jdbc_url
-#org.apache.oodt.cas.filemgr.validation.datasource.jdbc.user=user
-#org.apache.oodt.cas.filemgr.validation.datasource.jdbc.pass=pass
-#org.apache.oodt.cas.filemgr.validation.datasource.jdbc.driver=driver.class.name
-#org.apache.oodt.cas.filemgr.validation.datasource.quoteFields=false
-
-
-# tells the file manager system layer to include product instance metadata
-# NOTE: here are the expected field mappings
-#
-# product.getProductId() -> ProductId
-# product.getProductName() -> ProductName
-# product.getProductStructure() -> ProductStructure
-# product.getTransferStatus() -> ProductTransferStatus
-# product.getRootRef() -> ProductRootReference
-
-# for the references returned by product.getProductReferences() the following
-# metadata fields will be added (order will be maintained, such that data store
-# ref at index 0 will map to orig ref at index 0, etc.)
-#
-# ProductDataStoreReferences (list of all data store references:
-# note already translated into path, not URI)
-# ProductOrigReferences (list of all orig references:
-# note already translated into path, not URI)
-# ProductMimeType (list of all references' mime-types)
-# ProductFileSize (list of all references' file sizes)
-
-org.apache.oodt.cas.filemgr.metadata.expandProduct=false
\ No newline at end of file


Mime
View raw message