You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by pr...@apache.org on 2012/04/30 08:22:19 UTC

svn commit: r1332066 [1/3] - in /oodt/trunk/mvn/archetypes/radix: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/crawler/src/main/resources/bin/ src/main/resources/archetype-resources/crawler/src/main/resources/policy/ src...

Author: pramirez
Date: Mon Apr 30 06:22:18 2012
New Revision: 1332066

URL: http://svn.apache.org/viewvc?rev=1332066&view=rev
Log:
Bring RADiX up to date with latest cmd line options and add in fmprod and pcs services.

Added:
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler-launcher
      - copied, changed from r1202962, oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/cmd-line-actions.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/policy/cmd-line-options.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/pom.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/resources/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/resources/rdfconf.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/resources/rssconf.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/webapp/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/webapp/META-INF/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/fmprod/src/main/webapp/META-INF/context.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/pom.xml   (with props)
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/src/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/src/main/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/src/main/webapp/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/src/main/webapp/META-INF/
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pcs-services/src/main/webapp/META-INF/context.xml   (with props)
Removed:
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-option-beans.xml
Modified:
    oodt/trunk/mvn/archetypes/radix/pom.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawlctl
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/action-beans.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/crawler-config.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/precondition-beans.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr-client
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client
    oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties

Modified: oodt/trunk/mvn/archetypes/radix/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/pom.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/pom.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/pom.xml Mon Apr 30 06:22:18 2012
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.oodt</groupId>
   <artifactId>radix-archetype</artifactId>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.4-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>RADiX Distribution of OODT</name>

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Apr 30 06:22:18 2012
@@ -44,12 +44,6 @@
       </fileSets>
     </module>
     <module id="webapps" dir="webapps" name="webapps">
-      <!--<fileSets>
-        <fileSet>
-          <directory></directory>
-          <includes/>
-        </fileSet>
-      </fileSets>-->
       <modules>
         <module id="opsui" dir="opsui" name="opsui">
           <fileSets>
@@ -59,6 +53,22 @@
             </fileSet>
           </fileSets>
         </module>
+        <module id="pcs-services" dir="pcs-services" name="pcs-services">
+          <fileSets>
+            <fileSet>
+              <directory></directory>
+              <includes/>
+            </fileSet>
+          </fileSets>
+        </module>
+        <module id="fmprod" dir="fmprod" name="fmprod">
+          <fileSets>
+            <fileSet>
+              <directory></directory>
+              <includes/>
+            </fileSet>
+          </fileSets>
+        </module>
       </modules>
     </module>
   </modules>

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawlctl
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawlctl?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawlctl (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawlctl Mon Apr 30 06:22:18 2012
@@ -15,4 +15,4 @@
 # under the License.    
 ##########################################################################
 
-java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib org.apache.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 $@

Copied: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler-launcher (from r1202962, oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher)
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler-launcher?p2=oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler-launcher&p1=oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher&r1=1202962&r2=1332066&rev=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler-launcher Mon Apr 30 06:22:18 2012
@@ -1,21 +1,76 @@
 #!/bin/sh
+
 # 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
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.    
-##########################################################################
-
-java -Dorg.apache.oodt.cas.crawl.bean.repo=file:./../policy/crawler-config.xml \
-     -Dorg.apache.oodt.cas.filemgr.properties=../../filemgr/etc/filemgr.properties \
-     -Djava.util.logging.config.file=../etc/logging.properties \
-     -Djava.ext.dirs=../lib org.apache.oodt.cas.crawl.CrawlerLauncher $*
+# 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.
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set OODT_HOME if not already set
+[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/../.." ; pwd`
+
+# Get OODT environment set up
+if [ -r "$OODT_HOME"/bin/env.sh ]; then
+  . "$OODT_HOME"/bin/env.sh
+fi
+
+# Only set CRAWLER_HOME if not already set
+if [ -z "$CRAWLER_HOME" ]; then
+  CRAWLER_HOME="$OODT_HOME"/crawler
+  export CRAWLER_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+  [ -n "$OODT_HOME" ] && OODT_HOME=`cygpath --unix "$OODT_HOME"`
+  [ -n "$CRAWLER_HOME" ] && CRAWLER_HOME=`cygpath --unix "$CRAWLER_HOME"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# In case this script was run from somewhere else cd to this directory
+cd "$CRAWLER_HOME"/bin
+
+"$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
+  -Djava.ext.dirs="$CRAWLER_HOME"/lib \
+  -Djava.util.logging.config.file="$CRAWLER_HOME"/etc/logging.properties \
+  -Dorg.apache.oodt.cas.crawl.bean.repo="$CRAWLER_HOME"/policy/crawler-config.xml \
+  -Dorg.apache.oodt.cas.cli.action.spring.config="$CRAWLER_HOME"/policy/cmd-line-actions.xml \
+  -Dorg.apache.oodt.cas.cli.action.spring.config="$CRAWLER_HOME"/policy/cmd-line-options.xml \
+  org.apache.oodt.cas.crawl.CrawlerLauncher "$@"

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/action-beans.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/action-beans.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/action-beans.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/action-beans.xml Mon Apr 30 06:22:18 2012
@@ -16,117 +16,206 @@ License for the specific language govern
 the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-    <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
-    
-    <!-- Crawler Actions -->
-    
+
+    <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor" />
+    <bean class="org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer">
+
+        <!-- Allow for system-level properties to override all properties below -->
+        <property name="systemPropertiesMode" value="2" />
+
+        <!-- Default Properties -->
+        <property name="properties">
+            <props>
+                <prop key="crawler.failure.dir">[FAILURE_DIR]</prop>
+                <prop key="crawler.backup.dir">[BACKUP_DIR]</prop>
+                <prop key="crawler.workflowmgr.url">[WORKFLOWMGR_URL]</prop>
+                <prop key="crawler.filemgr.url">[FILEMGR_URL]</prop>
+                <prop key="crawler.client.transferer">org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory</prop>
+                <prop key="crawler.met.file.ext">met</prop>
+                <prop key="crawler.pushpull.met.file.ext">[PUSHPULL_MET_FILE_EXT]</prop>
+                <prop key="crawler.anc.file.ext">anc</prop>
+                <prop key="crawler.anc.file.suffix"></prop>
+                <prop key="notification.mail.host"></prop>
+                <prop key="notification.sender"></prop>
+                <prop key="notification.success.subject"></prop>
+                <prop key="notification.success.message"></prop>
+                <prop key="notification.success.recipients"></prop>
+            </props>
+        </property>
+
+        <!-- File Properties - overrides default properties -->
+        <!-- property name="location" value="/org/apache/oodt/cas/crawl/crawler.properties" 
+            / -->
+    </bean>
+
+    <!-- DELETE Actions -->
     <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="description" value="Deletes the current data file" />
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <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="fileExtension" value="${crawler.met.file.ext}" />
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <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="fileExtension" value="${crawler.pushpull.met.file.ext}" />
         <property name="phases">
             <list>
                 <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <!-- MOVE to FAILURE_DIR Actions -->
+    <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="toDir" value="${crawler.failure.dir}" />
+        <property name="createToDir" value="true" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestSuccess</value>
+                <value type="java.lang.String">postIngestFailure</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <bean id="MoveMetadataFileToFailureDir" 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="fileExtension" value="${crawler.met.file.ext}" />
+        <property name="toDir" value="${crawler.failure.dir}" />
+        <property name="createToDir" value="true" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestSuccess</value>
+                <value type="java.lang.String">postIngestFailure</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>        
+
+    <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="fileExtension" value="${crawler.pushpull.met.file.ext}" />
+        <property name="toDir" value="${crawler.failure.dir}" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestSuccess</value>
+                <value type="java.lang.String">postIngestFailure</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <!-- MOVE to BACKUP_DIR Actions -->
+    <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="fileExtension" value="${crawler.pushpull.met.file.ext}" />
+        <property name="toDir" value="${crawler.backup.dir}" />
+        <property name="createToDir" value="true" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestFailure</value>
+                <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <bean id="MoveMetadataFileToBackupDir" 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="fileExtension" value="${crawler.met.file.ext}" />
+        <property name="toDir" value="${crawler.backup.dir}" />
+        <property name="createToDir" value="true" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestFailure</value>
+                <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
-    <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"/>
+
+    <!-- Workflow Manager Actions -->
+    <bean id="TriggerPostIngestWorkflow" lazy-init="true" class="org.apache.oodt.cas.crawl.action.WorkflowMgrStatusUpdate">
+        <property name="description" value="Triggers workflow event with the name [ProductType]Ingest" />
+        <property name="ingestSuffix" value="Ingest" />
+        <property name="workflowMgrUrl" value="${crawler.workflowmgr.url}" />
         <property name="phases">
             <list>
-                <value type="java.lang.String">postIngestFailure</value>
+                <value type="java.lang.String">postIngestSuccess</value>
             </list>
         </property>
     </bean>
-    
+
+    <!-- File Manager Actions -->
     <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="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="${crawler.filemgr.url}" />
+        <property name="phases">
+            <list>
+                <value type="java.lang.String">preIngest</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="IngestAncillaryFile" lazy-init="true" class="org.apache.oodt.cas.crawl.action.IngestAncillary">
+        <property name="description" value="This will ingest an associated file along with the current file being ingested by the crawler." />
+        <property name="fileManagerUrl" value="${crawler.filemgr.url}" />
+        <property name="fileExtension" value="${crawler.anc.file.ext}" />
+        <property name="fileSuffix" value="${crawler.anc.file.suffix}" />
+        <property name="keepExistingExtension">
+            <value type="java.lang.Boolean">false</value>
+        </property>
+        <property name="dataTransferService" value="${crawler.client.transferer}" />
+        <property name="relatedKey" value="CAS.ProductId" />
+        <property name="copyKeys">
+            <list>
+                <value type="java.lang.String">MetKey1</value>
+            </list>
+        </property>
+        <property name="productType" value="GenericFile" />
+        <property name="failMissingFile">
+            <value type="java.lang.Boolean">true</value>
+        </property>
         <property name="phases">
             <list>
                 <value type="java.lang.String">preIngest</value>
             </list>
         </property>
     </bean>
-    
+
+    <!-- Existence Check Actions -->
     <bean id="CheckMetFileExists" lazy-init="true" class="org.apache.oodt.cas.crawl.action.ExternAction">
-        <property name="description" value="Checks if metadata file was created -- make sure check-exists.sh is on your PATH"/>
-        <property name="executeCommand" value="./check-exists.sh [Filename].met"/>
+        <property name="description" value="Checks if metadata file was created -- make sure check-exists.sh is on your PATH" />
+        <property name="executeCommand" value="./check-exists.sh [Filename].met" />
         <property name="phases">
             <list>
                 <value type="java.lang.String">preIngest</value>
             </list>
         </property>
     </bean>
-    
-</beans>
+
+    <!-- Email Actions -->
+    <bean id="SendNotification" lazy-init="true" class="org.apache.oodt.cas.crawl.action.EmailNotification">
+        <property name="description" value="This will send an email that indicates the submission to the catalog was successful." />
+        <property name="mailHost" value="${notification.mail.host}" />
+        <property name="sender" value="${notification.sender}" />
+        <property name="subject" value="${notification.success.subject}" />
+        <property name="message" value="${notification.success.message}" />
+        <property name="recipients" value="${notification.success.recipients}" />
+        <property name="ignoreInvalidAddresses">
+            <value type="java.lang.Boolean">true</value>
+        </property>
+        <property name="phases">
+            <list>
+                <value type="java.lang.String">postIngestSuccess</value>
+            </list>
+        </property>
+    </bean>
+</beans>
\ No newline at end of file

Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml?rev=1332066&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml Mon Apr 30 06:22:18 2012
@@ -0,0 +1,36 @@
+<?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.
+-->
+<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="launchStdCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.cli.action.CrawlerLauncherCliAction">
+    <property name="description" value="Triggers StdProductCrawler" />
+    <property name="crawlerId" value="StdProductCrawler" />
+  </bean>
+
+  <bean id="launchMetCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.cli.action.CrawlerLauncherCliAction">
+    <property name="description" value="Triggers MetExtractorProductCrawler" />
+    <property name="crawlerId" value="MetExtractorProductCrawler" />
+  </bean>
+
+  <bean id="launchAutoCrawler" lazy-init="true" class="org.apache.oodt.cas.crawl.cli.action.CrawlerLauncherCliAction">
+    <property name="description" value="Triggers AutoDetectProductCrawler" />
+    <property name="crawlerId" value="AutoDetectProductCrawler" />
+  </bean>
+</beans>
\ No newline at end of file

Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-actions.xml
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml?rev=1332066&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml Mon Apr 30 06:22:18 2012
@@ -0,0 +1,913 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  Author: bfoster (Brian Foster)
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <bean id="operation" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption">
+    <property name="shortOption" value="op" />
+    <property name="longOption" value="operation" />
+    <property name="description" value="Declare that you wish to present an operation" />
+    <property name="hasArgs" value="false" />
+    <property name="required" value="true" />
+    <property name="subOptions">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="launchStdCrawler" p:required="false" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="launchMetCrawler" p:required="false" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="launchAutoCrawler" p:required="false" />
+      </list>
+    </property>
+  </bean>
+
+  <!-- launchStdCrawler Options -->
+  <bean id="launchStdCrawler" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="stdPC" />
+    <property name="longOption" value="launchStdCrawler" />
+    <property name="description" value="Triggers StdProductCrawler" />
+    <property name="hasArgs" value="false" />
+    <property name="staticArgs">
+      <list>
+        <value>launchStdCrawler</value>
+      </list>
+    </property>
+    <property name="requirementRules">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchStdCrawler" p:relation="REQUIRED" />
+      </list>
+    </property>
+  </bean>
+
+  <!-- launchMetCrawler Options -->
+  <bean id="launchMetCrawler" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="metPC" />
+    <property name="longOption" value="launchMetCrawler" />
+    <property name="description" value="Triggers MetExtractorProductCrawler" />
+    <property name="hasArgs" value="false" />
+    <property name="staticArgs">
+      <list>
+        <value>launchMetCrawler</value>
+      </list>
+    </property>
+    <property name="requirementRules">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchMetCrawler" p:relation="REQUIRED" />
+      </list>
+    </property>
+  </bean>
+
+  <!-- launchAutoCrawler Options -->
+  <bean id="launchAutoCrawler" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="autoPC" />
+    <property name="longOption" value="launchAutoCrawler" />
+    <property name="description" value="Triggers AutoDetectProductCrawler" />
+    <property name="hasArgs" value="false" />
+    <property name="staticArgs">
+      <list>
+        <value>launchAutoCrawler</value>
+      </list>
+    </property>
+    <property name="requirementRules">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchAutoCrawler" p:relation="REQUIRED" />
+      </list>
+    </property>
+  </bean>
+
+    <bean id="printSupportedCrawlerActions" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="psca" />
+        <property name="longOption" value="printSupportedCrawlerActions" />
+        <property name="description" value="Prints a list and description of all supported CrawlerActions" />
+        <property name="hasArgs" value="false" />
+        <property name="required" value="false" />
+        <property name="performAndQuit" value="true" />
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerActionInfoHandler">
+                <property name="applicationContext">
+                    <bean class="org.springframework.context.support.FileSystemXmlApplicationContext">
+                        <constructor-arg value="../policy/action-beans.xml" />
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="printSupportedPreconditions" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="psp" />
+        <property name="longOption" value="printSupportedPreconditions" />
+        <property name="description" value="Prints a list and description of all supported Preconditions" />
+        <property name="hasArgs" value="false" />
+        <property name="required" value="false" />
+        <property name="performAndQuit" value="true" />
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.PreconditionInfoHandler">
+                <property name="applicationContext">
+                    <bean class="org.springframework.context.support.FileSystemXmlApplicationContext">
+                        <constructor-arg value="../policy/precondition-beans.xml" />
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="filemgrUrl" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="fm" />
+        <property name="longOption" value="filemgrUrl" />
+        <property name="description" value="File Manager URL" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="url" />
+        <property name="required" value="true" />
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.filemgrUrl</value>
+                        <value>MetExtractorProductCrawler.filemgrUrl</value>
+                        <value>AutoDetectProductCrawler.filemgrUrl</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator">
+                    <property name="allowedArgs">
+                        <list>
+                            <value>http://.*:\d*</value>
+                        </list>
+                    </property>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="failureDir" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="fd" />
+        <property name="longOption" value="failureDir" />
+        <property name="description" value="Directory where files will be moved on failure" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="directory" />
+    <property name="requirementRules">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+      </list>
+    </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>MoveMetadataFileToFailureDir.toDir</value>
+                        <value>MovePushpullMetFileToFailureDir.toDir</value>
+                        <value>MoveDataFileToFailureDir.toDir</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="successDir" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="sd" />
+        <property name="longOption" value="successDir" />
+        <property name="description" value="Directory where files will be moved on success" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="directory" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>MovePushpullMetFileToBackupDir.toDir</value>
+                        <value>MoveMetadataFileToBackupDir.toDir</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="workflowMgrUrl" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="wm" />
+        <property name="longOption" value="workflowMgrUrl" />
+        <property name="description" value="Workflow Manager URL" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="url" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>UpdateWorkflowStatusToIngest.workflowMgrUrl</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator">
+                    <property name="allowedArgs">
+                        <list>
+                            <value>http://.*:\d*</value>
+                        </list>
+                    </property>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="clientTransferer" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="ct" />
+        <property name="longOption" value="clientTransferer" />
+        <property name="description" value="File Manager data transferer factory class" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="class" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.clientTransferer</value>
+                        <value>MetExtractorProductCrawler.clientTransferer</value>
+                        <value>AutoDetectProductCrawler.clientTransferer</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ClassExistsCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="requiredMetadata" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="rqm" />
+        <property name="longOption" value="requiredMetadata" />
+        <property name="type" value="java.util.List" />
+        <property name="description" value="Metadata required for ingest to take place" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="metadata_elements" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.requiredMetadata</value>
+                        <value>MetExtractorProductCrawler.requiredMetadata</value>
+                        <value>AutoDetectProductCrawler.requiredMetadata</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="actionIds" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="ais" />
+        <property name="longOption" value="actionIds" />
+        <property name="type" value="java.util.List" />
+        <property name="description" value="CrawlerActions that should be performed" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="CrawlerAction ids" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.actionIds</value>
+                        <value>MetExtractorProductCrawler.actionIds</value>
+                        <value>AutoDetectProductCrawler.actionIds</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="preCondIds" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="pids" />
+        <property name="longOption" value="preCondIds" />
+        <property name="type" value="java.util.List" />
+        <property name="description" value="PreConditionComparator ids that must pass before any metadata extraction will run" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="PreConditionComparator ids" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>MetExtractorProductCrawler.preCondIds</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+  <bean id="namingConventionId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+    <property name="shortOption" value="ncid" />
+    <property name="longOption" value="namingConventionId" />
+    <property name="description" value="ID of the NamingConvention to use to rename products before ingest" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="NamingConvention ID" />
+    <property name="requirementRules">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+          p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+      </list>
+    </property>
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>MetExtractorProductCrawler.namingConventionId</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+    <bean id="noRecur" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <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="type" value="boolean" />
+        <property name="hasArgs" value="false" />
+                <property name="staticArgs">
+            <list>
+                <value>true</value>
+            </list>
+        </property>
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.noRecur</value>
+                        <value>MetExtractorProductCrawler.noRecur</value>
+                        <value>AutoDetectProductCrawler.noRecur</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="crawlForDirs" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="cfd" />
+        <property name="longOption" value="crawlForDirs" />
+        <property name="description" value="Will crawl for directories instead of files" />
+        <property name="type" value="boolean" />
+        <property name="hasArgs" value="false" />
+                <property name="staticArgs">
+            <list>
+                <value>true</value>
+            </list>
+        </property>
+        <property name="required" value="false" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.crawlForDirs</value>
+                        <value>MetExtractorProductCrawler.crawlForDirs</value>
+                        <value>AutoDetectProductCrawler.crawlForDirs</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="skipIngest" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <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="type" value="boolean" />
+        <property name="hasArgs" value="false" />
+                <property name="staticArgs">
+            <list>
+                <value>true</value>
+            </list>
+        </property>
+        <property name="required" value="false" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.skipIngest</value>
+                        <value>MetExtractorProductCrawler.skipIngest</value>
+                        <value>AutoDetectProductCrawler.skipIngest</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="daemonPort" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="dp" />
+        <property name="longOption" value="daemonPort" />
+        <property name="type" value="int" />
+        <property name="description" value="Cause crawler to become a daemon with a XML-RPC webserver started on the given port number" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="portNum" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.daemonPort</value>
+                        <value>MetExtractorProductCrawler.daemonPort</value>
+                        <value>AutoDetectProductCrawler.daemonPort</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator">
+                    <property name="allowedArgs">
+                        <list>
+                            <value>\d*</value>
+                        </list>
+                    </property>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="daemonWait" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="dw" />
+        <property name="longOption" value="daemonWait" />
+        <property name="type" value="int" />
+        <property name="description" value="Cause crawler to become a daemon and sleep for given number of seconds between crawls" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="seconds" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.daemonWait</value>
+                        <value>MetExtractorProductCrawler.daemonWait</value>
+                        <value>AutoDetectProductCrawler.daemonWait</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator">
+                    <property name="allowedArgs">
+                        <list>
+                            <value>\d*</value>
+                        </list>
+                    </property>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="productPath" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="pp" />
+        <property name="longOption" value="productPath" />
+        <property name="description" value="Root directory to crawl" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="directory" />
+        <property name="required" value="true" />
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.productPath</value>
+                        <value>MetExtractorProductCrawler.productPath</value>
+                        <value>AutoDetectProductCrawler.productPath</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="metFileExtension" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <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" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="file extension" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="REQUIRED" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>StdProductCrawler.metFileExtension</value>
+                        <value>DeleteMetadataFile.fileExtension</value>
+                        <value>MoveMetadataFileToBackupDir.fileExtension</value>
+                        <value>MoveMetadataFileToFailureDir.fileExtension</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="metExtractor" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="mx" />
+        <property name="longOption" value="metExtractor" />
+        <property name="description" value="Metadata extractor class to use" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="class" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="REQUIRED" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>MetExtractorProductCrawler.metExtractor</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.ClassExistsCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="metExtractorConfig" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="mxc" />
+        <property name="longOption" value="metExtractorConfig" />
+        <property name="description" value="Config file for metadata extractor" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="file" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="REQUIRED" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>MetExtractorProductCrawler.metExtractorConfig</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="mimeExtractorRepo" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="mxr" />
+        <property name="longOption" value="mimeExtractorRepo" />
+        <property name="description" value="Mime-type to metadata extractor mapping xml file" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="file" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="REQUIRED" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>AutoDetectProductCrawler.mimeExtractorRepo</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="validators">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="pushpullMetFileExtension" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+        <property name="shortOption" value="ppmfx" />
+        <property name="longOption" value="pushpullMetFileExtension" />
+        <property name="description" value="File extension of push-pull metadata files" />
+        <property name="hasArgs" value="true" />
+        <property name="argsDescription" value="file extension" />
+        <property name="requirementRules">
+            <list>
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchStdCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchMetCrawler" p:relation="OPTIONAL" />
+                <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+                    p:actionName="launchAutoCrawler" p:relation="OPTIONAL" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+                <property name="properties">
+                    <list>
+                        <value>DeletePushpullMetFile.fileExtension</value>
+                        <value>MovePushpullMetFileToBackupDir.fileExtension</value>
+                        <value>MovePushpullMetFileToFailureDir.fileExtension</value>
+                        <value>CheckThatPushPullMetFileExists.fileExtension</value>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+  <bean id="notification" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption">
+    <property name="shortOption" value="n" />
+    <property name="longOption" value="notification" />
+    <property name="description" value="Declare that your want email notification" />
+    <property name="hasArgs" value="false" />
+    <property name="required" value="false" />
+    <property name="subOptions">
+      <list>
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="mailHost" p:required="true" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="sender" p:required="true" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="subject" p:required="true" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="message" p:required="true" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="recipients" p:required="true" />
+        <bean class="org.apache.oodt.cas.cli.option.GroupSubOption"
+          p:option-ref="ignoreInvalidAddresses" p:required="false" />
+      </list>
+    </property>
+  </bean>
+
+  <bean id="mailHost" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="mh" />
+    <property name="longOption" value="mailHost" />
+    <property name="description" value="Email Host" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="host" />
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.emailHost</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="sender" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="sdr" />
+    <property name="longOption" value="sender" />
+    <property name="description" value="Email sender" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="email address" />
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.sender</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="subject" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="sub" />
+    <property name="longOption" value="subject" />
+    <property name="description" value="Email subject" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="email subject" />
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.subject</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="message" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="msg" />
+    <property name="longOption" value="message" />
+    <property name="description" value="Email message body" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="email message" />
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.message</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="recipients" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="rcpts" />
+    <property name="longOption" value="recipients" />
+    <property name="description" value="List of recipient emails" />
+    <property name="type" value="java.util.List" />
+    <property name="hasArgs" value="true" />
+    <property name="argsDescription" value="email addresses" />
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.recipients</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="ignoreInvalidAddresses" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"
+    p:isSubOption="true">
+    <property name="shortOption" value="iias" />
+    <property name="longOption" value="ignoreInvalidAddresses" />
+    <property name="description" value="If invalid addresses should just be ignored" />
+    <property name="type" value="boolean" />
+    <property name="hasArgs" value="false" />
+    <property name="staticArgs">
+    <list>
+        <value>true</value>
+    </list>
+    </property>
+    <property name="required" value="false" />
+    <property name="handler">
+      <bean class="org.apache.oodt.cas.crawl.cli.option.handler.CrawlerBeansPropHandler">
+        <property name="properties">
+          <list>
+            <value>SendNotification.ignoreInvalidAddresses</value>
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+</beans>
\ No newline at end of file

Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/cmd-line-options.xml
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/crawler-config.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/crawler-config.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/crawler-config.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/crawler-config.xml Mon Apr 30 06:22:18 2012
@@ -20,9 +20,11 @@ the License.
     xmlns:p="http://www.springframework.org/schema/p"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <import resource="file:/usr/local/snow/crawler/policy/crawler-beans.xml"/>
-    <import resource="file:/usr/local/snow/crawler/policy/action-beans.xml"/>
-    <import resource="file:/usr/local/snow/crawler/policy/precondition-beans.xml"/>
-    <import resource="file:/usr/local/snow/crawler/policy/cmd-line-option-beans.xml"/>
+    <bean class="org.apache.oodt.cas.crawl.util.CasPropertyOverrideConfigurer" />
+
+    <import resource="crawler-beans.xml"/>
+    <import resource="action-beans.xml"/>
+    <import resource="precondition-beans.xml"/>
+    <import resource="naming-beans.xml" />
 
 </beans>

Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml?rev=1332066&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml Mon Apr 30 06:22:18 2012
@@ -0,0 +1,25 @@
+<?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.
+-->
+<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 id="ExampleNamingConv" class="org.apache.oodt.cas.metadata.filenaming.PathUtilsNamingConvention">
+    <property name="namingConv" value="[ProductType].[NominalDate].txt" />
+  </bean>
+</beans>
\ No newline at end of file

Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/naming-beans.xml
------------------------------------------------------------------------------
    svn:keywords = Id Revision

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/precondition-beans.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/precondition-beans.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/precondition-beans.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/policy/precondition-beans.xml Mon Apr 30 06:22:18 2012
@@ -16,44 +16,46 @@ License for the specific language govern
 the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-        
-    <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/>    
 
-    <bean id="OnlyExtractHdf" lazy-init="true" class="gov.nasa.jpl.snow.preconditions.EndsWithComparator">
-        <property name="description" value="Checks the file extension and only extracts met from those files."/>        
-        <property name="compareItem">
-            <value type="java.lang.String">hdf</value>    
-        </property>
-        <property name="type" value="equal_to"/>
-    </bean>
+    <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor" />
+  <bean class="org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer">
+
+    <!-- Allow for system-level properties to override all properties below -->
+    <property name="systemPropertiesMode" value="2" />
+
+    <!-- Default Properties -->
+    <property name="properties">
+      <props>
+        <prop key="crawler.pushpull.met.file.ext">[PUSHPULL_MET_FILE_EXT]</prop>
+      </props>
+    </property>
+  </bean>
 
-    
     <!-- Precondition Comparators -->
-    
     <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="fileExtension" value="${crawler.pushpull.met.file.ext}" />
+        <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>    
+            <value type="java.lang.Boolean">true</value>
         </property>
-        <property name="type" value="equal_to"/>
+        <property name="type" value="equal_to" />
     </bean>
-    
+
     <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="description" value="Check if the current data file size is greater than zero" />
         <property name="compareItem">
             <value type="java.lang.Long">0</value>
         </property>
-        <property name="type" value="greater_than"/>
+        <property name="type" value="greater_than" />
     </bean>
-    
+
     <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="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="type" value="equal_to" />
     </bean>
-    
-</beans>
+</beans>
\ No newline at end of file

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml Mon Apr 30 06:22:18 2012
@@ -53,6 +53,18 @@
       <version>${project.parent.version}</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>${rootArtifactId}-pcs-services</artifactId>
+      <version>${project.parent.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>${rootArtifactId}-fmprod</artifactId>
+      <version>${project.parent.version}</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <build>
@@ -85,6 +97,20 @@
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/opsui</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>${groupId}</groupId>
+                  <artifactId>${parent.artifactId}-pcs-services</artifactId>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/pcs</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>${groupId}</groupId>
+                  <artifactId>${parent.artifactId}-fmprod</artifactId>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/fmprod</outputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml Mon Apr 30 06:22:18 2012
@@ -64,7 +64,7 @@
     </fileSet>
     <fileSet>
       <directory>${project.build.directory}/apache-tomcat-${tomcat.version}</directory>
-      <outputDirectory>components/tomcat</outputDirectory>
+      <outputDirectory>tomcat</outputDirectory>
       <excludes>
         <exclude>**/webapps/docs/**</exclude>
         <exclude>**/webapps/examples/**</exclude>
@@ -78,12 +78,14 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>components</outputDirectory>
+      <outputDirectory>.</outputDirectory>
       <unpack>true</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <excludes>
         <exclude>${groupId}:${parent.artifactId}-opsui</exclude>
+        <exclude>${groupId}:${parent.artifactId}-pcs-services</exclude>
+        <exclude>${groupId}:${parent.artifactId}-fmprod</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh?rev=1332066&r1=1332065&r2=1332066&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh Mon Apr 30 06:22:18 2012
@@ -94,17 +94,17 @@ if [ -z "$OODT_OUT" ] ; then
 fi
 
 if [ -z "$FILEMGR_HOME" ]; then
-  FILEMGR_HOME="$OODT_HOME"/components/filemgr
+  FILEMGR_HOME="$OODT_HOME"/filemgr
   export FILEMGR_HOME
 fi
 
 if [ -z "$WORKFLOW_HOME" ]; then
-  WORKFLOW_HOME="$OODT_HOME"/components/workflow
+  WORKFLOW_HOME="$OODT_HOME"/workflow
   export WORKFLOW_HOME
 fi
 
 if [ -z "$CRAWLER_HOME" ]; then
-  CRAWLER_HOME="$OODT_HOME"/components/crawler
+  CRAWLER_HOME="$OODT_HOME"/crawler
   export CRAWLER_HOME
 fi