oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964894 [1/2] - in /incubator/oodt/trunk: ./ crawler/ crawler/src/main/assembly/ crawler/src/main/bin/ crawler/src/main/resources/ crawler/src/main/resources/examples/ crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/ crawler/src...
Date Fri, 16 Jul 2010 18:27:38 GMT
Author: kelly
Date: Fri Jul 16 18:27:37 2010
New Revision: 964894

URL: http://svn.apache.org/viewvc?rev=964894&view=rev
Log:
WIP OODT-15 OODT-16
"crawler" module is now working; add std ignores; replace Caltech notices with ASF notices; replace gov.nasa.jpl with org.apache; add missing XML pi decls; change property names to reflect new apache "lineage"; update bean names; update project documentation.

Modified:
    incubator/oodt/trunk/crawler/   (props changed)
    incubator/oodt/trunk/crawler/pom.xml
    incubator/oodt/trunk/crawler/src/main/assembly/assembly.xml
    incubator/oodt/trunk/crawler/src/main/bin/crawlctl
    incubator/oodt/trunk/crawler/src/main/bin/crawler_launcher
    incubator/oodt/trunk/crawler/src/main/resources/action-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/crawler-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/crawler-config.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/action-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/cmd-line-option-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-bean-properties.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler.properties
    incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/precondition-beans.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/mime-extractor-map.xml
    incubator/oodt/trunk/crawler/src/main/resources/examples/mimetypes.xml
    incubator/oodt/trunk/crawler/src/main/resources/logging.properties
    incubator/oodt/trunk/crawler/src/main/resources/precondition-beans.xml
    incubator/oodt/trunk/crawler/src/site/site.xml
    incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/crawler/src/test/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
    incubator/oodt/trunk/pom.xml

Propchange: incubator/oodt/trunk/crawler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 18:27:37 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/crawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/pom.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/pom.xml (original)
+++ incubator/oodt/trunk/crawler/pom.xml Fri Jul 16 18:27:37 2010
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>gov.nasa.jpl.oodt</groupId>
+    <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
-    <version>2.0</version>
+    <version>${oodt.version}</version>
+    <relativePath>../core/pom.xml</relativePath>
   </parent>
-  <artifactId>cas-crawler</artifactId>
+  <artifactId>crawler</artifactId>
   <name>Catalog and Archive Crawling Framework</name>
   <version>2.3.0-dev</version>
   <description>The Catalog and Archive Service Crawling Framework.</description>
@@ -53,7 +70,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>gov.nasa.jpl.oodt.cas.crawl.CrawlerLauncher</mainClass>
+              <mainClass>org.apache.oodt.cas.crawl.CrawlerLauncher</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -69,7 +86,7 @@
     </plugins>
     <resources>
       <resource>
-        <targetPath>gov/nasa/jpl/oodt/cas/crawl</targetPath>
+        <targetPath>org/apache/oodt/cas/crawl</targetPath>
         <directory>${basedir}/src/main/resources</directory>
         <includes>
           <include>crawler-beans.xml</include>
@@ -77,21 +94,21 @@
         </includes>
       </resource>
       <resource>
-        <targetPath>gov/nasa/jpl/oodt/cas/crawl/action</targetPath>
+        <targetPath>org/apache/oodt/cas/crawl/action</targetPath>
         <directory>${basedir}/src/main/resources</directory>
         <includes>
           <include>action-beans.xml</include>
         </includes>
       </resource>
       <resource>
-        <targetPath>gov/nasa/jpl/oodt/cas/crawl/option</targetPath>
+        <targetPath>org/apache/oodt/cas/crawl/option</targetPath>
         <directory>${basedir}/src/main/resources</directory>
         <includes>
           <include>cmd-line-option-beans.xml</include>
         </includes>
       </resource>
       <resource>
-        <targetPath>gov/nasa/jpl/oodt/cas/crawl/comparator</targetPath>
+        <targetPath>org/apache/oodt/cas/crawl/comparator</targetPath>
         <directory>${basedir}/src/main/resources</directory>
         <includes>
           <include>precondition-beans.xml</include>
@@ -101,29 +118,24 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-commons</artifactId>
-      <version>1.1.1</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${oodt.version}</version>
     </dependency>    
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
+      <groupId>org.apache.oodt</groupId>
       <artifactId>cas-metadata</artifactId>
-      <version>1.6.1</version>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-filemgr</artifactId>
-      <version>1.7.2</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>filemgr</artifactId>
+      <version>1.9.0-dev</version>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-workflow</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>edm-commons</artifactId>
-      <version>2.2.11-dev</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>workflow</artifactId>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
       <groupId>apache</groupId>

Modified: incubator/oodt/trunk/crawler/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/assembly/assembly.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/assembly/assembly.xml Fri Jul 16 18:27:37 2010
@@ -1,26 +1,37 @@
-<!-- 
-Copyright 2008 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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
 
-$Id$
--->
-<assembly>
-  <id>dist</id>
-  <formats>
+     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.
+-->
+<assembly>
+  <id>dist</id>
+  <formats>
     <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
+    <format>zip</format>
+  </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>  
-  <includeSiteDirectory>false</includeSiteDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>CHANGES.txt</include>
-      </includes>
+  <includeSiteDirectory>false</includeSiteDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>CHANGES.txt</include>
+      </includes>
     </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/bin</directory>
@@ -55,15 +66,15 @@ $Id$
       <includes>
         <include>*.xml</include>
       </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <unpackOptions/>
-    </dependencySet>
-  </dependencySets>
-</assembly>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <unpackOptions/>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Modified: incubator/oodt/trunk/crawler/src/main/bin/crawlctl
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/bin/crawlctl?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/bin/crawlctl (original)
+++ incubator/oodt/trunk/crawler/src/main/bin/crawlctl Fri Jul 16 18:27:37 2010
@@ -1,6 +1,18 @@
 #!/bin/sh
-# Copyright 2006 California Institute of Technology. ALL RIGHTS RESERVED.
-# U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt 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.    
 ##########################################################################
 
-java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib gov.nasa.jpl.oodt.cas.crawl.daemon.CrawlDaemonController $*
+java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib org.apache.oodt.cas.crawl.daemon.CrawlDaemonController $*

Modified: incubator/oodt/trunk/crawler/src/main/bin/crawler_launcher
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/bin/crawler_launcher?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/bin/crawler_launcher (original)
+++ incubator/oodt/trunk/crawler/src/main/bin/crawler_launcher Fri Jul 16 18:27:37 2010
@@ -1,6 +1,18 @@
 #!/bin/sh
-# Copyright 2008 California Institute of Technology. ALL RIGHTS RESERVED.
-# U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt 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.    
 ##########################################################################
 
-java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib gov.nasa.jpl.oodt.cas.crawl.CrawlerLauncher $*
\ No newline at end of file
+java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib org.apache.oodt.cas.crawl.CrawlerLauncher $*

Modified: incubator/oodt/trunk/crawler/src/main/resources/action-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/action-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/action-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/action-beans.xml Fri Jul 16 18:27:37 2010
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright 2008 California Institute of Technology. ALL RIGHTS
-    RESERVED. U.S. Government Sponsorship acknowledged.
-    
-    $Id$
-    
-    Author: bfoster
-    Description: The configuration for cas-crawler2, that uses the Spring
-    framework to configure crawlers, and crawler actions.
-    
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     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="gov.nasa.jpl.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
+    <bean class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
     
     <!-- Crawler Actions -->
     
-    <bean id="DeleteDataFile" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
+    <bean id="DeleteDataFile" lazy-init="true" class="org.apache.oodt.cas.crawl.action.DeleteFile">
         <property name="description" value="Deletes the current data file"/>
         <property name="phases">
             <list>
@@ -27,7 +32,7 @@
         </property>
     </bean>
     
-    <bean id="DeletePushpullMetFile" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
+    <bean id="DeletePushpullMetFile" lazy-init="true" class="org.apache.oodt.cas.crawl.action.DeleteFile">
         <property name="description" value="Deletes the push-pull metadata file for the current data file"/>
         <property name="phases">
             <list>
@@ -36,7 +41,7 @@
         </property>
     </bean>
     
-    <bean id="DeleteMetadataFile" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
+    <bean id="DeleteMetadataFile" lazy-init="true" class="org.apache.oodt.cas.crawl.action.DeleteFile">
         <property name="description" value="Deletes the metadata file for the current data file"/>
         <property name="phases">
             <list>
@@ -45,7 +50,7 @@
         </property>
     </bean>
     
-    <bean id="MovePushpullMetFileToBackupDir" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
+    <bean id="MovePushpullMetFileToBackupDir" lazy-init="true" class="org.apache.oodt.cas.crawl.action.MoveFile">
         <property name="description" value="Moves the push-pull metadata file for the current data file to success directory"/>
         <property name="createToDir" value="true"/>
         <property name="phases">
@@ -55,7 +60,7 @@
         </property>
     </bean>
     
-    <bean id="MoveMetadataToBackupDir" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
+    <bean id="MoveMetadataToBackupDir" lazy-init="true" class="org.apache.oodt.cas.crawl.action.MoveFile">
         <property name="description" value="Moves the metadata file for the current data file to success directory"/>        
         <property name="createToDir" value="true"/>
         <property name="phases">
@@ -65,7 +70,7 @@
         </property>
     </bean>
     
-    <bean id="UpdateWorkflowStatusToIngest" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.WorkflowMgrStatusUpdate">
+    <bean id="UpdateWorkflowStatusToIngest" lazy-init="true" class="org.apache.oodt.cas.crawl.action.WorkflowMgrStatusUpdate">
         <property name="description" value="Updates the current data files workflow status to Ingest"/>
         <property name="ingestSuffix" value="Ingest"/>        
         <property name="phases">
@@ -75,7 +80,7 @@
         </property>
     </bean>
     
-    <bean id="MoveDataFileToFailureDir" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
+    <bean id="MoveDataFileToFailureDir" lazy-init="true" class="org.apache.oodt.cas.crawl.action.MoveFile">
         <property name="description" value="Moves the current data file to failure directory"/>
         <property name="createToDir" value="true"/>
         <property name="phases">
@@ -85,7 +90,7 @@
         </property>
     </bean>
     
-    <bean id="MovePushpullMetFileToFailureDir" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
+    <bean id="MovePushpullMetFileToFailureDir" lazy-init="true" class="org.apache.oodt.cas.crawl.action.MoveFile">
         <property name="description" value="Moves the push-pull metadata file for the current data file to failure directory"/>
         <property name="createToDir" value="true"/>
         <property name="phases">
@@ -95,7 +100,7 @@
         </property>
     </bean>
     
-    <bean id="MoveMetadataToFailureDir" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
+    <bean id="MoveMetadataToFailureDir" lazy-init="true" class="org.apache.oodt.cas.crawl.action.MoveFile">
         <property name="description" value="Moves the metadata file for the current data file to failure directory"/>
         <property name="createToDir" value="true"/>
         <property name="phases">
@@ -105,7 +110,7 @@
         </property>
     </bean>
     
-    <bean id="Unique" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.action.FilemgrUniquenessChecker">
+    <bean id="Unique" lazy-init="true" class="org.apache.oodt.cas.crawl.action.FilemgrUniquenessChecker">
         <property name="description" value="Checks the filemgr against the PRODUCT_NAME for the current data file to make sure it has not yet been ingested"/>
         <property name="phases">
             <list>

Modified: incubator/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/cmd-line-option-beans.xml Fri Jul 16 18:27:37 2010
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright 2008 California Institute of Technology. ALL RIGHTS
-    RESERVED. U.S. Government Sponsorship acknowledged.
-    
-    $Id$
-    
-    Author: bfoster
-    Description: The configuration for cas-crawler2, that uses the Spring
-    framework to configure crawlers, and crawler actions.
-    
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
 -->
 <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.5.xsd">
 
-    <bean class="gov.nasa.jpl.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
+    <bean class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
     
-    <bean id="crawlerId" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="crawlerId" class="org.apache.oodt.cas.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"/>        
@@ -26,7 +31,7 @@
         <property name="required" value="true"/>
     </bean>
 
-    <bean id="printSupportedActions" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="printSupportedActions" class="org.apache.oodt.cas.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"/>        
@@ -34,7 +39,7 @@
         <property name="required" value="false"/>
         <property name="performAndQuit" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionCrawlerActionInfoHandler">
+            <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"/>        
@@ -44,7 +49,7 @@
         </property>
     </bean>
     
-    <bean id="printSupportedCrawlers" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="printSupportedCrawlers" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="psc"/>
         <property name="longOption" value="printSupportedCrawlers"/>
         <property name="description" value="Prints a list of all supported ProductCrawlers"/>        
@@ -52,7 +57,7 @@
         <property name="required" value="false"/>
         <property name="performAndQuit" value="true"/>        
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionProductCrawlerInfoHandler">
+            <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"/>        
@@ -62,7 +67,7 @@
         </property>
     </bean>
     
-    <bean id="printSupportedPreconditions" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="printSupportedPreconditions" class="org.apache.oodt.cas.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"/>        
@@ -70,7 +75,7 @@
         <property name="required" value="false"/>
         <property name="performAndQuit" value="true"/>        
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionPreconditionInfoHandler">
+            <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"/>        
@@ -80,7 +85,7 @@
         </property>
     </bean>
 
-    <bean id="filemgrUrl" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="filemgrUrl" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="fm"/>
         <property name="longOption" value="filemgrUrl"/>
         <property name="description" value="File Manager URL"/>        
@@ -88,21 +93,21 @@
         <property name="optionArgName" value="url"/>
         <property name="required" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="Unique"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AprioriUniquessCheckWithFilemgr"/>                 
+                        <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"/>                 
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+                <bean class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
                     <property name="allowedArgs">
                         <list>
                             <value>http://.*:\d*</value>
@@ -113,7 +118,7 @@
         </property>
     </bean>
 
-    <bean id="failureDir" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="failureDir" class="org.apache.oodt.cas.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"/>
@@ -122,7 +127,7 @@
         <property name="required" value="true"/>
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="actionIds"/>
                     <property name="requireAllValues" value="false"/>                            
                     <property name="optionValues">
@@ -136,24 +141,24 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MoveMetadataToFailureDir" p:methodName="setToDir"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setToDir"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MoveDataFileToFailureDir" p:methodName="setToDir"/>            
+                        <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"/>            
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="successDir" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="successDir" class="org.apache.oodt.cas.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"/>
@@ -162,7 +167,7 @@
         <property name="required" value="true"/>
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="actionIds"/>
                     <property name="requireAllValues" value="false"/>                            
                     <property name="optionValues">
@@ -175,23 +180,23 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setToDir"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MoveMetadataToBackupDir" p:methodName="setToDir"/>
+                        <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"/>
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="workflowMgrUrl" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="workflowMgrUrl" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="wm"/>
         <property name="longOption" value="workflowMgrUrl"/>
         <property name="description" value="Workflow Manager URL"/>
@@ -200,7 +205,7 @@
         <property name="required" value="true"/>
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="actionIds"/>
                     <property name="requireAllValues" value="false"/>                            
                     <property name="optionValues">
@@ -212,17 +217,17 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="UpdateWorkflowStatusToIngest"/>
+                        <bean class="org.apache.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="UpdateWorkflowStatusToIngest"/>
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+                <bean class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
                     <property name="allowedArgs">
                         <list>
                             <value>http://.*:\d*</value>
@@ -233,7 +238,7 @@
         </property>
     </bean>
     
-    <bean id="clientTransferer" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="clientTransferer" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="ct"/>
         <property name="longOption" value="clientTransferer"/>
         <property name="description" value="File Manager data transferer factory class"/>      
@@ -241,24 +246,24 @@
         <property name="optionArgName" value="class"/>
         <property name="required" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>
+                        <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"/>
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="requiredMetadata" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="requiredMetadata" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="rqm"/>
         <property name="longOption" value="requiredMetadata"/>
         <property name="description" value="Metadata required for ingest to take place"/>    
@@ -267,19 +272,19 @@
         <property name="required" value="false"/>
         <property name="type" value="java.util.List"/>        
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>         
+                        <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"/>         
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="actionIds" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="actionIds" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="ais"/>
         <property name="longOption" value="actionIds"/>
         <property name="description" value="CrawlerActions that should be performed"/>      
@@ -288,19 +293,19 @@
         <property name="required" value="false"/>
         <property name="type" value="java.util.List"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>          
+                        <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"/>          
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="preCondIds" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="preCondIds" class="org.apache.oodt.cas.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"/>      
@@ -309,74 +314,74 @@
         <property name="required" value="false"/>
         <property name="type" value="java.util.List"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
+                        <bean class="org.apache.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="noRecur" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="noRecur" class="org.apache.oodt.cas.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="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>               
+                        <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"/>               
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="crawlForDirs" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="crawlForDirs" class="org.apache.oodt.cas.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="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>                  
+                        <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"/>                  
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="skipIngest" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="skipIngest" class="org.apache.oodt.cas.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="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>                  
+                        <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"/>                  
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="daemonPort" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="daemonPort" class="org.apache.oodt.cas.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"/>   
@@ -385,19 +390,19 @@
         <property name="required" value="false"/>  
         <property name="type" value="int"/>        
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>            
+                        <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"/>            
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+                <bean class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
                     <property name="allowedArgs">
                         <list>
                             <value>\d*</value>
@@ -408,7 +413,7 @@
         </property>
     </bean>
     
-    <bean id="daemonWait" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="daemonWait" class="org.apache.oodt.cas.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"/>
@@ -417,19 +422,19 @@
         <property name="required" value="false"/>
         <property name="type" value="int"/>        
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>               
+                        <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"/>               
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
+                <bean class="org.apache.oodt.cas.commons.option.validator.ArgRegExpCmdLineOptionValidator">
                     <property name="allowedArgs">
                         <list>
                             <value>\d*</value>
@@ -440,7 +445,7 @@
         </property>
     </bean>
     
-    <bean id="productPath" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="productPath" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="pp"/>
         <property name="longOption" value="productPath"/>
         <property name="description" value="Root directory to crawl"/> 
@@ -448,24 +453,24 @@
         <property name="optionArgName" value="directory"/>
         <property name="required" value="true"/>  
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>                   
+                        <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"/>                   
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="metFileExtension" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="metFileExtension" class="org.apache.oodt.cas.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"/>  
@@ -474,7 +479,7 @@
         <property name="required" value="true"/>
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="crawlerId"/>
                     <property name="requireAllValues" value="true"/>                            
                     <property name="optionValues">
@@ -483,7 +488,7 @@
                         </list>
                     </property>                                                  
                 </bean>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="actionIds"/>
                     <property name="requireAllValues" value="false"/>                            
                     <property name="optionValues">
@@ -497,20 +502,20 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="StdProductCrawler"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="DeleteMetadataFile" p:methodName="setFileExtension"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MoveMetadataToBackupDir" p:methodName="setFileExtension"/>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MoveMetadataToFailureDir" p:methodName="setFileExtension"/> 
+                        <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"/> 
                     </list>
                 </property>
             </bean>
         </property>
     </bean>
     
-    <bean id="metExtractor" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="metExtractor" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="mx"/>
         <property name="longOption" value="metExtractor"/>
         <property name="description" value="Metadata extractor class to use"/>     
@@ -519,7 +524,7 @@
         <property name="required" value="true"/>  
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="crawlerId"/>
                     <property name="requireAllValues" value="true"/>                            
                     <property name="optionValues">
@@ -531,22 +536,22 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
+                        <bean class="org.apache.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.ClassExistsCmdLineOptionValidator"/>
             </list>
         </property>    
     </bean>
     
-    <bean id="metExtractorConfig" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="metExtractorConfig" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="mxc"/>
         <property name="longOption" value="metExtractorConfig"/>
         <property name="description" value="Config file for metadata extractor"/> 
@@ -555,7 +560,7 @@
         <property name="required" value="true"/>  
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="crawlerId"/>
                     <property name="requireAllValues" value="true"/>                            
                     <property name="optionValues">
@@ -567,22 +572,22 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
+                        <bean class="org.apache.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MetExtractorProductCrawler"/>
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="mimeExtractorRepo" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="mimeExtractorRepo" class="org.apache.oodt.cas.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"/> 
@@ -591,7 +596,7 @@
         <property name="required" value="true"/>
         <property name="requiredOptions">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.required.RequiredOption">
+                <bean class="org.apache.oodt.cas.commons.option.required.RequiredOption">
                     <property name="optionLongName" value="crawlerId"/>
                     <property name="requireAllValues" value="true"/>                            
                     <property name="optionValues">
@@ -603,22 +608,22 @@
             </list>
         </property>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>                   
+                        <bean class="org.apache.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="AutoDetectProductCrawler"/>                   
                     </list>
                 </property>
             </bean>
         </property>
         <property name="validators">
             <list>
-                <bean class="gov.nasa.jpl.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
+                <bean class="org.apache.oodt.cas.commons.option.validator.FileExistCmdLineOptionValidator"/>
             </list>
         </property>
     </bean>
     
-    <bean id="pushpullMetFileExtension" class="gov.nasa.jpl.oodt.cas.commons.option.CmdLineOption">
+    <bean id="pushpullMetFileExtension" class="org.apache.oodt.cas.commons.option.CmdLineOption">
         <property name="shortOption" value="ppmfx"/>
         <property name="longOption" value="pushpullMetFileExtension"/>
         <property name="description" value="File extension of push-pull metadata files"/>  
@@ -626,13 +631,13 @@
         <property name="optionArgName" value="file extension"/>
         <property name="required" value="false"/>  
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
+            <bean class="org.apache.oodt.cas.commons.option.handler.CmdLineOptionBeanHandler">
                 <property name="applyToBeans">
                     <list>
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="DeletePushpullMetFile" p:methodName="setFileExtension"/>                   
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MovePushpullMetFileToBackupDir" p:methodName="setFileExtension"/>                   
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="MovePushpullMetFileToFailureDir" p:methodName="setFileExtension"/>                   
-                        <bean class="gov.nasa.jpl.oodt.cas.commons.option.handler.BeanInfo" p:bean-ref="CheckThatPushPullMetFileExists" p:methodName="setFileExtension"/>
+                        <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"/>
                     </list>
                 </property>
             </bean>

Modified: incubator/oodt/trunk/crawler/src/main/resources/crawler-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/crawler-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/crawler-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/crawler-beans.xml Fri Jul 16 18:27:37 2010
@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright 2008 California Institute of Technology. ALL RIGHTS
-    RESERVED. U.S. Government Sponsorship acknowledged.
-    
-    $Id$
-    
-    Author: bfoster
-    Description: The configuration for cas-crawler2, that uses the Spring
-    framework to configure crawlers, and crawler actions.
-    
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     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="gov.nasa.jpl.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
+    <bean class="org.apache.oodt.cas.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
     
     <!-- Product Crawlers -->
     
-    <bean id="StdProductCrawler" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.StdProductCrawler">
+    <bean id="StdProductCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.StdProductCrawler">
         <description>Ingests data files based on existing metadata files</description>
     </bean>
     
-    <bean id="MetExtractorProductCrawler" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.MetExtractorProductCrawler">
+    <bean id="MetExtractorProductCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.MetExtractorProductCrawler">
         <description>Ingests data files after generating a metadat file for it with a given metadata extractor</description>
     </bean>
     
-    <bean id="AutoDetectProductCrawler" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.AutoDetectProductCrawler">
+    <bean id="AutoDetectProductCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.AutoDetectProductCrawler">
         <description>Ingests data files based on existing metadata files choosing metadata extractors based on mimetypes given in specified mimetype xml file</description>
     </bean>
     

Modified: incubator/oodt/trunk/crawler/src/main/resources/crawler-config.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/crawler-config.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/crawler-config.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/crawler-config.xml Fri Jul 16 18:27:37 2010
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright 2008 California Institute of Technology. ALL RIGHTS
-    RESERVED. U.S. Government Sponsorship acknowledged.
-    
-    $Id$
-    
-    Author: bfoster
-    Description: The configuration for cas-crawler2, that uses the Spring
-    framework to configure crawlers, and crawler actions.
-    
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/action-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/action-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/action-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/action-beans.xml Fri Jul 16 18:27:37 2010
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright 2008 California Institute of Technology. ALL RIGHTS
-    RESERVED. U.S. Government Sponsorship acknowledged.
-    
-    $Id$
-    
-    Author: bfoster
-    Description: The configuration for cas-crawler2, that uses the Spring
-    framework to configure crawlers, and crawler actions.
-    
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt 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.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
@@ -17,9 +22,9 @@
     <import resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/config/crawler-bean-properties.xml"/>    
     
     <!-- Crawler Actions -->
-    <bean id="CrawlerAction" abstract="true" class="gov.nasa.jpl.oodt.cas.crawl.action.CrawlerAction"/>
+    <bean id="CrawlerAction" abstract="true" class="org.apache.oodt.cas.crawl.action.CrawlerAction"/>
     
-    <bean id="DeleteDataFile" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
+    <bean id="DeleteDataFile" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.DeleteFile">
         <property name="description" value="Deletes the current data file"/>
         <property name="phases">
             <list>
@@ -28,9 +33,9 @@
         </property>
     </bean>
     
-    <bean id="DeletePushpullMetFile" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
-        <property name="description" value="Deletes the push-pull metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}"/>        
+    <bean id="DeletePushpullMetFile" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.DeleteFile">
+        <property name="description" value="Deletes the push-pull metadata file (default: *.${org.apache.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file"/>
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.pushpullMetFileExtension}"/>        
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
@@ -38,9 +43,9 @@
         </property>
     </bean>
     
-    <bean id="DeleteMetadataFile" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile">
-        <property name="description" value="Deletes the metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}) for the current data file"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}"/>    
+    <bean id="DeleteMetadataFile" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.DeleteFile">
+        <property name="description" value="Deletes the metadata file (default: *.${org.apache.oodt.cas.crawl.metFileExtension}) for the current data file"/>
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.metFileExtension}"/>    
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
@@ -48,11 +53,11 @@
         </property>
     </bean>
     
-    <bean id="MovePushpullMetFileToBackupDir" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
-        <property name="description" value="Moves the push-pull metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file to success directory (default: ${gov.nasa.jpl.oodt.cas.crawl.successDir})"/>
-        <property name="toDir" value="${gov.nasa.jpl.oodt.cas.crawl.successDir}"/>
+    <bean id="MovePushpullMetFileToBackupDir" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.MoveFile">
+        <property name="description" value="Moves the push-pull metadata file (default: *.${org.apache.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file to success directory (default: ${org.apache.oodt.cas.crawl.successDir})"/>
+        <property name="toDir" value="${org.apache.oodt.cas.crawl.successDir}"/>
         <property name="createToDir" value="true"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}"/>        
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.pushpullMetFileExtension}"/>        
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
@@ -60,11 +65,11 @@
         </property>
     </bean>
     
-    <bean id="MoveMetadataToBackupDir" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
-        <property name="description" value="Moves the metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}) for the current data file to success directory (default: ${gov.nasa.jpl.oodt.cas.crawl.successDir})"/>        
-        <property name="toDir" value="${gov.nasa.jpl.oodt.cas.crawl.successDir}"/>
+    <bean id="MoveMetadataToBackupDir" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.MoveFile">
+        <property name="description" value="Moves the metadata file (default: *.${org.apache.oodt.cas.crawl.metFileExtension}) for the current data file to success directory (default: ${org.apache.oodt.cas.crawl.successDir})"/>        
+        <property name="toDir" value="${org.apache.oodt.cas.crawl.successDir}"/>
         <property name="createToDir" value="true"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}"/>        
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.metFileExtension}"/>        
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
@@ -72,9 +77,9 @@
         </property>
     </bean>
     
-    <bean id="UpdateWorkflowStatusToIngest" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.WorkflowMgrStatusUpdate">
+    <bean id="UpdateWorkflowStatusToIngest" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.WorkflowMgrStatusUpdate">
         <property name="description" value="Updates the current data files workflow status to Ingest"/>
-        <property name="workflowMgrUrl" value="${gov.nasa.jpl.oodt.cas.crawl.workflowMgrUrl}"/>
+        <property name="workflowMgrUrl" value="${org.apache.oodt.cas.crawl.workflowMgrUrl}"/>
         <property name="ingestSuffix" value="Ingest"/>        
         <property name="phases">
             <list>
@@ -83,9 +88,9 @@
         </property>
     </bean>
     
-    <bean id="MoveDataFileToFailureDir" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
-        <property name="description" value="Moves the current data file to failure directory (default: ${gov.nasa.jpl.oodt.cas.crawl.failureDir})"/>
-        <property name="toDir" value="${gov.nasa.jpl.oodt.cas.crawl.failureDir}"/>
+    <bean id="MoveDataFileToFailureDir" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.MoveFile">
+        <property name="description" value="Moves the current data file to failure directory (default: ${org.apache.oodt.cas.crawl.failureDir})"/>
+        <property name="toDir" value="${org.apache.oodt.cas.crawl.failureDir}"/>
         <property name="createToDir" value="true"/>
         <property name="phases">
             <list>
@@ -94,11 +99,11 @@
         </property>
     </bean>
     
-    <bean id="MovePushpullMetFileToFailureDir" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
-        <property name="description" value="Moves the push-pull metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file to failure directory (default: ${gov.nasa.jpl.oodt.cas.crawl.failureDir})"/>
-        <property name="toDir" value="${gov.nasa.jpl.oodt.cas.crawl.failureDir}"/>
+    <bean id="MovePushpullMetFileToFailureDir" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.MoveFile">
+        <property name="description" value="Moves the push-pull metadata file (default: *.${org.apache.oodt.cas.crawl.pushpullMetFileExtension}) for the current data file to failure directory (default: ${org.apache.oodt.cas.crawl.failureDir})"/>
+        <property name="toDir" value="${org.apache.oodt.cas.crawl.failureDir}"/>
         <property name="createToDir" value="true"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}"/>        
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.pushpullMetFileExtension}"/>        
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestFailure</value>
@@ -106,11 +111,11 @@
         </property>
     </bean>
     
-    <bean id="MoveMetadataToFailureDir" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.MoveFile">
-        <property name="description" value="Moves the metadata file (default: *.${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}) for the current data file to failure directory (default: ${gov.nasa.jpl.oodt.cas.crawl.failureDir})"/>
-        <property name="toDir" value="${gov.nasa.jpl.oodt.cas.crawl.failureDir}"/>
+    <bean id="MoveMetadataToFailureDir" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.MoveFile">
+        <property name="description" value="Moves the metadata file (default: *.${org.apache.oodt.cas.crawl.metFileExtension}) for the current data file to failure directory (default: ${org.apache.oodt.cas.crawl.failureDir})"/>
+        <property name="toDir" value="${org.apache.oodt.cas.crawl.failureDir}"/>
         <property name="createToDir" value="true"/>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}"/>        
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.metFileExtension}"/>        
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestFailure</value>
@@ -118,9 +123,9 @@
         </property>
     </bean>
     
-    <bean id="Unique" lazy-init="true" parent="CrawlerAction" class="gov.nasa.jpl.oodt.cas.crawl.action.FilemgrUniquenessChecker">
+    <bean id="Unique" lazy-init="true" parent="CrawlerAction" class="org.apache.oodt.cas.crawl.action.FilemgrUniquenessChecker">
         <property name="description" value="Checks the filemgr against the PRODUCT_NAME for the current data file to make sure it has not yet been ingested"/>
-        <property name="filemgrUrl" value="${gov.nasa.jpl.oodt.cas.crawl.filemgrUrl}"/>
+        <property name="filemgrUrl" value="${org.apache.oodt.cas.crawl.filemgrUrl}"/>
         <property name="phases">
             <list>
                 <value type="java.lang.String">preIngest</value>



Mime
View raw message