You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ke...@apache.org on 2010/07/16 20:27:38 UTC

svn commit: r964894 [2/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...

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/cmd-line-option-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/cmd-line-option-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/cmd-line-option-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/cmd-line-option-beans.xml Fri Jul 16 18:27:37 2010
@@ -1,20 +1,25 @@
 <?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 id="filemgrUrl" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="filemgrUrl" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="fm"/>
         <property name="longOption" value="filemgrUrl"/>
         <property name="description" value="File Manager URL"/>        
@@ -22,11 +27,11 @@
         <property name="optionArgName" value="url"/>
         <property name="required" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
         </property>
     </bean>
 
-    <bean id="failureDir" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="failureDir" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="fd"/>
         <property name="longOption" value="failureDir"/>
         <property name="description" value="Directory where files will be moved on failure"/>
@@ -34,11 +39,11 @@
         <property name="optionArgName" value="directory"/>
         <property name="required" value="false"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>            
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>            
         </property>
     </bean>
     
-    <bean id="successDir" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="successDir" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="sd"/>
         <property name="longOption" value="successDir"/>
         <property name="description" value="Directory where files will be moved on success"/>
@@ -46,11 +51,11 @@
         <property name="optionArgName" value="directory"/>
         <property name="required" value="false"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
         </property>
     </bean>
     
-    <bean id="workflowMgrUrl" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="workflowMgrUrl" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="wm"/>
         <property name="longOption" value="workflowMgrUrl"/>
         <property name="description" value="Workflow Manager URL"/>
@@ -58,11 +63,11 @@
         <property name="optionArgName" value="url"/>
         <property name="required" value="false"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
         </property>
     </bean>
     
-    <bean id="clientTransferer" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="clientTransferer" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="ct"/>
         <property name="longOption" value="clientTransferer"/>
         <property name="description" value="File Manager data transferer factory class"/>      
@@ -70,11 +75,11 @@
         <property name="optionArgName" value="class"/>
         <property name="required" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
         </property>
     </bean>
     
-    <bean id="requiredMetadata" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="requiredMetadata" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="rqm"/>
         <property name="longOption" value="requiredMetadata"/>
         <property name="description" value="Metadata required for ingest to take place"/>    
@@ -82,7 +87,7 @@
         <property name="optionArgName" value="class"/>
         <property name="required" value="true"/>
         <property name="handler">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
+            <bean class="org.apache.oodt.cas.crawl.option.CmdLineOptionJavaPropHandler"/>
         </property>
     </bean>
     
@@ -90,7 +95,7 @@
         
         
     
-    <bean id="requiredMetadata" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="requiredMetadata" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="rqm"/>
         <property name="description" value="Metadata required for ingest to take place - commas separated with no spaces"/>    
         <property name="crawlersAffected">
@@ -106,7 +111,7 @@
         <property name="required" value="false"/>  
     </bean>  
     
-    <bean id="actionIds" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="actionIds" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="ais"/>
         <property name="description" value="CrawlerActions that should be performed - commas separated with no spaces"/>      
         <property name="crawlersAffected">
@@ -122,7 +127,7 @@
         <property name="required" value="false"/>  
     </bean>  
     
-    <bean id="noRecur" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="noRecur" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="nr"/>
         <property name="description" value="Turns off recursive crawling - will only process files in productPath directory"/>     
         <property name="crawlersAffected">
@@ -137,7 +142,7 @@
         <property name="required" value="false"/>  
     </bean>      
     
-    <bean id="crawlForDirs" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="crawlForDirs" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="cfd"/>
         <property name="description" value="Will crawl for directories instead of files"/>
         <property name="crawlersAffected">
@@ -152,7 +157,7 @@
         <property name="required" value="false"/>  
     </bean>  
     
-    <bean id="daemonPort" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="daemonPort" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="dp"/>
         <property name="description" value="Cause crawler to become a daemon with a XML-RPC webserver started on the given port number"/>   
         <property name="crawlersAffected">
@@ -168,7 +173,7 @@
         <property name="required" value="false"/>  
     </bean>  
     
-    <bean id="daemonWait" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="daemonWait" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="dw"/>
         <property name="description" value="Cause crawler to become a daemon and sleep for given number of seconds between crawls"/>
         <property name="crawlersAffected">
@@ -184,7 +189,7 @@
         <property name="required" value="false"/>  
     </bean>  
 
-    <bean id="productPath" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="productPath" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="pp"/>
         <property name="description" value="Root directory to crawl"/> 
         <property name="crawlersAffected">
@@ -200,7 +205,7 @@
         <property name="required" value="true"/>  
     </bean>  
     
-    <bean id="metFileExtension" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="metFileExtension" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="mfx"/>
         <property name="description" value="The file extension of existing and to be created PCS metadata files"/>  
         <property name="crawlersAffected">
@@ -221,7 +226,7 @@
         <property name="required" value="false"/>  
     </bean>  
     
-    <bean id="metExtractor" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="metExtractor" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="mx"/>
         <property name="description" value="Metadata extractor class to use"/>     
         <property name="crawlersAffected">
@@ -235,7 +240,7 @@
         <property name="required" value="true"/>  
     </bean>  
     
-    <bean id="metExtractorConfig" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="metExtractorConfig" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="mxc"/>
         <property name="description" value="Config file for metadata extractor"/> 
         <property name="crawlersAffected">
@@ -249,7 +254,7 @@
         <property name="required" value="true"/>  
     </bean>
 
-    <bean id="mimeExtractorRepo" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="mimeExtractorRepo" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="mxr"/>
         <property name="description" value="Mime-type to metadata extractor mapping xml file"/> 
         <property name="crawlersAffected">
@@ -263,7 +268,7 @@
         <property name="required" value="true"/>  
     </bean>
     
-    <bean id="pushpullMetFileExtension" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOption">
+    <bean id="pushpullMetFileExtension" class="org.apache.oodt.cas.crawl.option.CmdLineOption">
         <property name="shortOption" value="ppmfx"/>
         <property name="description" value="File extension of push-pull metadata files"/>  
         <property name="crawlerActionsAffected">
@@ -284,7 +289,7 @@
         <property name="required" value="false"/>  
     </bean>
     
-    <bean id="DaemonGroup" class="gov.nasa.jpl.oodt.cas.crawl.option.CmdLineOptionsGroup">
+    <bean id="DaemonGroup" class="org.apache.oodt.cas.crawl.option.CmdLineOptionsGroup">
         <property name="name" value="DaemonGroup"/>        
         <property name="description" value="Both required to make crawler a daemon"/>
         <property name="options">
@@ -295,4 +300,4 @@
         </property>
     </bean>-->
 
-</beans>
\ No newline at end of file
+</beans>

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-bean-properties.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-bean-properties.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-bean-properties.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-bean-properties.xml Fri Jul 16 18:27:37 2010
@@ -1,20 +1,25 @@
 <?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.crawl.util.CasPropertyPlaceholderConfigurer">
+    <bean class="org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer">
         
         <!-- Allow for system-level properties to override all properties below -->
         <property name="systemPropertiesMode" value="2"/>
@@ -22,23 +27,23 @@
         <!-- Default Properties -->
         <property name="properties">
             <props>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.failureDir">./failureDir</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.successDir">./successDir</prop>                
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.workflowMgrUrl">http://localhost:9001</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.filemgrUrl">http://localhost:9000</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.clientTransferer">gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory</prop>       
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.requiredMetadata"></prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.actionIds"></prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.noRecur">false</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.crawlForDirs">false</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.daemonPort">-1</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.daemonWait">-1</prop>     
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.productPath"></prop>                
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.metFileExtension">cas</prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.metExtractor"></prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.metExtractorConfig"></prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.mimeExtractorRepo"></prop>
-                <prop key="gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension">info.tmp</prop>                
+                <prop key="org.apache.oodt.cas.crawl.failureDir">./failureDir</prop>
+                <prop key="org.apache.oodt.cas.crawl.successDir">./successDir</prop>                
+                <prop key="org.apache.oodt.cas.crawl.workflowMgrUrl">http://localhost:9001</prop>
+                <prop key="org.apache.oodt.cas.crawl.filemgrUrl">http://localhost:9000</prop>
+                <prop key="org.apache.oodt.cas.crawl.clientTransferer">org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory</prop>       
+                <prop key="org.apache.oodt.cas.crawl.requiredMetadata"></prop>
+                <prop key="org.apache.oodt.cas.crawl.actionIds"></prop>
+                <prop key="org.apache.oodt.cas.crawl.noRecur">false</prop>
+                <prop key="org.apache.oodt.cas.crawl.crawlForDirs">false</prop>
+                <prop key="org.apache.oodt.cas.crawl.daemonPort">-1</prop>
+                <prop key="org.apache.oodt.cas.crawl.daemonWait">-1</prop>     
+                <prop key="org.apache.oodt.cas.crawl.productPath"></prop>                
+                <prop key="org.apache.oodt.cas.crawl.metFileExtension">cas</prop>
+                <prop key="org.apache.oodt.cas.crawl.metExtractor"></prop>
+                <prop key="org.apache.oodt.cas.crawl.metExtractorConfig"></prop>
+                <prop key="org.apache.oodt.cas.crawl.mimeExtractorRepo"></prop>
+                <prop key="org.apache.oodt.cas.crawl.pushpullMetFileExtension">info.tmp</prop>                
             </props>
         </property>
         
@@ -46,4 +51,4 @@
         <property name="location" value="/gov/nasa/jpl/oodt/cas/crawl/crawler.properties"/>
     </bean>
     
-</beans>
\ No newline at end of file
+</beans>

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler-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,40 +22,40 @@
     <import resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/config/crawler-bean-properties.xml"/>
     
     <!-- Product Crawlers -->
-    <bean id="ProductCrawler" abstract="true" class="gov.nasa.jpl.oodt.cas.crawl.ProductCrawler">
-        <property name="filemgrUrl" value="${gov.nasa.jpl.oodt.cas.crawl.filemgrUrl}"/>
-        <property name="clientTransferer" value="${gov.nasa.jpl.oodt.cas.crawl.clientTransferer}"/>  
-        <property name="noRecur" value="${gov.nasa.jpl.oodt.cas.crawl.noRecur}"/>
-        <property name="crawlForDirs" value="${gov.nasa.jpl.oodt.cas.crawl.crawlForDirs}"/>      
-        <property name="daemonPort" value="${gov.nasa.jpl.oodt.cas.crawl.daemonPort}"/>
-        <property name="daemonWait" value="${gov.nasa.jpl.oodt.cas.crawl.daemonWait}"/>
-        <property name="productPath" value="${gov.nasa.jpl.oodt.cas.crawl.productPath}"/>
+    <bean id="ProductCrawler" abstract="true" class="org.apache.oodt.cas.crawl.ProductCrawler">
+        <property name="filemgrUrl" value="${org.apache.oodt.cas.crawl.filemgrUrl}"/>
+        <property name="clientTransferer" value="${org.apache.oodt.cas.crawl.clientTransferer}"/>  
+        <property name="noRecur" value="${org.apache.oodt.cas.crawl.noRecur}"/>
+        <property name="crawlForDirs" value="${org.apache.oodt.cas.crawl.crawlForDirs}"/>      
+        <property name="daemonPort" value="${org.apache.oodt.cas.crawl.daemonPort}"/>
+        <property name="daemonWait" value="${org.apache.oodt.cas.crawl.daemonWait}"/>
+        <property name="productPath" value="${org.apache.oodt.cas.crawl.productPath}"/>
         <property name="requiredMetadata">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.util.CasPropertyList">
-                <property name="values" value="${gov.nasa.jpl.oodt.cas.crawl.requiredMetadata}"/>
+            <bean class="org.apache.oodt.cas.crawl.util.CasPropertyList">
+                <property name="values" value="${org.apache.oodt.cas.crawl.requiredMetadata}"/>
             </bean>
         </property>
         <property name="actionIds">
-            <bean class="gov.nasa.jpl.oodt.cas.crawl.util.CasPropertyList">
-                <property name="values" value="${gov.nasa.jpl.oodt.cas.crawl.actionIds}"/>
+            <bean class="org.apache.oodt.cas.crawl.util.CasPropertyList">
+                <property name="values" value="${org.apache.oodt.cas.crawl.actionIds}"/>
             </bean>
         </property>    
     </bean>
     
-    <bean id="StdProductCrawler" lazy-init="true" parent="ProductCrawler" class="gov.nasa.jpl.oodt.cas.crawl.StdProductCrawler">
+    <bean id="StdProductCrawler" lazy-init="true" parent="ProductCrawler" class="org.apache.oodt.cas.crawl.StdProductCrawler">
         <description>Ingests data files based on existing metadata files</description>
-        <property name="metFileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.metFileExtension}"/>        
+        <property name="metFileExtension" value="${org.apache.oodt.cas.crawl.metFileExtension}"/>        
     </bean>
     
-    <bean id="MetExtractorProductCrawler" lazy-init="true" parent="ProductCrawler" class="gov.nasa.jpl.oodt.cas.crawl.MetExtractorProductCrawler">
+    <bean id="MetExtractorProductCrawler" lazy-init="true" parent="ProductCrawler" class="org.apache.oodt.cas.crawl.MetExtractorProductCrawler">
         <description>Ingests data files after generating a metadat file for it with a given metadata extractor</description>
-        <property name="metExtractor" value="${gov.nasa.jpl.oodt.cas.crawl.metExtractor}"/>
-        <property name="metExtractorConfig" value="${gov.nasa.jpl.oodt.cas.crawl.metExtractorConfig}"/>
+        <property name="metExtractor" value="${org.apache.oodt.cas.crawl.metExtractor}"/>
+        <property name="metExtractorConfig" value="${org.apache.oodt.cas.crawl.metExtractorConfig}"/>
     </bean>
     
-    <bean id="AutoDetectProductCrawler" lazy-init="true" parent="ProductCrawler" class="gov.nasa.jpl.oodt.cas.crawl.AutoDetectProductCrawler">
+    <bean id="AutoDetectProductCrawler" lazy-init="true" parent="ProductCrawler" 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>
-        <property name="mimeExtractorRepo" value="${gov.nasa.jpl.oodt.cas.crawl.mimeExtractorRepo}"/>        
+        <property name="mimeExtractorRepo" value="${org.apache.oodt.cas.crawl.mimeExtractorRepo}"/>        
     </bean>
     
-</beans>
\ No newline at end of file
+</beans>

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler.properties?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler.properties (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/crawler.properties Fri Jul 16 18:27:37 2010
@@ -1,4 +1,14 @@
-# Copyright (c) 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
 #
-# $Id$
+#     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.    

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/precondition-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/precondition-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/precondition-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/JavaPropHandlerXmlFiles/precondition-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,18 +22,18 @@
     <import resource="classpath:/gov/nasa/jpl/oodt/cas/crawl/config/crawler-bean-properties.xml"/>    
     
     <!-- Precondition Comparators -->
-    <bean id="PreconditionComparator" lazy-init="true" abstract="true" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.PreConditionComparator"/>
+    <bean id="PreconditionComparator" lazy-init="true" abstract="true" class="org.apache.oodt.cas.metadata.preconditions.PreConditionComparator"/>
     
-    <bean id="CheckThatPushPullMetFileExists" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
-        <property name="description" value="Checks if the push-pull metadata file exists for the current data file (default: *.${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension})"/>        
+    <bean id="CheckThatPushPullMetFileExists" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
+        <property name="description" value="Checks if the push-pull metadata file exists for the current data file (default: *.${org.apache.oodt.cas.crawl.pushpullMetFileExtension})"/>        
         <property name="compareItem">
             <value type="java.lang.Boolean">true</value>    
         </property>
-        <property name="fileExtension" value="${gov.nasa.jpl.oodt.cas.crawl.pushpullMetFileExtension}"/>
+        <property name="fileExtension" value="${org.apache.oodt.cas.crawl.pushpullMetFileExtension}"/>
         <property name="type" value="equal_to"/>
     </bean>
     
-    <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.FileSizeComparator">
+    <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.metadata.preconditions.FileSizeComparator">
         <property name="description" value="Check if the current data file size is greater than zero"/>        
         <property name="compareItem">
             <value type="java.lang.Long">0</value>
@@ -36,13 +41,13 @@
         <property name="type" value="greater_than"/>
     </bean>
     
-    <bean id="AprioriUniquessCheckWithFilemgr" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator">
+    <bean id="AprioriUniquessCheckWithFilemgr" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator">
         <property name="description" value="Checks where the current data file existing in the filemgr based on its FILENAME"/>        
         <property name="compareItem">
             <value type="java.lang.Boolean">false</value>
         </property>
         <property name="type" value="equal_to"/>
-        <property name="filemgrUrl" value="${gov.nasa.jpl.oodt.cas.crawl.filemgrUrl}"/>
+        <property name="filemgrUrl" value="${org.apache.oodt.cas.crawl.filemgrUrl}"/>
     </bean>
     
 </beans>

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/mime-extractor-map.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/mime-extractor-map.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/mime-extractor-map.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/mime-extractor-map.xml Fri Jul 16 18:27:37 2010
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	Copyright 2008 California Institute of Technology. ALL RIGHTS
-	RESERVED. U.S. Government Sponsorship acknowledged.
-	
-	$Id$
+<!--
+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.
 -->
 <cas:mimetypemap xmlns:cas="http://oodt.jpl.nassa.gov/1.0/cas" magic="true or false" mimeRepo="path/to/tika-mimetypes/xml/file">
 	

Modified: incubator/oodt/trunk/crawler/src/main/resources/examples/mimetypes.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/examples/mimetypes.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/examples/mimetypes.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/examples/mimetypes.xml Fri Jul 16 18:27:37 2010
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	Copyright 2008 California Institute of Technology. ALL RIGHTS
-	RESERVED. U.S. Government Sponsorship acknowledged.
-	
-	$Id$
+<!--
+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.
 -->
 <mime-info>
 	

Modified: incubator/oodt/trunk/crawler/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/logging.properties?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/logging.properties (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/logging.properties Fri Jul 16 18:27:37 2010
@@ -1,7 +1,17 @@
-# Copyright (c) 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
 #
-# $Id$
+#     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.    
 
 
 # Specify the handlers to create in the root logger
@@ -28,15 +38,15 @@ java.util.logging.FileHandler.formatter 
     
 # Set the default logging level for the subsystems
 
-gov.nasa.jpl.oodt.cas.crawl.level = ALL
+org.apache.oodt.cas.crawl.level = ALL
 
-gov.nasa.jpl.oodt.cas.crawl.action.level = ALL
+org.apache.oodt.cas.crawl.action.level = ALL
 
-gov.nasa.jpl.oodt.cas.crawl.typedetection.level = ALL
+org.apache.oodt.cas.crawl.typedetection.level = ALL
 
-gov.nasa.jpl.oodt.cas.crawl.util.level = ALL
+org.apache.oodt.cas.crawl.util.level = ALL
 
-gov.nasa.jpl.oodt.cas.crawl.config.level = ALL
+org.apache.oodt.cas.crawl.config.level = ALL
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO
@@ -49,4 +59,4 @@ org.springframework.level = WARNING
 org.springframework.beans.factory.level = WARNING
 org.springframework.beans.factory.config.level = WARNING
 org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.level = WARNING
-gov.nasa.jpl.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer.level = WARNING
\ No newline at end of file
+org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer.level = WARNING

Modified: incubator/oodt/trunk/crawler/src/main/resources/precondition-beans.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/main/resources/precondition-beans.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/main/resources/precondition-beans.xml (original)
+++ incubator/oodt/trunk/crawler/src/main/resources/precondition-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"/>    
     
     <!-- Precondition Comparators -->
     
-    <bean id="CheckThatPushPullMetFileExists" lazy-init="true" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
+    <bean id="CheckThatPushPullMetFileExists" lazy-init="true" class="org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
         <property name="description" value="Checks if the push-pull metadata file exists for the current data file"/>        
         <property name="compareItem">
             <value type="java.lang.Boolean">true</value>    
@@ -26,7 +31,7 @@
         <property name="type" value="equal_to"/>
     </bean>
     
-    <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.FileSizeComparator">
+    <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" class="org.apache.oodt.cas.metadata.preconditions.FileSizeComparator">
         <property name="description" value="Check if the current data file size is greater than zero"/>        
         <property name="compareItem">
             <value type="java.lang.Long">0</value>
@@ -34,7 +39,7 @@
         <property name="type" value="greater_than"/>
     </bean>
     
-    <bean id="AprioriUniquessCheckWithFilemgr" lazy-init="true" class="gov.nasa.jpl.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator">
+    <bean id="AprioriUniquessCheckWithFilemgr" lazy-init="true" class="org.apache.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator">
         <property name="description" value="Checks where the current data file existing in the filemgr based on its FILENAME"/>        
         <property name="compareItem">
             <value type="java.lang.Boolean">false</value>

Modified: incubator/oodt/trunk/crawler/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/site/site.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/site/site.xml (original)
+++ incubator/oodt/trunk/crawler/src/site/site.xml Fri Jul 16 18:27:37 2010
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2009 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
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
-<project name="cas-crawler" href="http://oodt.jpl.nasa.gov/cas-crawler/">
+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 name="cas-crawler">
 
   <body>
     <links>

Modified: incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml Fri Jul 16 18:27:37 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-  $Id$
+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.
 -->
-
 <document>
    <properties>
       <title>CAS Crawler User Guide</title>
@@ -375,7 +384,7 @@
                --failureDir /tmp \
                --actionIds DeleteDataFile MoveDataFileToFailureDir Unique \
                --metFileExtension met \
-               --clientTransferer gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
+               --clientTransferer org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
       </source>
 
       <p>You should see a response message at the end similar to:</p>
@@ -385,45 +394,45 @@
       log4j:WARN Please initialize the log4j system properly.
       http://localhost:9000
       StdProductCrawler
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler crawl
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler crawl
       INFO: Crawling /data/test
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler handleFile
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler handleFile
       INFO: Handling file /data/test/blah.txt
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.metadata.extractors.MetReaderExtractor extrMetadata
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.metadata.extractors.MetReaderExtractor extrMetadata
       INFO: Reading metadata from /data/test/blah.txt.met
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler ingest
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler ingest
       INFO: ProductCrawler: Ready to ingest product: [/data/test/blah.txt]: ProductType: [GenericFile]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester setFileManager
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.ingest.StdIngester setFileManager
       INFO: StdIngester: connected to file manager: [http://localhost:9000]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferer setFileManagerUrl
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferer setFileManagerUrl
       INFO: Local Data Transfer to: [http://localhost:9000] enabled
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester ingest
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.ingest.StdIngester ingest
       INFO: StdIngester: ingesting product: ProductName: [blah.txt]: ProductType: [GenericFile]: FileLocation: [/data/test/]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.versioning.VersioningUtils createBasicDataStoreRefsFlat
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.versioning.VersioningUtils createBasicDataStoreRefsFlat
       FINE: VersioningUtils: Generated data store ref: file:/Users/mattmann/files/blah.txt/blah.txt from origRef: file:/data/test/blah.txt
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManager runExtractors
-      INFO: Running Met Extractor: [gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor] for product type: [GenericFile]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManager runExtractors
-      INFO: Running Met Extractor: [gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor] for product type: [GenericFile]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalog toDoc
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.system.XmlRpcFileManager runExtractors
+      INFO: Running Met Extractor: [org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor] for product type: [GenericFile]
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.system.XmlRpcFileManager runExtractors
+      INFO: Running Met Extractor: [org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor] for product type: [GenericFile]
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.catalog.LuceneCatalog toDoc
       WARNING: No Metadata specified for product [blah.txt] for required field [DataVersion]: Attempting to continue processing metadata
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient ingestProduct
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient ingestProduct
       FINEST: File Manager Client: clientTransfer enabled: transfering product [blah.txt]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferer moveFile
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferer moveFile
       INFO: LocalDataTransfer: Moving File: file:/data/test/blah.txt to file:/Users/mattmann/files/blah.txt/blah.txt
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalog toDoc
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.catalog.LuceneCatalog toDoc
       WARNING: No Metadata specified for product [blah.txt] for required field [DataVersion]: Attempting to continue processing metadata
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler ingest
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler ingest
       INFO: Successfully ingested product: [/data/test/blah.txt]: product id: 72db4bba-658a-11de-bedb-77f2d752c436
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler handleFile
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler handleFile
       INFO: Successful ingest of product: [/data/test/blah.txt]
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler performProductCrawlerActions
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler performProductCrawlerActions
       INFO: Performing action (id = DeleteDataFile : description = Deletes the current data file)
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile performAction
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.action.DeleteFile performAction
       INFO: Deleting file /data/test/blah.txt
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler handleFile
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler handleFile
       INFO: Handling file /data/test/blah.txt.met
-      Jun 30, 2009 8:26:57 AM gov.nasa.jpl.oodt.cas.crawl.ProductCrawler handleFile
+      Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler handleFile
       WARNING: Failed to pass preconditions for ingest of product: [/data/test/blah.txt.met]
       </source>
 
@@ -464,16 +473,16 @@
        <table>
          <tr>
            <td>actions</td>
-           <td>gov.nasa.jpl.oodt.cas.crawl.action.DeleteFile<br/>
-               gov.nasa.jpl.oodt.cas.crawl.action.FilemgrUniquenessChecker<br/>
-               gov.nasa.jpl.oodt.cas.crawl.action.MimeTypeCrawlerAction<br/>
-               gov.nasa.jpl.oodt.cas.crawl.action.MoveFile<br/>
-               gov.nasa.jpl.oodt.cas.crawl.action.WorkflowMgrStatusUpdate
+           <td>org.apache.oodt.cas.crawl.action.DeleteFile<br/>
+               org.apache.oodt.cas.crawl.action.FilemgrUniquenessChecker<br/>
+               org.apache.oodt.cas.crawl.action.MimeTypeCrawlerAction<br/>
+               org.apache.oodt.cas.crawl.action.MoveFile<br/>
+               org.apache.oodt.cas.crawl.action.WorkflowMgrStatusUpdate
            </td>
          </tr>
          <tr>
            <td>preconditions</td>
-           <td>gov.nasa.jpl.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator
+           <td>org.apache.oodt.cas.crawl.comparator.FilemgrUniquenessCheckComparator
            </td>
          </tr>
        </table>
@@ -481,4 +490,4 @@
       </section>
    </body>
    
-</document>
\ No newline at end of file
+</document>

Modified: incubator/oodt/trunk/crawler/src/test/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/test/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/test/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java (original)
+++ incubator/oodt/trunk/crawler/src/test/org/apache/oodt/cas/crawl/option/TestBooleanOptions.java Fri Jul 16 18:27:37 2010
@@ -1,16 +1,26 @@
-//Copyright (c) 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
 //
-//$Id$
+//     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.
 
-package gov.nasa.jpl.oodt.cas.crawl.option;
+package org.apache.oodt.cas.crawl.option;
 
 //Junit imports
 import junit.framework.TestCase;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.crawl.MetExtractorProductCrawler;
-import gov.nasa.jpl.oodt.cas.crawl.ProductCrawler; // for javadoc
+import org.apache.oodt.cas.crawl.MetExtractorProductCrawler;
+import org.apache.oodt.cas.crawl.ProductCrawler; // for javadoc
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964894&r1=964893&r2=964894&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 18:27:37 2010
@@ -45,7 +45,7 @@ the License.
         <module>filemgr</module>
         <!-- broken: <module>catalog</module> -->
         <module>workflow</module>
-        <!-- broken: <module>crawler</module>         -->
+        <module>crawler</module>
         <module>resource</module>
         <!-- broken: <module>curator</module> -->
         <!-- broken: <module>pge</module> -->