Author: bfoster
Date: Fri Dec 17 01:29:01 2010
New Revision: 1050262
URL: http://svn.apache.org/viewvc?rev=1050262&view=rev
Log:
- Spring XML resource classpaths where updated from /gov/nasa/jpl... and
commons classpaths were updated to remove 'cas'
----------------------
OODT-93
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
oodt/trunk/crawler/src/main/resources/action-beans.xml
oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml
oodt/trunk/crawler/src/main/resources/crawler-beans.xml
oodt/trunk/crawler/src/main/resources/crawler-config.xml
oodt/trunk/crawler/src/main/resources/logging.properties
oodt/trunk/crawler/src/main/resources/precondition-beans.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Fri Dec 17 01:29:01 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.2 (Current Development)
--------------------------------------------
+* OODT-93 Spring XML resource classpaths are still set to /gov/nasa/jpl... and
commons classpaths were not updates to remove 'cas' (bfoster)
+
* OODT-91 cas-commons command-line help for a given arguments (bfoster)
* OODT-89 (cas-pushpull patch) Synchonize OODT-CAS components, which depend on
one another, on a particular Apache-Tika version (bfoster)
Modified:
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
---
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
(original)
+++
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/CrawlerLauncher.java
Fri Dec 17 01:29:01 2010
@@ -51,7 +51,7 @@ public class CrawlerLauncher {
public CrawlerLauncher() {
this(System.getProperty("org.apache.oodt.cas.crawl.bean.repo",
- "classpath:/org.apache/oodt/cas/crawl/crawler-config.xml"));
+ "classpath:/org/apache/oodt/cas/crawl/crawler-config.xml"));
}
public CrawlerLauncher(String beanRepo) {
Modified: oodt/trunk/crawler/src/main/resources/action-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/action-beans.xml?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/action-beans.xml (original)
+++ oodt/trunk/crawler/src/main/resources/action-beans.xml Fri Dec 17 01:29:01
2010
@@ -19,7 +19,7 @@ the License.
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";>
- <bean
class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
+ <bean
class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
<!-- Crawler Actions -->
Modified: oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml (original)
+++ oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml Fri Dec 17
01:29:01 2010
@@ -20,9 +20,9 @@ the License.
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.5.xsd";>
- <bean
class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
+ <bean
class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
- <bean id="crawlerId"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="crawlerId" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="cid"/>
<property name="longOption" value="crawlerId"/>
<property name="description" value="The ProductCrawler bean id of the
crawler to use"/>
@@ -31,7 +31,7 @@ the License.
<property name="required" value="true"/>
</bean>
- <bean id="printSupportedActions"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="printSupportedActions"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="psa"/>
<property name="longOption" value="printSupportedActions"/>
<property name="description" value="Prints a list and description of
all supported CrawlerActions"/>
@@ -42,14 +42,14 @@ the License.
<bean
class="org.apache.oodt.cas.crawl.option.CmdLineOptionCrawlerActionInfoHandler">
<property name="applicationContext">
<bean
class="org.springframework.context.support.ClassPathXmlApplicationContext">
- <constructor-arg
value="gov/nasa/jpl/oodt/cas/crawl/action/action-beans.xml"/>
+ <constructor-arg
value="/org/apache/oodt/cas/crawl/action/action-beans.xml"/>
</bean>
</property>
</bean>
</property>
</bean>
- <bean id="printSupportedCrawlers"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="printSupportedCrawlers"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="psc"/>
<property name="longOption" value="printSupportedCrawlers"/>
<property name="description" value="Prints a list of all supported
ProductCrawlers"/>
@@ -60,14 +60,14 @@ the License.
<bean
class="org.apache.oodt.cas.crawl.option.CmdLineOptionProductCrawlerInfoHandler">
<property name="applicationContext">
<bean
class="org.springframework.context.support.ClassPathXmlApplicationContext">
- <constructor-arg
value="/gov/nasa/jpl/oodt/cas/crawl/crawler-beans.xml"/>
+ <constructor-arg
value="/org/apache/oodt/cas/crawl/crawler-beans.xml"/>
</bean>
</property>
</bean>
</property>
</bean>
- <bean id="printSupportedPreconditions"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="printSupportedPreconditions"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="psp"/>
<property name="longOption" value="printSupportedPreconditions"/>
<property name="description" value="Prints a list and description of
all supported Preconditions"/>
@@ -78,14 +78,14 @@ the License.
<bean
class="org.apache.oodt.cas.crawl.option.CmdLineOptionPreconditionInfoHandler">
<property name="applicationContext">
<bean
class="org.springframework.context.support.ClassPathXmlApplicationContext">
- <constructor-arg
value="/gov/nasa/jpl/oodt/cas/crawl/comparator/precondition-beans.xml"/>
+ <constructor-arg
value="/org/apache/oodt/cas/crawl/comparator/precondition-beans.xml"/>
</bean>
</property>
</bean>
</property>
</bean>
- <bean id="filemgrUrl"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="filemgrUrl" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="fm"/>
<property name="longOption" value="filemgrUrl"/>
<property name="description" value="File Manager URL"/>
@@ -93,21 +93,21 @@ the License.
<property name="optionArgName" value="url"/>
<property name="required" value="true"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="Unique"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AprioriUniquessCheckWithFilemgr"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="Unique"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AprioriUniquessCheckWithFilemgr"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+ <bean
class="org.apache.oodt.commons.option.validator.ArgRegExpCmdLineOptionValidator">
<property name="allowedArgs">
<list>
<value>http://.*:\d*</value>
@@ -118,7 +118,7 @@ the License.
</property>
</bean>
- <bean id="failureDir"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="failureDir" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="fd"/>
<property name="longOption" value="failureDir"/>
<property name="description" value="Directory where files will be
moved on failure"/>
@@ -127,7 +127,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="actionIds"/>
<property name="requireAllValues" value="false"/>
<property name="optionValues">
@@ -141,24 +141,24 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToFailureDir" p:methodName="setToDir"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setToDir"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MoveDataFileToFailureDir" p:methodName="setToDir"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToFailureDir" p:methodName="setToDir"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setToDir"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MoveDataFileToFailureDir" p:methodName="setToDir"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.FileExistCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="successDir"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="successDir" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="sd"/>
<property name="longOption" value="successDir"/>
<property name="description" value="Directory where files will be
moved on success"/>
@@ -167,7 +167,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="actionIds"/>
<property name="requireAllValues" value="false"/>
<property name="optionValues">
@@ -180,23 +180,23 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setToDir"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToBackupDir" p:methodName="setToDir"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setToDir"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToBackupDir" p:methodName="setToDir"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.FileExistCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="workflowMgrUrl"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="workflowMgrUrl"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="wm"/>
<property name="longOption" value="workflowMgrUrl"/>
<property name="description" value="Workflow Manager URL"/>
@@ -205,7 +205,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="actionIds"/>
<property name="requireAllValues" value="false"/>
<property name="optionValues">
@@ -217,17 +217,17 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="UpdateWorkflowStatusToIngest"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="UpdateWorkflowStatusToIngest"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+ <bean
class="org.apache.oodt.commons.option.validator.ArgRegExpCmdLineOptionValidator">
<property name="allowedArgs">
<list>
<value>http://.*:\d*</value>
@@ -238,7 +238,7 @@ the License.
</property>
</bean>
- <bean id="clientTransferer"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="clientTransferer"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="ct"/>
<property name="longOption" value="clientTransferer"/>
<property name="description" value="File Manager data transferer
factory class"/>
@@ -246,24 +246,24 @@ the License.
<property name="optionArgName" value="class"/>
<property name="required" value="true"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="requiredMetadata"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="requiredMetadata"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="rqm"/>
<property name="longOption" value="requiredMetadata"/>
<property name="description" value="Metadata required for ingest to
take place"/>
@@ -272,19 +272,19 @@ the License.
<property name="required" value="false"/>
<property name="type" value="java.util.List"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="actionIds"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="actionIds" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="ais"/>
<property name="longOption" value="actionIds"/>
<property name="description" value="CrawlerActions that should be
performed"/>
@@ -293,19 +293,19 @@ the License.
<property name="required" value="false"/>
<property name="type" value="java.util.List"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="preCondIds"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="preCondIds" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="pids"/>
<property name="longOption" value="preCondIds"/>
<property name="description" value="PreConditionComparator ids that
must pass before any metadata extraction will run"/>
@@ -314,74 +314,74 @@ the License.
<property name="required" value="false"/>
<property name="type" value="java.util.List"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="noRecur"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="noRecur" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="nr"/>
<property name="longOption" value="noRecur"/>
<property name="description" value="Turns off recursive crawling -
will only process files in productPath directory"/>
<property name="hasArgs" value="false"/>
<property name="required" value="false"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="crawlForDirs"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="crawlForDirs"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="cfd"/>
<property name="longOption" value="crawlForDirs"/>
<property name="description" value="Will crawl for directories instead
of files"/>
<property name="hasArgs" value="false"/>
<property name="required" value="false"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="skipIngest"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="skipIngest" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="si"/>
<property name="longOption" value="skipIngest"/>
<property name="description" value="Will skip ingest to file manager
and any post ingest actions"/>
<property name="hasArgs" value="false"/>
<property name="required" value="false"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="daemonPort"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="daemonPort" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="dp"/>
<property name="longOption" value="daemonPort"/>
<property name="description" value="Cause crawler to become a daemon
with a XML-RPC webserver started on the given port number"/>
@@ -390,19 +390,19 @@ the License.
<property name="required" value="false"/>
<property name="type" value="int"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+ <bean
class="org.apache.oodt.commons.option.validator.ArgRegExpCmdLineOptionValidator">
<property name="allowedArgs">
<list>
<value>\d*</value>
@@ -413,7 +413,7 @@ the License.
</property>
</bean>
- <bean id="daemonWait"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="daemonWait" class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="dw"/>
<property name="longOption" value="daemonWait"/>
<property name="description" value="Cause crawler to become a daemon
and sleep for given number of seconds between crawls"/>
@@ -422,19 +422,19 @@ the License.
<property name="required" value="false"/>
<property name="type" value="int"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+ <bean
class="org.apache.oodt.commons.option.validator.ArgRegExpCmdLineOptionValidator">
<property name="allowedArgs">
<list>
<value>\d*</value>
@@ -445,7 +445,7 @@ the License.
</property>
</bean>
- <bean id="productPath"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="productPath"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="pp"/>
<property name="longOption" value="productPath"/>
<property name="description" value="Root directory to crawl"/>
@@ -453,24 +453,24 @@ the License.
<property name="optionArgName" value="directory"/>
<property name="required" value="true"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.FileExistCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="metFileExtension"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="metFileExtension"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="mfx"/>
<property name="longOption" value="metFileExtension"/>
<property name="description" value="The file extension of existing and
to be created PCS metadata files"/>
@@ -479,7 +479,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="crawlerId"/>
<property name="requireAllValues" value="true"/>
<property name="optionValues">
@@ -488,7 +488,7 @@ the License.
</list>
</property>
</bean>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="actionIds"/>
<property name="requireAllValues" value="false"/>
<property name="optionValues">
@@ -502,20 +502,20 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="DeleteMetadataFile" p:methodName="setFileExtension"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToBackupDir" p:methodName="setFileExtension"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToFailureDir" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="StdProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="DeleteMetadataFile" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToBackupDir" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MoveMetadataToFailureDir" p:methodName="setFileExtension"/>
</list>
</property>
</bean>
</property>
</bean>
- <bean id="metExtractor"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="metExtractor"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="mx"/>
<property name="longOption" value="metExtractor"/>
<property name="description" value="Metadata extractor class to use"/>
@@ -524,7 +524,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="crawlerId"/>
<property name="requireAllValues" value="true"/>
<property name="optionValues">
@@ -536,22 +536,22 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="metExtractorConfig"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="metExtractorConfig"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="mxc"/>
<property name="longOption" value="metExtractorConfig"/>
<property name="description" value="Config file for metadata
extractor"/>
@@ -560,7 +560,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="crawlerId"/>
<property name="requireAllValues" value="true"/>
<property name="optionValues">
@@ -572,22 +572,22 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MetExtractorProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.FileExistCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="mimeExtractorRepo"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="mimeExtractorRepo"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="mxr"/>
<property name="longOption" value="mimeExtractorRepo"/>
<property name="description" value="Mime-type to metadata extractor
mapping xml file"/>
@@ -596,7 +596,7 @@ the License.
<property name="required" value="true"/>
<property name="requiredOptions">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.required.RequiredOption">
+ <bean
class="org.apache.oodt.commons.option.required.RequiredOption">
<property name="optionLongName" value="crawlerId"/>
<property name="requireAllValues" value="true"/>
<property name="optionValues">
@@ -608,22 +608,22 @@ the License.
</list>
</property>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="AutoDetectProductCrawler"/>
</list>
</property>
</bean>
</property>
<property name="validators">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+ <bean
class="org.apache.oodt.commons.option.validator.FileExistCmdLineOptionValidator"/>
</list>
</property>
</bean>
- <bean id="pushpullMetFileExtension"
class="org.apache.oodt.cas.commons.option.CmdLineOption">
+ <bean id="pushpullMetFileExtension"
class="org.apache.oodt.commons.option.CmdLineOption">
<property name="shortOption" value="ppmfx"/>
<property name="longOption" value="pushpullMetFileExtension"/>
<property name="description" value="File extension of push-pull
metadata files"/>
@@ -631,13 +631,13 @@ the License.
<property name="optionArgName" value="file extension"/>
<property name="required" value="false"/>
<property name="handler">
- <bean
class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+ <bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="DeletePushpullMetFile" p:methodName="setFileExtension"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setFileExtension"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setFileExtension"/>
- <bean
class="org.apache.oodt.cas.commons.option.handler.BeanInfo"
p:bean-ref="CheckThatPushPullMetFileExists" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="DeletePushpullMetFile" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setFileExtension"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="CheckThatPushPullMetFileExists" p:methodName="setFileExtension"/>
</list>
</property>
</bean>
Modified: oodt/trunk/crawler/src/main/resources/crawler-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/crawler-beans.xml?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/crawler-beans.xml (original)
+++ oodt/trunk/crawler/src/main/resources/crawler-beans.xml Fri Dec 17 01:29:01
2010
@@ -19,7 +19,7 @@ the License.
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";>
- <bean
class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
+ <bean
class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
<!-- Product Crawlers -->
Modified: oodt/trunk/crawler/src/main/resources/crawler-config.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/crawler-config.xml?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/crawler-config.xml (original)
+++ oodt/trunk/crawler/src/main/resources/crawler-config.xml Fri Dec 17
01:29:01 2010
@@ -20,9 +20,9 @@ the License.
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.5.xsd";>
- <import
resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/crawler-beans.xml"/>
- <import
resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/action/action-beans.xml"/>
- <import
resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/comparator/precondition-beans.xml"/>
- <import
resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/option/cmd-line-option-beans.xml"/>
+ <import resource="classpath:/org/apache/oodt/cas/crawl/crawler-beans.xml"/>
+ <import
resource="classpath:/org/apache/oodt/cas/crawl/action/action-beans.xml"/>
+ <import
resource="classpath:/org/apache/oodt/cas/crawl/comparator/precondition-beans.xml"/>
+ <import
resource="classpath:/org/apache/oodt/cas/crawl/option/cmd-line-option-beans.xml"/>
</beans>
Modified: oodt/trunk/crawler/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/logging.properties?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/logging.properties (original)
+++ oodt/trunk/crawler/src/main/resources/logging.properties Fri Dec 17
01:29:01 2010
@@ -60,3 +60,4 @@ org.springframework.beans.factory.level
org.springframework.beans.factory.config.level = WARNING
org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.level =
WARNING
org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer.level = WARNING
+sun.net.level = WARNING
\ No newline at end of file
Modified: oodt/trunk/crawler/src/main/resources/precondition-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/resources/precondition-beans.xml?rev=1050262&r1=1050261&r2=1050262&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/resources/precondition-beans.xml (original)
+++ oodt/trunk/crawler/src/main/resources/precondition-beans.xml Fri Dec 17
01:29:01 2010
@@ -19,7 +19,7 @@ the License.
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";>
- <bean
class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
+ <bean
class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>
<!-- Precondition Comparators -->
