You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ah...@apache.org on 2010/07/07 10:30:01 UTC

svn commit: r961302 [1/2] - in /incubator/oodt/trunk/workflow/src/main/java: gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/ org/apache/oodt/cas/workflow/engine/ org/apache/oodt/cas/workflow/examples/ org/apache/oodt/cas/workflow/instrepo/ org/apa...

Author: ahart
Date: Wed Jul  7 08:29:59 2010
New Revision: 961302

URL: http://svn.apache.org/viewvc?rev=961302&view=rev
Log:
progress towards OODT-15: rename packages and imports to 'org.apache.*' (cas-workflow)

Added:
    incubator/oodt/trunk/workflow/src/main/java/org/
    incubator/oodt/trunk/workflow/src/main/java/org/apache/
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/   (props changed)
      - copied from r961256, incubator/oodt/trunk/workflow/src/main/java/gov/nasa/jpl/oodt/
Removed:
    incubator/oodt/trunk/workflow/src/main/java/gov/nasa/jpl/oodt/
Modified:
    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/NonBlockingShepardThread.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/NonBlockingThreadPoolWorkflowEngineFactory.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/engine/ThreadPoolWorkflowEngineFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorThread.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/ExternScriptTaskInstance.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/FalseCondition.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/GoodbyeWorld.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/HelloWorld.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongTask.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/NumIncrementTask.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/TrueCondition.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.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/instrepo/MemoryWorkflowInstanceRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleMetKeys.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleStage.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/WorkflowRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepositoryFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Workflow.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowCondition.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionConfiguration.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowConditionInstance.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstancePage.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowStatus.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTask.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskConfiguration.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowTaskInstance.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/exceptions/EngineException.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/exceptions/InstanceRepositoryException.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/exceptions/RepositoryException.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/exceptions/WorkflowTaskInstanceException.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/Pagination.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/ScriptFile.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlRpcStructFactory.java
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java

Propchange: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=961302&r1=961256&r2=961302&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 Wed Jul  7 08:29:59 2010
@@ -16,25 +16,25 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.metadata.CoreMetKeys;
-import gov.nasa.jpl.oodt.cas.workflow.structs.TaskJobInput;
-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.WorkflowTaskInstance;
-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.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.structs.TaskJobInput;
+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.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+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;
 
 //JDK imports
@@ -130,12 +130,12 @@ public class IterativeWorkflowProcessorT
          * satisfaction
          */
         waitForConditionSatisfy = Long.getLong(
-                "gov.nasa.jpl.oodt.cas.workflow.engine.preConditionWaitTime",
+                "org.apache.oodt.cas.workflow.engine.preConditionWaitTime",
                 10).longValue();
 
         pollingWaitTime = Long
                 .getLong(
-                        "gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime",
+                        "org.apache.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime",
                         10).longValue();
 
         wmgrParentUrl = wParentUrl;
@@ -247,9 +247,9 @@ public class IterativeWorkflowProcessorT
                 Job taskJob = new Job();
                 taskJob.setName(task.getTaskId());
                 taskJob
-                        .setJobInstanceClassName("gov.nasa.jpl.oodt.cas.workflow.structs.TaskJob");
+                        .setJobInstanceClassName("org.apache.oodt.cas.workflow.structs.TaskJob");
                 taskJob
-                        .setJobInputClassName("gov.nasa.jpl.oodt.cas.workflow.structs.TaskJobInput");
+                        .setJobInputClassName("org.apache.oodt.cas.workflow.structs.TaskJobInput");
                 taskJob.setLoadValue(new Integer(2));
                 taskJob.setQueueName(task.getTaskConfig().getProperty(
                         QUEUE_NAME) != null ? task.getTaskConfig()

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=961302&r1=961256&r2=961302&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 Wed Jul  7 08:29:59 2010
@@ -16,26 +16,26 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.metadata.CoreMetKeys;
-import gov.nasa.jpl.oodt.cas.workflow.structs.TaskJobInput;
-import gov.nasa.jpl.oodt.cas.workflow.structs.Workflow;
-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.WorkflowTaskInstance;
-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.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.structs.TaskJobInput;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+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.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+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;
 
 //JDK imports
@@ -117,7 +117,7 @@ public class NonBlockingIterativeWorkflo
 
         pollingWaitTime = Long
                 .getLong(
-                        "gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime",
+                        "org.apache.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime",
                         10).longValue();
 
         wmgrParentUrl = wParentUrl;
@@ -233,9 +233,9 @@ public class NonBlockingIterativeWorkflo
                 Job taskJob = new Job();
                 taskJob.setName(task.getTaskId());
                 taskJob
-                        .setJobInstanceClassName("gov.nasa.jpl.oodt.cas.workflow.structs.TaskJob");
+                        .setJobInstanceClassName("org.apache.oodt.cas.workflow.structs.TaskJob");
                 taskJob
-                        .setJobInputClassName("gov.nasa.jpl.oodt.cas.workflow.structs.TaskJobInput");
+                        .setJobInputClassName("org.apache.oodt.cas.workflow.structs.TaskJobInput");
                 taskJob.setLoadValue(new Integer(2));
                 taskJob.setQueueName(task.getTaskConfig().getProperty(
                         QUEUE_NAME) != null ? task.getTaskConfig()

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingShepardThread.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingShepardThread.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingShepardThread.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingShepardThread.java Wed Jul  7 08:29:59 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,16 +24,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.Vector;
 
-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.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.Workflow;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.EngineException;
-import gov.nasa.jpl.oodt.cas.workflow.metadata.CoreMetKeys;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
-import gov.nasa.jpl.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.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowStatus;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
+import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+import org.apache.oodt.cas.metadata.Metadata;
 
 public class NonBlockingShepardThread implements WorkflowStatus, CoreMetKeys, Runnable {
 

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=961302&r1=961256&r2=961302&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 Wed Jul  7 08:29:59 2010
@@ -16,23 +16,23 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient;
-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.WorkflowConditionInstance;
-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.exceptions.EngineException;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
-import gov.nasa.jpl.oodt.cas.workflow.engine.IterativeWorkflowProcessorThread;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.engine.NonBlockingShepardThread;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+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.exceptions.EngineException;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+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;
 
 //JDK imports
@@ -227,7 +227,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#pauseWorkflowInstance(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#pauseWorkflowInstance(java.lang.String)
      */
     public synchronized void pauseWorkflowInstance(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -251,7 +251,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#resumeWorkflowInstance(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#resumeWorkflowInstance(java.lang.String)
      */
     public synchronized void resumeWorkflowInstance(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -283,8 +283,8 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#startWorkflow(gov.nasa.jpl.oodt.cas.workflow.structs.Workflow,
-     *      gov.nasa.jpl.oodt.cas.metadata.Metadata)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#startWorkflow(org.apache.oodt.cas.workflow.structs.Workflow,
+     *      org.apache.oodt.cas.metadata.Metadata)
      */
     public synchronized WorkflowInstance startWorkflow(Workflow workflow,
             Metadata metadata) throws EngineException {
@@ -315,7 +315,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getInstanceRepository()
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getInstanceRepository()
      */
     public WorkflowInstanceRepository getInstanceRepository() {
         return this.instRep;
@@ -324,8 +324,8 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#updateMetadata(java.lang.String,
-     *      gov.nasa.jpl.oodt.cas.metadata.Metadata)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#updateMetadata(java.lang.String,
+     *      org.apache.oodt.cas.metadata.Metadata)
      */
     public synchronized boolean updateMetadata(String workflowInstId,
             Metadata met) {
@@ -357,7 +357,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#setWorkflowManagerUrl(java.net.URL)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#setWorkflowManagerUrl(java.net.URL)
      */
     public void setWorkflowManagerUrl(URL url) {
         this.wmgrUrl = url;
@@ -366,7 +366,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#stopWorkflow(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#stopWorkflow(java.lang.String)
      */
     public synchronized void stopWorkflow(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -386,7 +386,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getCurrentTaskWallClockMinutes(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getCurrentTaskWallClockMinutes(java.lang.String)
      */
     public double getCurrentTaskWallClockMinutes(String workflowInstId) {
         // get the workflow instance that we're talking about
@@ -397,7 +397,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getWorkflowInstanceMetadata(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getWorkflowInstanceMetadata(java.lang.String)
      */
     public Metadata getWorkflowInstanceMetadata(String workflowInstId) {
     	// okay, try and look up that worker
@@ -429,7 +429,7 @@ public class NonBlockingThreadPoolWorkfl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getWallClockMinutes(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getWallClockMinutes(java.lang.String)
      */
     public double getWallClockMinutes(String workflowInstId) {
         // get the workflow instance that we're talking about

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngineFactory.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngineFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngineFactory.java Wed Jul  7 08:29:59 2010
@@ -16,15 +16,15 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 
 /**
  * @author woollard
@@ -64,20 +64,20 @@ public class NonBlockingThreadPoolWorkfl
 	public NonBlockingThreadPoolWorkflowEngineFactory() throws InstantiationException{
 		// need to get the values for some of the default thread pool values
 		queueSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.queueSize", 10)
+				"org.apache.oodt.cas.workflow.engine.queueSize", 10)
 				.intValue();
 		maxPoolSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.maxPoolSize", 10)
+				"org.apache.oodt.cas.workflow.engine.maxPoolSize", 10)
 				.intValue();
 		minPoolSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.minPoolSize", 4)
+				"org.apache.oodt.cas.workflow.engine.minPoolSize", 4)
 				.intValue();
 		threadKeepAliveTime = Long
 				.getLong(
-						"gov.nasa.jpl.oodt.cas.workflow.engine.threadKeepAlive.minutes",
+						"org.apache.oodt.cas.workflow.engine.threadKeepAlive.minutes",
 						5).longValue();
 		unlimitedQueue = Boolean
-				.getBoolean("gov.nasa.jpl.oodt.cas.workflow.engine.unlimitedQueue");
+				.getBoolean("org.apache.oodt.cas.workflow.engine.unlimitedQueue");
 		
 		String instRepClazzName = System
 				.getProperty("workflow.engine.instanceRep.factory");
@@ -91,7 +91,7 @@ public class NonBlockingThreadPoolWorkfl
 
     // see if we are using a resource manager or not
     String resMgrUrlStr = System
-        .getProperty("gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.url");
+        .getProperty("org.apache.oodt.cas.workflow.engine.resourcemgr.url");
     if (resMgrUrlStr != null) {
       resMgrUrlStr = PathUtils.replaceEnvVariables(resMgrUrlStr);
       resMgrUrl = safeGetUrlFromString(resMgrUrlStr);
@@ -101,7 +101,7 @@ public class NonBlockingThreadPoolWorkfl
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngineFactory#createWorkflowEngine()
+	 * @see org.apache.oodt.cas.workflow.engine.WorkflowEngineFactory#createWorkflowEngine()
 	 */
 	public WorkflowEngine createWorkflowEngine() {
 		NonBlockingThreadPoolWorkflowEngine engine = new NonBlockingThreadPoolWorkflowEngine(workflowInstRep, queueSize, maxPoolSize,

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=961302&r1=961256&r2=961302&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 Wed Jul  7 08:29:59 2010
@@ -16,19 +16,19 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient;
-import gov.nasa.jpl.oodt.cas.workflow.structs.Workflow;
-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.exceptions.EngineException;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.engine.IterativeWorkflowProcessorThread;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+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.exceptions.EngineException;
+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;
 
 //JDK imports
@@ -126,7 +126,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#pauseWorkflowInstance(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#pauseWorkflowInstance(java.lang.String)
      */
     public synchronized void pauseWorkflowInstance(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -150,7 +150,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#resumeWorkflowInstance(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#resumeWorkflowInstance(java.lang.String)
      */
     public synchronized void resumeWorkflowInstance(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -182,8 +182,8 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#startWorkflow(gov.nasa.jpl.oodt.cas.workflow.structs.Workflow,
-     *      gov.nasa.jpl.oodt.cas.metadata.Metadata)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#startWorkflow(org.apache.oodt.cas.workflow.structs.Workflow,
+     *      org.apache.oodt.cas.metadata.Metadata)
      */
     public synchronized WorkflowInstance startWorkflow(Workflow workflow,
             Metadata metadata) throws EngineException {
@@ -222,7 +222,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getInstanceRepository()
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getInstanceRepository()
      */
     public WorkflowInstanceRepository getInstanceRepository() {
         return this.instRep;
@@ -231,8 +231,8 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#updateMetadata(java.lang.String,
-     *      gov.nasa.jpl.oodt.cas.metadata.Metadata)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#updateMetadata(java.lang.String,
+     *      org.apache.oodt.cas.metadata.Metadata)
      */
     public synchronized boolean updateMetadata(String workflowInstId,
             Metadata met) {
@@ -264,7 +264,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#setWorkflowManagerUrl(java.net.URL)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#setWorkflowManagerUrl(java.net.URL)
      */
     public void setWorkflowManagerUrl(URL url) {
         this.wmgrUrl = url;
@@ -273,7 +273,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#stopWorkflow(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#stopWorkflow(java.lang.String)
      */
     public synchronized void stopWorkflow(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -293,7 +293,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getCurrentTaskWallClockMinutes(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getCurrentTaskWallClockMinutes(java.lang.String)
      */
     public double getCurrentTaskWallClockMinutes(String workflowInstId) {
         // get the workflow instance that we're talking about
@@ -304,7 +304,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getWorkflowInstanceMetadata(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getWorkflowInstanceMetadata(java.lang.String)
      */
     public Metadata getWorkflowInstanceMetadata(String workflowInstId) {
         // okay, try and look up that worker thread in our hash map
@@ -337,7 +337,7 @@ public class ThreadPoolWorkflowEngine im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngine#getWallClockMinutes(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowEngine#getWallClockMinutes(java.lang.String)
      */
     public double getWallClockMinutes(String workflowInstId) {
         // get the workflow instance that we're talking about

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngineFactory.java Wed Jul  7 08:29:59 2010
@@ -16,15 +16,15 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
 
 /**
  * @author mattmann
@@ -64,20 +64,20 @@ public class ThreadPoolWorkflowEngineFac
 	public ThreadPoolWorkflowEngineFactory() throws InstantiationException{
 		// need to get the values for some of the default thread pool values
 		queueSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.queueSize", 10)
+				"org.apache.oodt.cas.workflow.engine.queueSize", 10)
 				.intValue();
 		maxPoolSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.maxPoolSize", 10)
+				"org.apache.oodt.cas.workflow.engine.maxPoolSize", 10)
 				.intValue();
 		minPoolSize = Integer.getInteger(
-				"gov.nasa.jpl.oodt.cas.workflow.engine.minPoolSize", 4)
+				"org.apache.oodt.cas.workflow.engine.minPoolSize", 4)
 				.intValue();
 		threadKeepAliveTime = Long
 				.getLong(
-						"gov.nasa.jpl.oodt.cas.workflow.engine.threadKeepAlive.minutes",
+						"org.apache.oodt.cas.workflow.engine.threadKeepAlive.minutes",
 						5).longValue();
 		unlimitedQueue = Boolean
-				.getBoolean("gov.nasa.jpl.oodt.cas.workflow.engine.unlimitedQueue");
+				.getBoolean("org.apache.oodt.cas.workflow.engine.unlimitedQueue");
 		
 		String instRepClazzName = System
 				.getProperty("workflow.engine.instanceRep.factory");
@@ -91,7 +91,7 @@ public class ThreadPoolWorkflowEngineFac
 
     // see if we are using a resource manager or not
     String resMgrUrlStr = System
-        .getProperty("gov.nasa.jpl.oodt.cas.workflow.engine.resourcemgr.url");
+        .getProperty("org.apache.oodt.cas.workflow.engine.resourcemgr.url");
     if (resMgrUrlStr != null) {
       resMgrUrlStr = PathUtils.replaceEnvVariables(resMgrUrlStr);
       resMgrUrl = safeGetUrlFromString(resMgrUrlStr);
@@ -101,7 +101,7 @@ public class ThreadPoolWorkflowEngineFac
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowEngineFactory#createWorkflowEngine()
+	 * @see org.apache.oodt.cas.workflow.engine.WorkflowEngineFactory#createWorkflowEngine()
 	 */
 	public WorkflowEngine createWorkflowEngine() {
 		return new ThreadPoolWorkflowEngine(workflowInstRep, queueSize, maxPoolSize,

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java Wed Jul  7 08:29:59 2010
@@ -16,16 +16,16 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 //OODT imports
 import java.net.URL;
 
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.EngineException;
-import gov.nasa.jpl.oodt.cas.workflow.structs.Workflow;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
+import org.apache.oodt.cas.workflow.structs.Workflow;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineFactory.java Wed Jul  7 08:29:59 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorThread.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorThread.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorThread.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorThread.java Wed Jul  7 08:29:59 2010
@@ -16,10 +16,10 @@
  */
 
 
-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 org.apache.oodt.cas.workflow.structs.WorkflowInstance;
 
 /**
  * @author mattmann

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java Wed Jul  7 08:29:59 2010
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.workflow.examples;
+package org.apache.oodt.cas.workflow.examples;
 
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
 
 public class CheckForMetadataKeys implements WorkflowConditionInstance {
 

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/ExternScriptTaskInstance.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/ExternScriptTaskInstance.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/ExternScriptTaskInstance.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/ExternScriptTaskInstance.java Wed Jul  7 08:29:59 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.examples;
+package org.apache.oodt.cas.workflow.examples;
 
 //Java imports
 import java.io.BufferedReader;
@@ -27,9 +27,9 @@ import java.util.Iterator;
 import java.util.List;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author davoodi
@@ -53,8 +53,8 @@ public class ExternScriptTaskInstance im
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(java.util.Map,
-     *      gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+     * @see org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(java.util.Map,
+     *      org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
      */
     public void run(Metadata metadata, WorkflowTaskConfiguration config) {
         List args = metadata.getAllMetadata("Args"); // command line

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/FalseCondition.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/FalseCondition.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/FalseCondition.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/FalseCondition.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowConditionConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -41,7 +41,7 @@ public class FalseCondition implements W
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(gov.nasa.jpl.oodt.cas.metadata.Metadata)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(org.apache.oodt.cas.metadata.Metadata)
 	 */
 	public boolean evaluate(Metadata metadata, WorkflowConditionConfiguration config) {
 		// TODO Auto-generated method stub

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/GoodbyeWorld.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/GoodbyeWorld.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/GoodbyeWorld.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/GoodbyeWorld.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -41,8 +41,8 @@ public class GoodbyeWorld implements Wor
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTasInstancek#run(gov.nasa.jpl.oodt.cas.metadata.Metadata, 
-	 * gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowTasInstancek#run(org.apache.oodt.cas.metadata.Metadata, 
+	 * org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
 	 */
 	public void run(Metadata metadata, WorkflowTaskConfiguration config) {
 		System.out.println("Goodbye World: "+config.getProperties().get("Person"));

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/HelloWorld.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/HelloWorld.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/HelloWorld.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/HelloWorld.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -40,8 +40,8 @@ public class HelloWorld implements Workf
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(java.util.Map, 
-	 * gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(java.util.Map, 
+	 * org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
 	 */
 	public void run(Metadata metadata, WorkflowTaskConfiguration config) {
 		System.out.println("Hello World: "+config.getProperties().get("Person"));

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowConditionConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -45,7 +45,7 @@ public class LongCondition implements Wo
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(gov.nasa.jpl.oodt.cas.metadata.Metadata)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(org.apache.oodt.cas.metadata.Metadata)
 	 */
     public boolean evaluate(Metadata metadata, WorkflowConditionConfiguration config) {
 		//simulate that this condition takes a passed in amount of seconds to wait for

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongTask.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongTask.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongTask.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongTask.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -42,8 +42,8 @@ public class LongTask implements Workflo
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(gov.nasa.jpl.oodt.cas.metadata.Metadata, 
-	 * gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(org.apache.oodt.cas.metadata.Metadata, 
+	 * org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
 	 */
 	public void run(Metadata metadata, WorkflowTaskConfiguration config) {
 		//simulate that this job takes a passed in amount of seconds to execute for

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/MailTask.java Wed Jul  7 08:29:59 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.examples;
+package org.apache.oodt.cas.workflow.examples;
 
 //JDK imports
 import java.util.Date;
@@ -29,10 +29,10 @@ import javax.mail.internet.InternetAddre
 import javax.mail.internet.MimeMessage;
 
 //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.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
 
 /**
  * 
@@ -49,9 +49,9 @@ public class MailTask implements Workflo
    * (non-Javadoc)
    * 
    * @see
-   * gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(gov.nasa
+   * org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(gov.nasa
    * .jpl.oodt.cas.metadata.Metadata,
-   * gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+   * org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
    */
   public void run(Metadata metadata, WorkflowTaskConfiguration config)
       throws WorkflowTaskInstanceException {

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/NumIncrementTask.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/NumIncrementTask.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/NumIncrementTask.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/NumIncrementTask.java Wed Jul  7 08:29:59 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.WorkflowTaskInstance;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
 
 /**
  * @author mattmann
@@ -40,8 +40,8 @@ public class NumIncrementTask implements
   /*
    * (non-Javadoc)
    * 
-   * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(gov.nasa.jpl.oodt.cas.metadata.Metadata,
-   *      gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+   * @see org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(org.apache.oodt.cas.metadata.Metadata,
+   *      org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
    */
   public void run(Metadata metadata, WorkflowTaskConfiguration config) {
     // read the num from the metadata, and then increment it

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java Wed Jul  7 08:29:59 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.examples;
+package org.apache.oodt.cas.workflow.examples;
 
 //JDK imports
 import java.net.MalformedURLException;
@@ -24,12 +24,12 @@ import java.net.URL;
 import java.util.Random;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManager;
-import gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
+import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager;
+import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
 
 /**
  * @author mattmann
@@ -53,8 +53,8 @@ public class RandomStatusUpdateTask impl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskInstance#run(gov.nasa.jpl.oodt.cas.metadata.Metadata,
-     *      gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
+     * @see org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance#run(org.apache.oodt.cas.metadata.Metadata,
+     *      org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration)
      */
     public void run(Metadata metadata, WorkflowTaskConfiguration config) {
         // the goal in this task to is randomly display statuses, and then sleep

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/TrueCondition.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/TrueCondition.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/TrueCondition.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/TrueCondition.java Wed Jul  7 08:29:59 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.workflow.structs.WorkflowConditionConfiguration;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionConfiguration;
+import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
+import org.apache.oodt.cas.metadata.Metadata;
 
 /**
  * @author mattmann
@@ -40,7 +40,7 @@ public class TrueCondition implements Wo
 	}
 
 	/* (non-Javadoc)
-	 * @see gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(gov.nasa.jpl.oodt.cas.metadata.Metadata)
+	 * @see org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance#evaluate(org.apache.oodt.cas.metadata.Metadata)
 	 */
     public boolean evaluate(Metadata metadata, WorkflowConditionConfiguration config) {
 		return true;

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java Wed Jul  7 08:29:59 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.instrepo;
+package org.apache.oodt.cas.workflow.instrepo;
 
 //JDK imports
 import java.util.Iterator;
@@ -26,10 +26,10 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstancePage;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.commons.pagination.PaginationUtils;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import org.apache.oodt.cas.commons.pagination.PaginationUtils;
 
 /**
  * @author mattmann
@@ -51,7 +51,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getFirstPage()
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getFirstPage()
      */
     public WorkflowInstancePage getFirstPage() {
         WorkflowInstancePage firstPage = null;
@@ -69,7 +69,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getLastPage()
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getLastPage()
      */
     public WorkflowInstancePage getLastPage() {
         WorkflowInstancePage lastPage = null;
@@ -88,7 +88,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getNextPage(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstancePage)
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getNextPage(org.apache.oodt.cas.workflow.structs.WorkflowInstancePage)
      */
     public WorkflowInstancePage getNextPage(WorkflowInstancePage currentPage) {
         if (currentPage == null) {
@@ -114,7 +114,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getPrevPage(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstancePage)
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getPrevPage(org.apache.oodt.cas.workflow.structs.WorkflowInstancePage)
      */
     public WorkflowInstancePage getPrevPage(WorkflowInstancePage currentPage) {
         if (currentPage == null) {
@@ -140,7 +140,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getPagedWorkflows(int)
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getPagedWorkflows(int)
      */
     public WorkflowInstancePage getPagedWorkflows(int pageNum)
             throws InstanceRepositoryException {
@@ -150,7 +150,7 @@ public abstract class AbstractPaginatibl
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.util.Pagination#getPagedWorkflows(int,
+     * @see org.apache.oodt.cas.workflow.util.Pagination#getPagedWorkflows(int,
      *      java.lang.String)
      */
     public WorkflowInstancePage getPagedWorkflows(int pageNum, String status)

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java Wed Jul  7 08:29:59 2010
@@ -16,15 +16,15 @@
  */
 
 
-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.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance;
-import gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask;
-import gov.nasa.jpl.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import gov.nasa.jpl.oodt.cas.workflow.util.DbStructFactory;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
+import org.apache.oodt.cas.workflow.structs.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
+import org.apache.oodt.cas.workflow.util.DbStructFactory;
 
 //JDK imports
 import java.net.URLDecoder;
@@ -72,7 +72,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#addWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#addWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void addWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -179,7 +179,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#updateWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#updateWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void updateWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -260,7 +260,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#removeWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#removeWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void removeWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -321,7 +321,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstanceById(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstanceById(java.lang.String)
      */
     public WorkflowInstance getWorkflowInstanceById(String workflowInstId)
             throws InstanceRepositoryException {
@@ -400,7 +400,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstances()
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstances()
      */
     public List getWorkflowInstances() throws InstanceRepositoryException {
         Connection conn = null;
@@ -480,7 +480,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstancesByStatus(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.engine.WorkflowInstanceRepository#getWorkflowInstancesByStatus(java.lang.String)
      */
     public List getWorkflowInstancesByStatus(String status)
             throws InstanceRepositoryException {
@@ -563,7 +563,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstances()
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstances()
      */
     public int getNumWorkflowInstances() throws InstanceRepositoryException {
         Connection conn = null;
@@ -635,7 +635,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstancesByStatus(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstancesByStatus(java.lang.String)
      */
     public int getNumWorkflowInstancesByStatus(String status)
             throws InstanceRepositoryException {

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java Wed Jul  7 08:29:59 2010
@@ -16,12 +16,12 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.instrepo;
+package org.apache.oodt.cas.workflow.instrepo;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
+import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory;
 
 //APACHE imports
 import org.apache.commons.dbcp.ConnectionFactory;
@@ -65,16 +65,16 @@ public class DataSourceWorkflowInstanceR
 
         jdbcUrl = PathUtils
                 .replaceEnvVariables(System
-                        .getProperty("gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.url"));
+                        .getProperty("org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.url"));
         user = PathUtils
                 .replaceEnvVariables(System
-                        .getProperty("gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.user"));
+                        .getProperty("org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.user"));
         pass = PathUtils
                 .replaceEnvVariables(System
-                        .getProperty("gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.pass"));
+                        .getProperty("org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.pass"));
         driver = PathUtils
                 .replaceEnvVariables(System
-                        .getProperty("gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.jdbc.driver"));
+                        .getProperty("org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.driver"));
 
         try {
             Class.forName(driver);
@@ -90,9 +90,9 @@ public class DataSourceWorkflowInstanceR
 
         dataSource = new PoolingDataSource(connectionPool);
         quoteFields = Boolean
-                .getBoolean("gov.nasa.jpl.oodt.cas.workflow.instanceRep.datasource.quoteFields");
+                .getBoolean("org.apache.oodt.cas.workflow.instanceRep.datasource.quoteFields");
         pageSize = Integer.getInteger(
-                "gov.nasa.jpl.oodt.cas.workflow.instanceRep.pageSize", 20)
+                "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20)
                 .intValue();
 
     }
@@ -100,7 +100,7 @@ public class DataSourceWorkflowInstanceR
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory#createInstanceRepository()
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory#createInstanceRepository()
      */
     public WorkflowInstanceRepository createInstanceRepository() {
         return new DataSourceWorkflowInstanceRepository(dataSource,

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java Wed Jul  7 08:29:59 2010
@@ -16,16 +16,16 @@
  */
 
 
-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.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.WorkflowTask;
+import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
+import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
 
 //JDK imports
 import java.io.File;
@@ -89,7 +89,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstances()
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstances()
      */
     public int getNumWorkflowInstances() throws InstanceRepositoryException {
         IndexSearcher searcher = null;
@@ -126,7 +126,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstancesByStatus(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getNumWorkflowInstancesByStatus(java.lang.String)
      */
     public int getNumWorkflowInstancesByStatus(String status)
             throws InstanceRepositoryException {
@@ -164,7 +164,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#addWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#addWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void addWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -179,7 +179,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#removeWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#removeWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void removeWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -190,7 +190,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#updateWorkflowInstance(gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#updateWorkflowInstance(org.apache.oodt.cas.workflow.structs.WorkflowInstance)
      */
     public synchronized void updateWorkflowInstance(WorkflowInstance wInst)
             throws InstanceRepositoryException {
@@ -201,7 +201,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstanceById(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstanceById(java.lang.String)
      */
     public WorkflowInstance getWorkflowInstanceById(String workflowInstId)
             throws InstanceRepositoryException {
@@ -246,7 +246,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstances()
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstances()
      */
     public List getWorkflowInstances() throws InstanceRepositoryException {
         IndexSearcher searcher = null;
@@ -291,7 +291,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstancesByStatus(java.lang.String)
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository#getWorkflowInstancesByStatus(java.lang.String)
      */
     public List getWorkflowInstancesByStatus(String status)
             throws InstanceRepositoryException {
@@ -337,7 +337,7 @@ public class LuceneWorkflowInstanceRepos
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.AbstractPaginatibleInstanceRepository#paginateWorkflows(int,
+     * @see org.apache.oodt.cas.workflow.instrepo.AbstractPaginatibleInstanceRepository#paginateWorkflows(int,
      *      java.lang.String)
      */
     protected List paginateWorkflows(int pageNum, String status)

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java?rev=961302&r1=961256&r2=961302&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepositoryFactory.java Wed Jul  7 08:29:59 2010
@@ -16,10 +16,10 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.workflow.instrepo;
+package org.apache.oodt.cas.workflow.instrepo;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
 
 /**
  * @author mattmann
@@ -40,25 +40,25 @@ public class LuceneWorkflowInstanceRepos
     public LuceneWorkflowInstanceRepositoryFactory()
             throws InstantiationException {
         indexFilePath = System
-                .getProperty("gov.nasa.jpl.oodt.cas.workflow.instanceRep.lucene.idxPath");
+                .getProperty("org.apache.oodt.cas.workflow.instanceRep.lucene.idxPath");
 
         if (indexFilePath == null) {
             throw new InstantiationException(
-                    "Index File property: [gov.nasa.jpl.oodt.cas.workflow."
+                    "Index File property: [org.apache.oodt.cas.workflow."
                             + "engine.lucene.idxPath] not set!");
         }
 
         // do env variable replacement
         indexFilePath = PathUtils.replaceEnvVariables(indexFilePath);
         pageSize = Integer.getInteger(
-                "gov.nasa.jpl.oodt.cas.workflow.instanceRep.pageSize", 20)
+                "org.apache.oodt.cas.workflow.instanceRep.pageSize", 20)
                 .intValue();
     }
 
     /*
      * (non-Javadoc)
      * 
-     * @see gov.nasa.jpl.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory#createInstanceRepository()
+     * @see org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory#createInstanceRepository()
      */
     public WorkflowInstanceRepository createInstanceRepository() {
         return new LuceneWorkflowInstanceRepository(indexFilePath, pageSize);