oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964828 - in /incubator/oodt/trunk: ./ workflow/ workflow/src/main/assembly/ workflow/src/main/bin/ workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/ workflow/src/main/...
Date Fri, 16 Jul 2010 15:20:11 GMT
Author: kelly
Date: Fri Jul 16 15:20:10 2010
New Revision: 964828

URL: http://svn.apache.org/viewvc?rev=964828&view=rev
Log:
WIP OODT-15 OODT-16
Module "workflow" now functional; add Dough Lea's "concurrent" as dependency; adjust dependencies and versions; change package decls, imports, and resource paths from gov.nasa.jpl to org.apache; from ".cas." from commons imports; change names of condition classes; add XML processing instruction decls to XML files that were missing it; add ASF notices to XML files, prop files, and scripts; replace import for DateConvert to oodt-commons version; adjust class names in example task files; add FIXME notice re namespace URI; add ASF notice to SQL file

Modified:
    incubator/oodt/trunk/pom.xml
    incubator/oodt/trunk/workflow/   (props changed)
    incubator/oodt/trunk/workflow/pom.xml
    incubator/oodt/trunk/workflow/src/main/assembly/assembly.xml
    incubator/oodt/trunk/workflow/src/main/bin/wmgr
    incubator/oodt/trunk/workflow/src/main/bin/wmgr-client
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
    incubator/oodt/trunk/workflow/src/main/resources/examples/conditions.xml
    incubator/oodt/trunk/workflow/src/main/resources/examples/tasks.xml
    incubator/oodt/trunk/workflow/src/main/resources/examples/workflow-lifecycle.xml
    incubator/oodt/trunk/workflow/src/main/resources/logging.properties
    incubator/oodt/trunk/workflow/src/main/resources/workflow.properties
    incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.jpg
    incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.psd
    incubator/oodt/trunk/workflow/src/site/site.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/development/maven.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/examples/TestExternScriptTaskInstance.java
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java
    incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/util/TestGenericWorkflowObjectFactory.java
    incubator/oodt/trunk/workflow/src/testdata/myScript.sh
    incubator/oodt/trunk/workflow/src/testdata/test.logging.properties
    incubator/oodt/trunk/workflow/src/testdata/workflow.sql

Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 15:20:10 2010
@@ -44,7 +44,7 @@ the License.
         <module>sso</module>
         <module>filemgr</module>
         <!-- broken: <module>catalog</module> -->
-        <!-- broken: <module>workflow</module> -->
+        <module>workflow</module>
         <!-- broken: <module>crawler</module>         -->
         <module>resource</module>
         <!-- broken: <module>curator</module> -->

Propchange: incubator/oodt/trunk/workflow/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 15:20:10 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/workflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/pom.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/pom.xml (original)
+++ incubator/oodt/trunk/workflow/pom.xml Fri Jul 16 15:20:10 2010
@@ -26,7 +26,7 @@ the License.
     <version>${oodt.version}</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
-  <artifactId>cas-workflow</artifactId>
+  <artifactId>workflow</artifactId>
   <name>Catalog and Archive Workflow Management Component</name>
   <description>The workflow management component of a Catalog and Archive Service. This component
      purposefully separates workflow repositories and workflow engines standard interfaces, and
@@ -88,26 +88,38 @@ the License.
       </plugin>    
     </plugins>
   </build>
+  <repositories>
+      <!-- FIXME: Find a better, more permanent mirror than some project's dependencies that they (inadvertently?) published -->
+      <repository>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+        <id>some-mirror-that-has-javamail-1.3.3</id>
+        <name>Some Mirror That Has Javamail 1.3.3</name>
+        <url>http://mirrors.ibiblio.org/pub/mirrors/maven/mule/dependencies/maven2/</url>
+        <layout>default</layout>
+      </repository>
+  </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-commons</artifactId>
-      <version>${oodt.version}</version>
+        <groupId>concurrent</groupId>
+        <artifactId>concurrent</artifactId>
+        <version>1.3.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-metadata</artifactId>
+      <artifactId>oodt-commons</artifactId>
       <version>${oodt.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.oodt</groupId>
-      <artifactId>cas-resource</artifactId>
-      <version>${oodt.version}1</version>
+      <artifactId>cas-metadata</artifactId>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.oodt</groupId>
-      <artifactId>oodt-commons</artifactId>
-      <version>${oodt.version}</version>
+      <artifactId>resource</artifactId>
+      <version>1.4.0-dev</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

Modified: incubator/oodt/trunk/workflow/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/assembly/assembly.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/workflow/src/main/assembly/assembly.xml Fri Jul 16 15:20:10 2010
@@ -1,26 +1,37 @@
-<!-- 
-Copyright 2008 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
+<?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
 
-$Id$
--->
-<assembly>
-  <id>dist</id>
-  <formats>
+     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.
+-->
+<assembly>
+  <id>dist</id>
+  <formats>
     <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
+    <format>zip</format>
+  </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
-  <includeSiteDirectory>false</includeSiteDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>CHANGES.txt</include>
-      </includes>
+  <includeSiteDirectory>false</includeSiteDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>CHANGES.txt</include>
+      </includes>
     </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/bin</directory>
@@ -53,15 +64,15 @@ $Id$
       <filtered>false</filtered>
       <outputDirectory>doc</outputDirectory>
       <excludes/>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>true</useProjectArtifact>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <unpackOptions/>
-    </dependencySet>
-  </dependencySets>
-</assembly>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <unpackOptions/>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Modified: incubator/oodt/trunk/workflow/src/main/bin/wmgr
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/bin/wmgr?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/bin/wmgr (original)
+++ incubator/oodt/trunk/workflow/src/main/bin/wmgr Fri Jul 16 15:20:10 2010
@@ -5,10 +5,21 @@
 # chkconfig: 345 88 22
 # description: CAS Workflow Manager
 #
-# Copyright (c) 2005 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $Id$
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.    
+
 
 [ -f /etc/sysconfig/java ] && . /etc/sysconfig/java
 #[ -f /etc/sysconfig/cas-filemgr] && . /etc/sysconfig/cas-filemgr
@@ -39,8 +50,8 @@ case "$1" in
         echo -n "Starting cas workflow manager: "
         $JAVA_HOME/bin/java -Djava.ext.dirs=${CAS_WORKFLOW_HOME}/lib \
         -Djava.util.logging.config.file=${CAS_WORKFLOW_HOME}/etc/logging.properties \
-        -Dgov.nasa.jpl.oodt.cas.workflow.properties=${CAS_WORKFLOW_PROPS} \
-        gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManager --portNum $SERVER_PORT &       
+        -Dorg.apache.oodt.cas.workflow.properties=${CAS_WORKFLOW_PROPS} \
+        org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager --portNum $SERVER_PORT &       
         echo $! >${RUN_HOME}/cas.workflow.pid 
         echo "OK"
         sleep 5
@@ -59,4 +70,4 @@ case "$1" in
         exit 1
 esac
 
-exit 0
\ No newline at end of file
+exit 0

Modified: incubator/oodt/trunk/workflow/src/main/bin/wmgr-client
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/bin/wmgr-client?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/bin/wmgr-client (original)
+++ incubator/oodt/trunk/workflow/src/main/bin/wmgr-client Fri Jul 16 15:20:10 2010
@@ -1,8 +1,19 @@
 #!/bin/sh
-# Copyright (c) 2005 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $Id$
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.    
+
 
 if [ -z $JAVA_HOME ] ; then
 	JAVA_HOME=/path/to/java/home
@@ -12,4 +23,4 @@ fi
 
 export JAVA_HOME
 
-$JAVA_HOME/bin/java -Djava.ext.dirs=../lib -Djava.util.logging.config.file=../etc/logging.properties gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient $*
+$JAVA_HOME/bin/java -Djava.ext.dirs=../lib -Djava.util.logging.config.file=../etc/logging.properties org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient $*

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java Fri Jul 16 15:20:10 2010
@@ -35,7 +35,7 @@ import org.apache.oodt.cas.workflow.stru
 import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
 import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.net.InetAddress;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java Fri Jul 16 15:20:10 2010
@@ -36,7 +36,7 @@ import org.apache.oodt.cas.workflow.stru
 import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
 import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.net.InetAddress;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java Fri Jul 16 15:20:10 2010
@@ -33,7 +33,7 @@ import org.apache.oodt.cas.workflow.util
 import org.apache.oodt.cas.workflow.engine.IterativeWorkflowProcessorThread;
 import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
 import org.apache.oodt.cas.workflow.engine.NonBlockingShepardThread;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.net.URL;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java Fri Jul 16 15:20:10 2010
@@ -29,7 +29,7 @@ import org.apache.oodt.cas.workflow.stru
 import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
 import org.apache.oodt.cas.workflow.engine.IterativeWorkflowProcessorThread;
 import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.net.URL;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/MemoryWorkflowInstanceRepository.java Fri Jul 16 15:20:10 2010
@@ -21,7 +21,7 @@ package org.apache.oodt.cas.workflow.ins
 //OODT imports
 import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
 import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.util.Collections;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java Fri Jul 16 15:20:10 2010
@@ -27,7 +27,7 @@ import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 //OODT imports
 import org.apache.oodt.cas.metadata.Metadata;

Modified: incubator/oodt/trunk/workflow/src/main/resources/examples/conditions.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/resources/examples/conditions.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/resources/examples/conditions.xml (original)
+++ incubator/oodt/trunk/workflow/src/main/resources/examples/conditions.xml Fri Jul 16 15:20:10 2010
@@ -1,10 +1,10 @@
 <cas:conditions xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
-    <condition id="urn:oodt:TrueCondition" name="True Condition" class="gov.nasa.jpl.oodt.cas.workflow.examples.TrueCondition"/>   
-    <condition id="urn:oodt:FalseCondition" name="False Condition" class="gov.nasa.jpl.oodt.cas.workflow.examples.FalseCondition"/>
-    <condition id="urn:oodt:LongCondition" name="Long Condition" class="gov.nasa.jpl.oodt.cas.workflow.examples.LongCondition"/>
-    <condition id="urn:oodt:CheckForMetadataKeys" name="Metadata Key Check" class="gov.nasa.jpl.oodt.cas.workflow.examples.CheckForMetadataKeys">
+    <condition id="urn:oodt:TrueCondition" name="True Condition" class="org.apache.oodt.cas.workflow.examples.TrueCondition"/>   
+    <condition id="urn:oodt:FalseCondition" name="False Condition" class="org.apache.oodt.cas.workflow.examples.FalseCondition"/>
+    <condition id="urn:oodt:LongCondition" name="Long Condition" class="org.apache.oodt.cas.workflow.examples.LongCondition"/>
+    <condition id="urn:oodt:CheckForMetadataKeys" name="Metadata Key Check" class="org.apache.oodt.cas.workflow.examples.CheckForMetadataKeys">
         <configuration>
             <property name="reqMetKeys" value="Met1,Met2,Met3"/>
         </configuration>
     </condition>    
-</cas:conditions>
\ No newline at end of file
+</cas:conditions>

Modified: incubator/oodt/trunk/workflow/src/main/resources/examples/tasks.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/resources/examples/tasks.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/resources/examples/tasks.xml (original)
+++ incubator/oodt/trunk/workflow/src/main/resources/examples/tasks.xml Fri Jul 16 15:20:10 2010
@@ -1,6 +1,6 @@
 <cas:tasks xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
 	<task id="urn:oodt:HelloWorld" name="Hello World"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.HelloWorld">
+		class="org.apache.oodt.cas.workflow.examples.HelloWorld">
 		<conditions>
 			<condition id="urn:oodt:TrueCondition" />
 		</conditions>
@@ -9,7 +9,7 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:GoodbyeWorld" name="Goodbye World"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.GoodbyeWorld">
+		class="org.apache.oodt.cas.workflow.examples.GoodbyeWorld">
 		<conditions>
 			<condition id="urn:oodt:TrueCondition" />
 		</conditions>
@@ -18,7 +18,7 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:YoureStuck" name="You're Stuck"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.GoodbyeWorld">
+		class="org.apache.oodt.cas.workflow.examples.GoodbyeWorld">
 		<conditions>
 			<condition id="urn:oodt:FalseCondition" />
 		</conditions>
@@ -27,19 +27,19 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:IntensiveTask" name="Processor Intensive Task"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.LongTask">
+		class="org.apache.oodt.cas.workflow.examples.LongTask">
 		<conditions />
 		<configuration />
 	</task>
 	<task id="urn:oodt:IntensiveTaskWithWait" name="Intensive Waiter"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.LongTask">
+		class="org.apache.oodt.cas.workflow.examples.LongTask">
 		<conditions>
 			<condition id="urn:oodt:LongCondition" />
 		</conditions>
 		<configuration />
 	</task>
 	<task id="urn:oodt:PropReplaceTask" name="PRTask"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.LongTask">
+		class="org.apache.oodt.cas.workflow.examples.LongTask">
 		<conditions />
 		<configuration>
 			<property name="PathToReplace" value="[HOME]/my/path"
@@ -50,19 +50,19 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:NumIncrementTask" name="Num Increment Task"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.NumIncrementTask">
+		class="org.apache.oodt.cas.workflow.examples.NumIncrementTask">
 		<conditions />
 		<configuration />
 	</task>
 	<task id="urn:oodt:RandomStatusUpdateTask"
 		name="Random Status Update"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.RandomStatusUpdateTask">
+		class="org.apache.oodt.cas.workflow.examples.RandomStatusUpdateTask">
 		<conditions />
 		<configuration />
 	</task>
 	<task id="urn:oodt:TestMultiConditionTask"
 		name="Test Multi Condition"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.HelloWorld">
+		class="org.apache.oodt.cas.workflow.examples.HelloWorld">
 		<conditions>
 			<condition id="urn:oodt:TrueCondition" />
 			<condition id="urn:oodt:FalseCondition" />
@@ -72,7 +72,7 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:TestReqMetFieldsTask" name="Test Met Fields"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.LongTask">
+		class="org.apache.oodt.cas.workflow.examples.LongTask">
 		<conditions />
 		<configuration />
 		<requiredMetFields>
@@ -80,7 +80,7 @@
 		</requiredMetFields>
 	</task>
 		<task id="urn:oodt:ExternalScriptTask" name="External Script Task"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.ExternScriptTaskInstance">
+		class="org.apache.oodt.cas.workflow.examples.ExternScriptTaskInstance">
 		<conditions />
 		<configuration>
 		    <property name="ShellType" value="/bin/sh"/> <!-- or /bin/tcsh if you have tcsh shell envionment; or /usr/bin/ if you have a compiled program -->
@@ -88,7 +88,7 @@
 		</configuration>
 	</task>
 	<task id="urn:oodt:mailTask" name="Ingest e-Mail"
-		class="gov.nasa.jpl.oodt.cas.workflow.examples.MailTask">
+		class="org.apache.oodt.cas.workflow.examples.MailTask">
 		<conditions/>
 		<configuration>
 			<property name="user.name" value="Costin"/>
@@ -97,4 +97,4 @@
 			<property name="mail.from" value="oodt@jpl.nasa.gov"/>
 		</configuration>
 	</task>	
-</cas:tasks>
\ No newline at end of file
+</cas:tasks>

Modified: incubator/oodt/trunk/workflow/src/main/resources/examples/workflow-lifecycle.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/resources/examples/workflow-lifecycle.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/resources/examples/workflow-lifecycle.xml (original)
+++ incubator/oodt/trunk/workflow/src/main/resources/examples/workflow-lifecycle.xml Fri Jul 16 15:20:10 2010
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2008, California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-  
-  
-  $Id$
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
+<!-- FIXME: Change namespace URI? -->
 <cas:workflowlifecycles xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
 <default>
   <stage name="setup">
@@ -38,4 +48,4 @@
     
   </lifecycle>
  -->
-</cas:workflowlifecycles>
\ No newline at end of file
+</cas:workflowlifecycles>

Modified: incubator/oodt/trunk/workflow/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/resources/logging.properties?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/resources/logging.properties (original)
+++ incubator/oodt/trunk/workflow/src/main/resources/logging.properties Fri Jul 16 15:20:10 2010
@@ -1,8 +1,17 @@
-# Copyright (c) 2005 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $Id$
-
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.    
 
 # Specify the handlers to create in the root logger
 # (all loggers are children of the root logger)
@@ -29,19 +38,19 @@ java.util.logging.FileHandler.formatter 
 # Set the default logging level for the subsystems
 
 # data structures subsystem
-gov.nasa.jpl.oodt.cas.workflow.structs.level = INFO
+org.apache.oodt.cas.workflow.structs.level = INFO
 
 # engine subsystem
-gov.nasa.jpl.oodt.cas.workflow.engine.level = INFO
+org.apache.oodt.cas.workflow.engine.level = INFO
 
 # instance repository subsystem
-gov.nasa.jpl.oodt.cas.workflow.instrepo.level = INFO
+org.apache.oodt.cas.workflow.instrepo.level = INFO
 
 # repository subsystem
-gov.nasa.jpl.oodt.cas.workflow.repository.level = INFO
+org.apache.oodt.cas.workflow.repository.level = INFO
 
 # system subsystem
-gov.nasa.jpl.oodt.cas.workflow.system.level = FINE
+org.apache.oodt.cas.workflow.system.level = FINE
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO

Modified: incubator/oodt/trunk/workflow/src/main/resources/workflow.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/resources/workflow.properties?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/resources/workflow.properties (original)
+++ incubator/oodt/trunk/workflow/src/main/resources/workflow.properties Fri Jul 16 15:20:10 2010
@@ -1,53 +1,63 @@
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $Id$
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.    
 #
 # Properties required to configure the Workflow Manager
 
 # workflow repository factory
-workflow.repo.factory = gov.nasa.jpl.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory
+workflow.repo.factory = org.apache.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory
 
 # workflow engine factory
-workflow.engine.factory = gov.nasa.jpl.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
+workflow.engine.factory = org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
 
 # workflow instance repository factory
-workflow.engine.instanceRep.factory = gov.nasa.jpl.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory
+workflow.engine.instanceRep.factory = org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory
 
 # thread pool workflow engine properties
-gov.nasa.jpl.oodt.cas.workflow.engine.queueSize=
-gov.nasa.jpl.oodt.cas.workflow.engine.maxPoolSize=
-gov.nasa.jpl.oodt.cas.workflow.engine.minPoolSize=6
-gov.nasa.jpl.oodt.cas.workflow.engine.threadKeepAlive.minutes=5
-gov.nasa.jpl.oodt.cas.workflow.engine.unlimitedQueue=true
-gov.nasa.jpl.oodt.cas.workflow.engine.preConditionWaitTime=10
+org.apache.oodt.cas.workflow.engine.queueSize=
+org.apache.oodt.cas.workflow.engine.maxPoolSize=
+org.apache.oodt.cas.workflow.engine.minPoolSize=6
+org.apache.oodt.cas.workflow.engine.threadKeepAlive.minutes=5
+org.apache.oodt.cas.workflow.engine.unlimitedQueue=true
+org.apache.oodt.cas.workflow.engine.preConditionWaitTime=10
 
 # set this if you want the workflow manager to submit jobs through the resource mgr
-gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.url=
+org.apache.oodt.cas.workflow.engine.resourcemgr.url=
 
 # if you use the resource mgr submission, you can specify how many seconds the 
 # workflow manager should wait inbetween checking to see if a job is complete
-gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime=10
+org.apache.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime=10
 
 # workflow instance repository general properties
 # default page size to page through WorkflowInstances with
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.pageSize=20
+org.apache.oodt.cas.workflow.instanceRep.pageSize=20
 
 # lucene workflow instance repository properties
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.lucene.idxPath=/path/to/index
+org.apache.oodt.cas.workflow.instanceRep.lucene.idxPath=/path/to/index
 
 # data source workflow instance repository properties
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.url=jdbc:url
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.user=user
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.pass=pass
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.driver=your.jdbc.Driver
-gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.quoteFields=false
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.url=jdbc:url
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.user=user
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.pass=pass
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.driver=your.jdbc.Driver
+org.apache.oodt.cas.workflow.instanceRep.datasource.quoteFields=false
 
 # XML workflow repository properties
-gov.nasa.jpl.oodt.cas.workflow.repo.dirs=file:///path/to/your/repo1, file:///path/to/your/repo2
+org.apache.oodt.cas.workflow.repo.dirs=file:///path/to/your/repo1, file:///path/to/your/repo2
 
 # data source workflow repository properties
-gov.nasa.jpl.oodt.cas.workflow.repo.datasource.jdbc.url=jdbc:url
-gov.nasa.jpl.oodt.cas.workflow.repo.datasource.jdbc.user=user
-gov.nasa.jpl.oodt.cas.workflow.repo.datasource.jdbc.pass=pass
-gov.nasa.jpl.oodt.cas.workflow.repo.datasource.jdbc.driver=your.jdbc.Driver
+org.apache.oodt.cas.workflow.repo.datasource.jdbc.url=jdbc:url
+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

Modified: incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.jpg
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.jpg?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.psd
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/resources/images/cas-workflow.psd?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/oodt/trunk/workflow/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/site.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/site.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/site.xml Fri Jul 16 15:20:10 2010
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2008 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
-<project name="cas-workflow" href="http://oodt.jpl.nasa.gov/cas-workflow/">
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+<project name="cas-workflow">
 
   <body>
     <links>
@@ -21,4 +29,4 @@
       <item name="Advanced User Guide" href="user/advanced.html"/>
     </menu>
   </body>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml Fri Jul 16 15:20:10 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2006 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS File Manager Developer Guide</title>
@@ -294,4 +303,4 @@
       
       </section>
    </body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/development/maven.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/development/maven.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/development/maven.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/development/maven.xml Fri Jul 16 15:20:10 2010
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
-
 <document>
   <properties>
     <title>Using Maven</title>
@@ -164,4 +172,4 @@ mvn [command] --non-recursive
       </ul>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml Fri Jul 16 15:20:10 2010
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
-
 <document>
   <properties>
     <title>Using Subversion</title>
@@ -15,14 +23,14 @@ $Id$
 
   <body>
     <section name="Using Subversion">
-      <p>The OODT repository is accessible from:
+      <p>The Apache OODT repository is accessible from:
       </p>
 
       <source>
-http://oodt.jpl.nasa.gov/repo
+          https://svn.apache.org/repos/asf/incubator/oodt
       </source>
 
-      <p>A JPL user name and password are required to access the repository. We
+      <p>We
       recommend that you use a Subversion client to interact with the repository. 
       The client application is normally installed on *nix systems configured for
       development work. If the client application is required on a user's local 
@@ -243,4 +251,4 @@ svn delete
       </ul>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml Fri Jul 16 15:20:10 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS Workflow Manager User Guide</title>
@@ -47,4 +56,4 @@
       </section>
       
    </body>
-</document> 
\ No newline at end of file
+</document> 

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml Fri Jul 16 15:20:10 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2008 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS Workflow Manager User Guide</title>
@@ -190,7 +199,7 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
        <ul>     
          <li>Specify the path to the directory where the Workflow Manager will create the
          Lucene index and associated files by setting the 
-         <code>gov.nasa.jpl.oodt.cas.workflow.instanceRep.lucene.idxPath</code> property
+         <code>org.apache.oodt.cas.workflow.instanceRep.lucene.idxPath</code> property
          to <code>$WORKFLOW_HOME/repo</code>. Make sure that this directory does
          NOT exist the time you run the Workflow Manager. If the Workflow Manager does 
          not find a directory at thie specified location, it will create all of the 
@@ -198,7 +207,7 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
          
          <li>Specify the path to the directory where the XML policy files are stored 
          for the the XML Workflow Repository. This path is set by 
-         <code>gov.nasa.jpl.oodt.cas.workflow.repo.dirs</code>. The 
+         <code>org.apache.oodt.cas.workflow.repo.dirs</code>. The 
          default location (and default policy files) are located at 
          <code>$WORKFLOW_HOME/policy</code> in the vanilla deployment of the Workflow Manager.
          Note that these properties need to be fully specified URLs (e.g., they should 
@@ -305,20 +314,20 @@ INFO: Executing task: [Goodbye World] lo
        <table>
          <tr>
            <td>workflow.repo.factory</td>
-           <td>gov.nasa.jpl.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory<br/>
-               gov.nasa.jpl.oodt.cas.workflow.repository.DataSourceWorkflowRepositoryFactory
+           <td>org.apache.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory<br/>
+               org.apache.oodt.cas.workflow.repository.DataSourceWorkflowRepositoryFactory
            </td>
          </tr>
          <tr>
            <td>workflow.engine.factory</td>
-           <td>gov.nasa.jpl.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
+           <td>org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
            </td>
          </tr>
          <tr>
            <td>workflow.instRep.factory</td>
-           <td>gov.nasa.jpl.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory<br/>
-               gov.nasa.jpl.oodt.cas.workflow.instrepo.DataSourceWorkflowInstanceRepositoryFactory<br/>
-               gov.nasa.jpl.oodt.cas.workflow.instrepo.MemoryWorkflowInstanceRepositoryFactory
+           <td>org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory<br/>
+               org.apache.oodt.cas.workflow.instrepo.DataSourceWorkflowInstanceRepositoryFactory<br/>
+               org.apache.oodt.cas.workflow.instrepo.MemoryWorkflowInstanceRepositoryFactory
            </td>
          </tr>
        </table>
@@ -328,4 +337,4 @@ INFO: Executing task: [Goodbye World] lo
       
    </body>
    
-</document>
\ No newline at end of file
+</document>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml Fri Jul 16 15:20:10 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS Workflow Manager User Guide</title>
@@ -38,4 +47,4 @@
       common data and computation management scenarios.</p> 
 
    </body>
-</document> 
\ No newline at end of file
+</document> 

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestThreadPoolWorkflowEngine.java Fri Jul 16 15:20:10 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.commons.util.DateConvert;
 
 //JDK imports
 import java.util.Date;

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/examples/TestExternScriptTaskInstance.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/examples/TestExternScriptTaskInstance.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/examples/TestExternScriptTaskInstance.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/examples/TestExternScriptTaskInstance.java Fri Jul 16 15:20:10 2010
@@ -16,12 +16,12 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.examples;
+package org.apache.oodt.cas.workflow.examples;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.RepositoryException;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/instrepo/TestLuceneWorkflowInstanceRepository.java Fri Jul 16 15:20:10 2010
@@ -16,17 +16,17 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.instrepo;
+package org.apache.oodt.cas.workflow.instrepo;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.Workflow;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowCondition;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowStatus;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowStatus;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
 
 //JDK imports
 import java.io.File;

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java Fri Jul 16 15:20:10 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.repository;
+package org.apache.oodt.cas.workflow.repository;
 
 //JDK imports
 import java.io.File;
@@ -26,13 +26,13 @@ import java.sql.SQLException;
 import javax.sql.DataSource;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
-import gov.nasa.jpl.oodt.cas.commons.database.SqlScript;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowCondition;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.RepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
+import org.apache.oodt.commons.database.SqlScript;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 
 //Junit imports
 import junit.framework.TestCase;

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/repository/TestWorkflowRepository.java Fri Jul 16 15:20:10 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.repository;
+package org.apache.oodt.cas.workflow.repository;
 
 //Junit imports
 import junit.framework.TestCase;
@@ -27,13 +27,13 @@ import java.util.List;
 import java.util.Vector;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.Workflow;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowCondition;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.RepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/util/TestGenericWorkflowObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/util/TestGenericWorkflowObjectFactory.java?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/util/TestGenericWorkflowObjectFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/util/TestGenericWorkflowObjectFactory.java Fri Jul 16 15:20:10 2010
@@ -16,11 +16,11 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.util;
+package org.apache.oodt.cas.workflow.util;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
 
 //Junit imports
 import junit.framework.TestCase;
@@ -36,7 +36,7 @@ import junit.framework.TestCase;
 public class TestGenericWorkflowObjectFactory extends TestCase {
 
 	public void testCreateTask() {
-		String taskClass = "gov.nasa.jpl.oodt.cas.workflow.examples.LongTask";
+		String taskClass = "org.apache.oodt.cas.workflow.examples.LongTask";
 
 		WorkflowTaskInstance taskInst = GenericWorkflowObjectFactory
 				.getTaskObjectFromClassName(taskClass);
@@ -47,7 +47,7 @@ public class TestGenericWorkflowObjectFa
 	}
 
 	public void testCreateCondition() {
-		String condClass = "gov.nasa.jpl.oodt.cas.workflow.examples.LongCondition";
+		String condClass = "org.apache.oodt.cas.workflow.examples.LongCondition";
 
 		WorkflowConditionInstance condInst = GenericWorkflowObjectFactory
 				.getConditionObjectFromClassName(condClass);

Modified: incubator/oodt/trunk/workflow/src/testdata/myScript.sh
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/testdata/myScript.sh?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/testdata/myScript.sh (original)
+++ incubator/oodt/trunk/workflow/src/testdata/myScript.sh Fri Jul 16 15:20:10 2010
@@ -1,2 +1,16 @@
 #!/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
+#
+#     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.    
 echo Hi my first name is  $1 and my last name is $2. > ./src/testdata/myScript-Output.txt
\ No newline at end of file

Modified: incubator/oodt/trunk/workflow/src/testdata/test.logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/testdata/test.logging.properties?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/testdata/test.logging.properties (original)
+++ incubator/oodt/trunk/workflow/src/testdata/test.logging.properties Fri Jul 16 15:20:10 2010
@@ -1,8 +1,17 @@
-# Copyright (c) 2005 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $Id$
-
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.    
 
 # Specify the handlers to create in the root logger
 # (all loggers are children of the root logger)
@@ -21,19 +30,19 @@ java.util.logging.ConsoleHandler.formatt
 # Set the default logging level for the subsystems
 
 # data structures subsystem
-gov.nasa.jpl.oodt.cas.workflow.structs.level = INFO
+org.apache.oodt.cas.workflow.structs.level = INFO
 
 # engine subsystem
-gov.nasa.jpl.oodt.cas.workflow.engine.level = INFO
+org.apache.oodt.cas.workflow.engine.level = INFO
 
 # instance repository subsystem
-gov.nasa.jpl.oodt.cas.workflow.instrepo.level = INFO
+org.apache.oodt.cas.workflow.instrepo.level = INFO
 
 # repository subsystem
-gov.nasa.jpl.oodt.cas.workflow.repository.level = INFO
+org.apache.oodt.cas.workflow.repository.level = INFO
 
 # system subsystem
-gov.nasa.jpl.oodt.cas.workflow.system.level = FINE
+org.apache.oodt.cas.workflow.system.level = FINE
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO

Modified: incubator/oodt/trunk/workflow/src/testdata/workflow.sql
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/testdata/workflow.sql?rev=964828&r1=964827&r2=964828&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/testdata/workflow.sql (original)
+++ incubator/oodt/trunk/workflow/src/testdata/workflow.sql Fri Jul 16 15:20:10 2010
@@ -1,3 +1,18 @@
+-- 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.    
+
 DROP TABLE workflows IF EXISTS;
 DROP TABLE event_workflow_map IF EXISTS;
 DROP TABLE workflow_tasks IF EXISTS;
@@ -62,7 +77,7 @@ CREATE TABLE workflow_condition_configur
 property_name varchar(1000) NOT NULL,
 property_value varchar(1000) NOT NULL);
 
-INSERT INTO workflow_conditions VALUES ('1', 'CheckCond', 'gov.nasa.jpl.oodt.cas.workflow.examples.CheckForMetadataKeys');
+INSERT INTO workflow_conditions VALUES ('1', 'CheckCond', 'org.apache.oodt.cas.workflow.examples.CheckForMetadataKeys');
 INSERT INTO workflow_condition_configuration VALUES ('1', 'reqMetKeys', 'Met1,Met2,Met3');
-INSERT INTO workflow_conditions VALUES ('2', 'FalseCond', 'gov.nasa.jpl.oodt.cas.workflow.examples.FalseCondition');
-INSERT INTO workflow_conditions VALUES ('3', 'TrueCond', 'gov.nasa.jpl.oodt.cas.workflow.examples.TrueCondition');
\ No newline at end of file
+INSERT INTO workflow_conditions VALUES ('2', 'FalseCond', 'org.apache.oodt.cas.workflow.examples.FalseCondition');
+INSERT INTO workflow_conditions VALUES ('3', 'TrueCond', 'org.apache.oodt.cas.workflow.examples.TrueCondition');



Mime
View raw message