Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client?rev=1332066&r1=1332065&r2=1332066&view=diff ============================================================================== --- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client (original) +++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client Mon Apr 30 06:22:18 2012 @@ -42,7 +42,7 @@ done PRGDIR=`dirname "$PRG"` # Only set OODT_HOME if not already set -[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/../../.." ; pwd` +[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/../.." ; pwd` # Get OODT environment set up if [ -r "$OODT_HOME"/bin/env.sh ]; then @@ -51,7 +51,7 @@ fi # Only set WORKFLOW_HOME if not already set if [ -z "$WORKFLOW_HOME" ]; then - WORKFLOW_HOME="$OODT_HOME"/components/workflow + WORKFLOW_HOME="$OODT_HOME"/workflow export WORKFLOW_HOME fi @@ -60,7 +60,7 @@ 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 "$OODT_BASE" ] && OODT_BASE=`cygpath --unix "$OODT_BASE"` + [ -n "$WORKFLOW_HOME" ] && WORKFLOW_HOME=`cygpath --unix "$WORKFLOW_HOME"` [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi @@ -68,6 +68,8 @@ fi cd "$WORKFLOW_HOME"/bin "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \ - -Djava.endorsed.dirs="$WORKFLOW_HOME"/lib \ - -Djava.util.logging.config.file=../etc/logging.properties \ + -Djava.ext.dirs="$WORKFLOW_HOME"/lib \ + -Djava.util.logging.config.file="$WORKFLOW_HOME"/etc/logging.properties \ + -Dorg.apache.oodt.cas.cli.action.spring.config="$WORKFLOW_HOME"/policy/cmd-line-actions.xml \ + -Dorg.apache.oodt.cas.cli.option.spring.config="$WORKFLOW_HOME"/policy/cmd-line-options.xml \ org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient "$@"
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties?rev=1332066&r1=1332065&r2=1332066&view=diff ============================================================================== --- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties (original) +++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties Mon Apr 30 06:22:18 2012 @@ -64,3 +64,7 @@ org.apache.oodt.cas.workflow.repo.dirs=f # org.apache.oodt.cas.workflow.repo.datasource.jdbc.user=user # org.apache.oodt.cas.workflow.repo.datasource.jdbc.pass=pass # org.apache.oodt.cas.workflow.repo.datasource.jdbc.driver=your.jdbc.Driver + +# Spring command line option and action store properties +org.apache.oodt.cas.cli.action.spring.config=src/main/resources/cmd-line-actions.xml +org.apache.oodt.cas.cli.option.spring.config=src/main/resources/cmd-line-options.xml
