Author: mattmann
Date: Wed Nov 12 10:40:26 2014
New Revision: 1638737
URL: http://svn.apache.org/r1638737
Log:
fix for OODT-787 PGE_ROOT env variable does not work in PGEConfig.xml and
tasks.xml contributed by Yi Sun <[email protected]> this closes #12
Modified:
oodt/trunk/CHANGES.txt
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/pge/src/main/resources/policy/example-pge-config.xml
oodt/trunk/pge/src/main/resources/examples/WorkflowTask/tasks.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1638737&r1=1638736&r2=1638737&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Nov 12 10:40:26 2014
@@ -3,6 +3,8 @@ Apache OODT Change Log
Release 0.8 - Current Development
+* OODT-787 PGE_ROOT env variable does not work in PGEConfig.xml and tasks.xml
(Yi Sun, Sneha Deshmukh via mattmann)
+
* OODT-562 Exposing parent-child & element addition/deletion functionality for
product types using cas-curator (varunr)
* OODT-563 Modifying Workflow Manager to allow adding new workflows (varunr)
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=1638737&r1=1638736&r2=1638737&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
Wed Nov 12 10:40:26 2014
@@ -120,9 +120,9 @@ if [ -z "$CRAWLER_HOME" ]; then
export CRAWLER_HOME
fi
-if [ -z "$PGE_HOME" ]; then
- PGE_HOME="$OODT_HOME"/pge
- export PGE_HOME
+if [ -z "$PGE_ROOT" ]; then
+ PGE_ROOT="$OODT_HOME"/pge
+ export PGE_ROOT
fi
if [ -z "$SOLR_HOME" ]; then
Modified:
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pge/src/main/resources/policy/example-pge-config.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pge/src/main/resources/policy/example-pge-config.xml?rev=1638737&r1=1638736&r2=1638737&view=diff
==============================================================================
---
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pge/src/main/resources/policy/example-pge-config.xml
(original)
+++
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pge/src/main/resources/policy/example-pge-config.xml
Wed Nov 12 10:40:26 2014
@@ -3,7 +3,7 @@
<!-- How to run the PGE -->
<exe dir="[JobDir]" shell="/bin/bash">
- <cmd>[PGE_HOME]/bin/example-script.sh >
/tmp/HelloWorldPGE-[ProductionDateTime].output.txt</cmd>
+ <cmd>[PGE_ROOT]/bin/example-script.sh >
/tmp/HelloWorldPGE-[ProductionDateTime].output.txt</cmd>
</exe>
<!-- Files to ingest -->
Modified: oodt/trunk/pge/src/main/resources/examples/WorkflowTask/tasks.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/main/resources/examples/WorkflowTask/tasks.xml?rev=1638737&r1=1638736&r2=1638737&view=diff
==============================================================================
--- oodt/trunk/pge/src/main/resources/examples/WorkflowTask/tasks.xml (original)
+++ oodt/trunk/pge/src/main/resources/examples/WorkflowTask/tasks.xml Wed Nov
12 10:40:26 2014
@@ -9,7 +9,7 @@
<conditions/>
<configuration>
<property name="PGETask_Name" value="CAS PGE"/>
- <property name="PGETask_ConfigFilePath"
value="[PGE_HOME]/policy/pge-config.xml" envReplace="true"/>
+ <property name="PGETask_ConfigFilePath"
value="[PGE_ROOT]/policy/pge-config.xml" envReplace="true"/>
<property name="PGETask_DumpMetadata" value="true"/>
<property name="PCS_WorkflowManagerUrl" value="[WORKFLOW_URL]"
envReplace="true" />
<property name="PCS_FileManagerUrl" value="[FILEMGR_URL]"
envReplace="true"/>
