Merge https://github.com/sfrancus/drat into merge-proteus
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9e0b387..2d9208d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -15,7 +15,7 @@
<packaging>pom</packaging>
<properties>
- <tomcat.version>5.5.23</tomcat.version>
+ <tomcat.version>7.0.65</tomcat.version>
</properties>
<dependencies>
@@ -129,8 +129,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>tomcat</groupId>
- <artifactId>apache-tomcat</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
<version>${tomcat.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
diff --git a/docs/DRAT-Workflow-Wangler.pdf b/docs/DRAT-Workflow-Wangler.pdf
new file mode 100644
index 0000000..9cf59c7
--- /dev/null
+++ b/docs/DRAT-Workflow-Wangler.pdf
Binary files differ
diff --git a/docs/DRAT_An_Unobtrusive, Scalable_Approach_to_Large_Scale_Software_License_Analysis.pptx b/docs/DRAT_An_Unobtrusive, Scalable_Approach_to_Large_Scale_Software_License_Analysis.pptx
new file mode 100644
index 0000000..6f73c11
--- /dev/null
+++ b/docs/DRAT_An_Unobtrusive, Scalable_Approach_to_Large_Scale_Software_License_Analysis.pptx
Binary files differ
diff --git a/workflow/src/main/resources/policy/conditions.xml b/workflow/src/main/resources/policy/conditions.xml
index 3375fc5..66568c1 100644
--- a/workflow/src/main/resources/policy/conditions.xml
+++ b/workflow/src/main/resources/policy/conditions.xml
@@ -16,6 +16,13 @@
-->
<cas:conditions xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<!--
- TODO: Add some examples
+ An example to check for prerequisite jobs while running DRAT using OODT Resource Manager
+
+ <condition id="urn:drat:CheckForPrerequisiteJob" name="Prerequisite Job Check" class="org.apache.oodt.cas.workflow.examples.ResmgrJobCondition">
+ <configuration>
+ <property name="JOBS" value="urn:drat:MimePartitioner,urn:drat:RatCodeAudit"/>
+ <property name="RESMGR_URL" value="[RESMGR_URL]"/>
+ </configuration>
+ </condition>
-->
</cas:conditions>
diff --git a/workflow/src/main/resources/policy/tasks.xml b/workflow/src/main/resources/policy/tasks.xml
index 7b39655..f68123a 100644
--- a/workflow/src/main/resources/policy/tasks.xml
+++ b/workflow/src/main/resources/policy/tasks.xml
@@ -55,9 +55,15 @@
<task id="urn:drat:RatAggregator" name="RatAggregator"
class="org.apache.oodt.cas.pge.StdPGETaskInstance">
- <conditions/>
+ <!--
+ An example to check for prerequisite jobs while running DRAT using OODT Resource Manager
+ <conditions>
+ <condition id="urn:drat:CheckForPrerequisiteJob" />
+ </conditions>
+ -->
+
<configuration>
- <property name="PGETask_Name" value="MimePartitioner"/>
+ <property name="PGETask_Name" value="RatAggregator"/>
<property name="PGETask_ConfigFilePath" value="[DRAT_HOME]/pge/policy/PgeConfig_RatAggregator.xml" envReplace="true"/>
<property name="PGETask_DumpMetadata" value="true"/>
<property name="PCS_WorkflowManagerUrl" value="[WORKFLOW_URL]" envReplace="true" />
