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:19:06 UTC
svn commit: r961293 - in /incubator/oodt/trunk/resource/src/main/java:
gov/nasa/jpl/oodt/ org/ org/apache/ org/apache/oodt/
org/apache/oodt/cas/resource/batchmgr/ org/apache/oodt/cas/resource/examples/
org/apache/oodt/cas/resource/jobqueue/ org/apache/...
Author: ahart
Date: Wed Jul 7 08:19:05 2010
New Revision: 961293
URL: http://svn.apache.org/viewvc?rev=961293&view=rev
Log:
progress towards OODT-15: rename packages and imports to 'org.apache.*' (cas-resource)
Added:
incubator/oodt/trunk/resource/src/main/java/org/
incubator/oodt/trunk/resource/src/main/java/org/apache/
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/ (props changed)
- copied from r961256, incubator/oodt/trunk/resource/src/main/java/gov/nasa/jpl/oodt/
Removed:
incubator/oodt/trunk/resource/src/main/java/gov/nasa/jpl/oodt/
Modified:
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/HelloWorldJob.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/TestResmgr.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStackJobQueueFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepositoryFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitorFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUSchedulerFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/Job.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInstance.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobSpec.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/ResourceNode.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobExecutionException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobInputException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobQueueException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobRepositoryException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MonitorException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/SchedulerException.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitProperty.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
Propchange: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java Wed Jul 7 08:19:05 2010
@@ -16,14 +16,14 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.batchmgr;
+package org.apache.oodt.cas.resource.batchmgr;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
//java imports
import java.net.URL;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/BatchmgrFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.batchmgr;
+package org.apache.oodt.cas.resource.batchmgr;
/**
* @author woollard
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java Wed Jul 7 08:19:05 2010
@@ -16,18 +16,18 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.batchmgr;
+package org.apache.oodt.cas.resource.batchmgr;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobStatus;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobStatus;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
//JDK imports
import java.util.HashMap;
@@ -65,7 +65,7 @@ public class XmlRpcBatchMgr implements B
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr#executeRemotely(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec,
+ * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#executeRemotely(org.apache.oodt.cas.resource.structs.JobSpec,
* java.net.URL)
*/
public boolean executeRemotely(JobSpec jobSpec, ResourceNode resNode)
@@ -95,7 +95,7 @@ public class XmlRpcBatchMgr implements B
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr#setMonitor(gov.nasa.jpl.oodt.cas.resource.monitor.Monitor)
+ * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#setMonitor(org.apache.oodt.cas.resource.monitor.Monitor)
*/
public void setMonitor(Monitor monitor) {
this.mon = monitor;
@@ -105,7 +105,7 @@ public class XmlRpcBatchMgr implements B
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr#setJobRepository(gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository)
+ * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#setJobRepository(org.apache.oodt.cas.resource.jobrepo.JobRepository)
*/
public void setJobRepository(JobRepository repository) {
this.repo = repository;
@@ -114,7 +114,7 @@ public class XmlRpcBatchMgr implements B
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr#getExecutionNode(java.lang.String)
+ * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#getExecutionNode(java.lang.String)
*/
public String getExecutionNode(String jobId) {
return (String) nodeToJobMap.get(jobId);
@@ -123,8 +123,8 @@ public class XmlRpcBatchMgr implements B
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr#killJob(java.lang.String,
- * gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode)
+ * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#killJob(java.lang.String,
+ * org.apache.oodt.cas.resource.structs.ResourceNode)
*/
public boolean killJob(String jobId, ResourceNode node) {
JobSpec spec = null;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrFactory.java Wed Jul 7 08:19:05 2010
@@ -16,10 +16,10 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.batchmgr;
+package org.apache.oodt.cas.resource.batchmgr;
-import gov.nasa.jpl.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.resource.monitor.Monitor;
/**
* @author woollard
@@ -41,7 +41,7 @@ public class XmlRpcBatchMgrFactory imple
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.batchmgr.BatchmgrFactory#createBatchmgr()
+ * @see org.apache.oodt.cas.resource.batchmgr.BatchmgrFactory#createBatchmgr()
*/
public Batchmgr createBatchmgr() {
return new XmlRpcBatchMgr();
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgrProxy.java Wed Jul 7 08:19:05 2010
@@ -16,17 +16,17 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.batchmgr;
+package org.apache.oodt.cas.resource.batchmgr;
//JDK imports
import java.io.IOException;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlRpcStructFactory;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
//APACHE imports
import org.apache.xmlrpc.XmlRpcClient;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/HelloWorldJob.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/HelloWorldJob.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/HelloWorldJob.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/HelloWorldJob.java Wed Jul 7 08:19:05 2010
@@ -16,14 +16,14 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.examples;
+package org.apache.oodt.cas.resource.examples;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.metadata.JobMetadata;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInstance;
-import gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobInputException;
+import org.apache.oodt.cas.resource.metadata.JobMetadata;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobInstance;
+import org.apache.oodt.cas.resource.structs.NameValueJobInput;
+import org.apache.oodt.cas.resource.structs.exceptions.JobInputException;
/**
*
@@ -39,7 +39,7 @@ public class HelloWorldJob implements Jo
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.structs.JobInstance#execute(gov.nasa.jpl.oodt.cas.resource.structs.JobInput)
+ * @see org.apache.oodt.cas.resource.structs.JobInstance#execute(org.apache.oodt.cas.resource.structs.JobInput)
*/
public boolean execute(JobInput in) throws JobInputException {
if (!(in instanceof NameValueJobInput)) {
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/LongJob.java Wed Jul 7 08:19:05 2010
@@ -16,14 +16,14 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.examples;
+package org.apache.oodt.cas.resource.examples;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.metadata.JobMetadata;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInstance;
-import gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobInputException;
+import org.apache.oodt.cas.resource.metadata.JobMetadata;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobInstance;
+import org.apache.oodt.cas.resource.structs.NameValueJobInput;
+import org.apache.oodt.cas.resource.structs.exceptions.JobInputException;
/**
*
@@ -39,7 +39,7 @@ public class LongJob implements JobInsta
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.structs.JobInstance#execute(gov.nasa.jpl.oodt.cas.resource.structs.JobInput)
+ * @see org.apache.oodt.cas.resource.structs.JobInstance#execute(org.apache.oodt.cas.resource.structs.JobInput)
*/
public boolean execute(JobInput in) throws JobInputException {
if (!(in instanceof NameValueJobInput)) {
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/TestResmgr.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/TestResmgr.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/TestResmgr.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/TestResmgr.java Wed Jul 7 08:19:05 2010
@@ -16,12 +16,12 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.examples;
+package org.apache.oodt.cas.resource.examples;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput;
-import gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.NameValueJobInput;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
//JDK imports
import java.net.URL;
@@ -50,8 +50,8 @@ public class TestResmgr {
managerUrl);
Job hw1 = new Job("JobOne", "HelloWorldJob",
- "gov.nasa.jpl.oodt.cas.resource.examples.HelloWorldJob",
- "gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput", "quick",
+ "org.apache.oodt.cas.resource.examples.HelloWorldJob",
+ "org.apache.oodt.cas.resource.structs.NameValueJobInput", "quick",
new Integer(1));
NameValueJobInput hw1Input = new NameValueJobInput();
hw1Input.setNameValuePair("user.name", "Dave");
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueue.java Wed Jul 7 08:19:05 2010
@@ -16,15 +16,15 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobqueue;
+package org.apache.oodt.cas.resource.jobqueue;
//JDK imports
import java.util.List;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobQueueException;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobQueueFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobqueue;
+package org.apache.oodt.cas.resource.jobqueue;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStack.java Wed Jul 7 08:19:05 2010
@@ -16,14 +16,14 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobqueue;
+package org.apache.oodt.cas.resource.jobqueue;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobStatus;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobQueueException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.JobStatus;
+import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
//JAVA imports
import java.util.List;
@@ -63,7 +63,7 @@ public class JobStack implements JobQueu
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#addJob(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#addJob(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public String addJob(JobSpec spec) throws JobQueueException {
String jobId = safeAddJob(spec);
@@ -83,7 +83,7 @@ public class JobStack implements JobQueu
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#getQueuedJobs()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#getQueuedJobs()
*/
public List getQueuedJobs() throws JobQueueException {
return queue;
@@ -92,7 +92,7 @@ public class JobStack implements JobQueu
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#purge()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#purge()
*/
public void purge() throws JobQueueException {
queue.removeAllElements();
@@ -102,14 +102,14 @@ public class JobStack implements JobQueu
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#isEmpty()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#isEmpty()
*/
public boolean isEmpty() {
return queue.isEmpty();
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#getNextJob()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#getNextJob()
*/
public JobSpec getNextJob() throws JobQueueException {
JobSpec spec = (JobSpec)queue.remove(0);
@@ -122,7 +122,7 @@ public class JobStack implements JobQueu
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue#getJobRepository()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueue#getJobRepository()
*/
public JobRepository getJobRepository() {
return repo;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStackJobQueueFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStackJobQueueFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStackJobQueueFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobqueue/JobStackJobQueueFactory.java Wed Jul 7 08:19:05 2010
@@ -16,10 +16,10 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobqueue;
+package org.apache.oodt.cas.resource.jobqueue;
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
/**
* @author mattmann
@@ -39,7 +39,7 @@ public class JobStackJobQueueFactory imp
public JobStackJobQueueFactory() {
String stackSizeStr = System
- .getProperty("gov.nasa.jpl.oodt.cas.resource.jobqueue.jobstack.maxstacksize");
+ .getProperty("org.apache.oodt.cas.resource.jobqueue.jobstack.maxstacksize");
if (stackSizeStr != null) {
stackSize = Integer.parseInt(stackSizeStr);
@@ -47,7 +47,7 @@ public class JobStackJobQueueFactory imp
String jobRepoFactoryClassStr = System.getProperty(
"resource.jobrepo.factory",
- "gov.nasa.jpl.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory");
+ "org.apache.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory");
this.repo = GenericResourceManagerObjectFactory
.getJobRepositoryFromServiceFactory(jobRepoFactoryClassStr);
}
@@ -55,7 +55,7 @@ public class JobStackJobQueueFactory imp
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueueFactory#createQueue()
+ * @see org.apache.oodt.cas.resource.jobqueue.JobQueueFactory#createQueue()
*/
public JobQueue createQueue() {
return new JobStack(stackSize, repo);
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepository.java Wed Jul 7 08:19:05 2010
@@ -16,11 +16,11 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobrepo;
+package org.apache.oodt.cas.resource.jobrepo;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/JobRepositoryFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobrepo;
+package org.apache.oodt.cas.resource.jobrepo;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobrepo;
+package org.apache.oodt.cas.resource.jobrepo;
//JDK imports
import java.util.Date;
@@ -24,9 +24,9 @@ import java.util.HashMap;
//OODT imports
import jpl.eda.util.DateConvert;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobStatus;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.JobStatus;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
/**
* @author mattmann
@@ -49,7 +49,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#addJob(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#addJob(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public String addJob(JobSpec spec) throws JobRepositoryException {
// need to generate a JobId for this job
@@ -66,7 +66,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#getStatus(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#getStatus(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public String getStatus(JobSpec spec) throws JobRepositoryException {
JobSpec persistedSpec = (JobSpec) jobMap.get(spec.getJob().getId());
@@ -76,7 +76,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#jobFinished(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#jobFinished(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public boolean jobFinished(JobSpec spec) throws JobRepositoryException {
JobSpec persistedSpec = (JobSpec) jobMap.get(spec.getJob().getId());
@@ -86,7 +86,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#removeJob(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#removeJob(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public void removeJob(JobSpec spec) throws JobRepositoryException {
if (jobMap.remove(spec.getJob().getId()) == null) {
@@ -99,7 +99,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#updateJob(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#updateJob(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public void updateJob(JobSpec spec) throws JobRepositoryException {
jobMap.put(spec.getJob().getId(), spec);
@@ -109,7 +109,7 @@ public class MemoryJobRepository impleme
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository#getJobById(java.lang.String)
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepository#getJobById(java.lang.String)
*/
public JobSpec getJobById(String jobId) throws JobRepositoryException {
return (JobSpec) jobMap.get(jobId);
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepositoryFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepositoryFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepositoryFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobrepo;
+package org.apache.oodt.cas.resource.jobrepo;
/**
* @author mattmann
@@ -30,7 +30,7 @@ public class MemoryJobRepositoryFactory
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepositoryFactory#createRepository()
+ * @see org.apache.oodt.cas.resource.jobrepo.JobRepositoryFactory#createRepository()
*/
public JobRepository createRepository() {
return new MemoryJobRepository();
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/metadata/JobMetadata.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.metadata;
+package org.apache.oodt.cas.resource.metadata;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.monitor;
+package org.apache.oodt.cas.resource.monitor;
//JDK imports
import java.io.File;
@@ -39,10 +39,10 @@ import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
//OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlStructFactory;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.resource.util.XmlStructFactory;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
/**
*
@@ -94,8 +94,8 @@ public class AssignmentMonitor implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.Monitor#assignLoad(
- * gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode, int)
+ * @see org.apache.oodt.cas.resource.monitor.Monitor#assignLoad(
+ * org.apache.oodt.cas.resource.structs.ResourceNode, int)
*/
public boolean assignLoad(ResourceNode node, int loadValue)
throws MonitorException {
@@ -128,7 +128,7 @@ public class AssignmentMonitor implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.Monitor#getLoad(gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode)
+ * @see org.apache.oodt.cas.resource.monitor.Monitor#getLoad(org.apache.oodt.cas.resource.structs.ResourceNode)
*/
public int getLoad(ResourceNode node) throws MonitorException {
ResourceNode resource = (ResourceNode) nodesMap.get(node.getNodeId());
@@ -139,7 +139,7 @@ public class AssignmentMonitor implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.Monitor#getNodes()
+ * @see org.apache.oodt.cas.resource.monitor.Monitor#getNodes()
*/
public List getNodes() throws MonitorException {
return Arrays.asList(nodesMap.values().toArray());
@@ -148,7 +148,7 @@ public class AssignmentMonitor implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.Monitor#getNodeById(java.lang.String)
+ * @see org.apache.oodt.cas.resource.monitor.Monitor#getNodeById(java.lang.String)
*/
public ResourceNode getNodeById(String nodeId) throws MonitorException {
return (ResourceNode) nodesMap.get(nodeId);
@@ -157,7 +157,7 @@ public class AssignmentMonitor implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.Monitor#getNodeByURL(java.net.URL)
+ * @see org.apache.oodt.cas.resource.monitor.Monitor#getNodeByURL(java.net.URL)
*/
public ResourceNode getNodeByURL(URL ipAddr) throws MonitorException {
ResourceNode targetResource = null;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitorFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitorFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitorFactory.java Wed Jul 7 08:19:05 2010
@@ -16,10 +16,10 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.monitor;
+package org.apache.oodt.cas.resource.monitor;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.metadata.util.PathUtils;
//JDK imports
import java.util.Arrays;
@@ -40,7 +40,7 @@ public class AssignmentMonitorFactory im
public AssignmentMonitorFactory() {
String nodesDirUris = System
- .getProperty("gov.nasa.jpl.oodt.cas.resource.monitor.nodes.dirs");
+ .getProperty("org.apache.oodt.cas.resource.monitor.nodes.dirs");
if (nodesDirUris != null) {
/* do env var replacement */
@@ -51,7 +51,7 @@ public class AssignmentMonitorFactory im
}
/* (non-Javadoc)
- * @see gov.nasa.jpl.oodt.cas.resource.monitor.MonitorFactory#createMonitor()
+ * @see org.apache.oodt.cas.resource.monitor.MonitorFactory#createMonitor()
*/
public Monitor createMonitor() {
if (nodesDirList != null) {
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/Monitor.java Wed Jul 7 08:19:05 2010
@@ -16,15 +16,15 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.monitor;
+package org.apache.oodt.cas.resource.monitor;
//JDK imports
import java.util.List;
import java.net.URL;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
/**
*
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MonitorFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.monitor;
+package org.apache.oodt.cas.resource.monitor;
/**
* @author woollard
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.scheduler;
+package org.apache.oodt.cas.resource.scheduler;
//JDKimports
import java.lang.Integer;
@@ -37,17 +37,17 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr;
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobQueueException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.SchedulerException;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlStructFactory;
+import org.apache.oodt.cas.resource.jobqueue.JobQueue;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException;
+import org.apache.oodt.cas.resource.util.XmlStructFactory;
/**
*
@@ -103,7 +103,7 @@ public class LRUScheduler implements Sch
myJobQueue = q;
String waitStr = System.getProperty(
- "gov.nasa.jpl.oodt.cas.resource.scheduler.wait.seconds", "20");
+ "org.apache.oodt.cas.resource.scheduler.wait.seconds", "20");
waitTime = Integer.parseInt(waitStr);
}
@@ -155,7 +155,7 @@ public class LRUScheduler implements Sch
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler#schedule(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.scheduler.Scheduler#schedule(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public synchronized boolean schedule(JobSpec spec)
throws SchedulerException {
@@ -211,7 +211,7 @@ public class LRUScheduler implements Sch
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler#getBatchmgr()
+ * @see org.apache.oodt.cas.resource.scheduler.Scheduler#getBatchmgr()
*/
public Batchmgr getBatchmgr() {
return myBatchmgr;
@@ -220,7 +220,7 @@ public class LRUScheduler implements Sch
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler#getMonitor()
+ * @see org.apache.oodt.cas.resource.scheduler.Scheduler#getMonitor()
*/
public Monitor getMonitor() {
return myMonitor;
@@ -229,7 +229,7 @@ public class LRUScheduler implements Sch
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler#getJobQueue()
+ * @see org.apache.oodt.cas.resource.scheduler.Scheduler#getJobQueue()
*/
public JobQueue getJobQueue() {
return myJobQueue;
@@ -238,7 +238,7 @@ public class LRUScheduler implements Sch
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler#nodeAvailable(gov.nasa.jpl.oodt.cas.resource.structs.JobSpec)
+ * @see org.apache.oodt.cas.resource.scheduler.Scheduler#nodeAvailable(org.apache.oodt.cas.resource.structs.JobSpec)
*/
public synchronized ResourceNode nodeAvailable(JobSpec spec)
throws SchedulerException {
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUSchedulerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUSchedulerFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUSchedulerFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUSchedulerFactory.java Wed Jul 7 08:19:05 2010
@@ -16,18 +16,18 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.scheduler;
+package org.apache.oodt.cas.resource.scheduler;
//JAVA imports
import java.util.Arrays;
import java.util.List;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr;
+import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.resource.jobqueue.JobQueue;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
/**
* @author woollard
@@ -57,7 +57,7 @@ public class LRUSchedulerFactory impleme
public LRUSchedulerFactory() {
String queuesDirUris = System
- .getProperty("gov.nasa.jpl.oodt.cas.resource.scheduler.nodetoqueues.dirs");
+ .getProperty("org.apache.oodt.cas.resource.scheduler.nodetoqueues.dirs");
if (queuesDirUris != null) {
/* do env var replacement */
@@ -67,12 +67,12 @@ public class LRUSchedulerFactory impleme
}
String batchmgrClassStr = System.getProperty("resource.batchmgr.factory",
- "gov.nasa.jpl.oodt.cas.resource.batchmgr.XmlRpcBatchmgrFactory");
+ "org.apache.oodt.cas.resource.batchmgr.XmlRpcBatchmgrFactory");
String monitorClassStr = System.getProperty("resource.monitor.factory",
- "gov.nasa.jpl.oodt.cas.resource.monitor.AssignmentMonitorFactory");
+ "org.apache.oodt.cas.resource.monitor.AssignmentMonitorFactory");
String jobQueueClassStr = System.getProperty("resource.jobqueue.factory",
- "gov.nasa.jpl.oodt.cas.resource.jobqueue.JobStackJobQueueFactory");
+ "org.apache.oodt.cas.resource.jobqueue.JobStackJobQueueFactory");
batcher = GenericResourceManagerObjectFactory
.getBatchmgrServiceFromFactory(batchmgrClassStr);
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/Scheduler.java Wed Jul 7 08:19:05 2010
@@ -16,15 +16,15 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.scheduler;
+package org.apache.oodt.cas.resource.scheduler;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr;
-import gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.SchedulerException;
+import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
+import org.apache.oodt.cas.resource.jobqueue.JobQueue;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException;
/**
* @author woollard
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SchedulerFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.scheduler;
+package org.apache.oodt.cas.resource.scheduler;
/**
* @author woollard
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/Job.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/Job.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/Job.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/Job.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInput.java Wed Jul 7 08:19:05 2010
@@ -16,11 +16,11 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.util.Configurable;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlRpcWriteable;
+import org.apache.oodt.cas.resource.util.Configurable;
+import org.apache.oodt.cas.resource.util.XmlRpcWriteable;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInstance.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInstance.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInstance.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobInstance.java Wed Jul 7 08:19:05 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobInputException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobInputException;
/**
* @author woollard
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobSpec.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobSpec.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobSpec.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobSpec.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/JobStatus.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/NameValueJobInput.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
//JDK imports
import java.util.Hashtable;
@@ -57,7 +57,7 @@ public class NameValueJobInput implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.structs.JobInput#getId()
+ * @see org.apache.oodt.cas.resource.structs.JobInput#getId()
*/
public String getId() {
return INPUT_ID;
@@ -66,7 +66,7 @@ public class NameValueJobInput implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.util.XmlRpcWriteable#read(java.lang.Object)
+ * @see org.apache.oodt.cas.resource.util.XmlRpcWriteable#read(java.lang.Object)
*/
public void read(Object in) {
// we want to make sure that we're reading in
@@ -88,7 +88,7 @@ public class NameValueJobInput implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.util.XmlRpcWriteable#write()
+ * @see org.apache.oodt.cas.resource.util.XmlRpcWriteable#write()
*/
public Object write() {
Hashtable writeable = new Hashtable();
@@ -106,7 +106,7 @@ public class NameValueJobInput implement
/*
* (non-Javadoc)
*
- * @see gov.nasa.jpl.oodt.cas.resource.util.Configurable#configure(java.util.Properties)
+ * @see org.apache.oodt.cas.resource.util.Configurable#configure(java.util.Properties)
*/
public void configure(Properties props) {
if (props != null) {
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/ResourceNode.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/ResourceNode.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/ResourceNode.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/ResourceNode.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs;
+package org.apache.oodt.cas.resource.structs;
//JAVA imports
import java.net.URL;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobExecutionException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobExecutionException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobExecutionException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobExecutionException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobInputException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobInputException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobInputException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobInputException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobQueueException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobQueueException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobQueueException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobQueueException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobRepositoryException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobRepositoryException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobRepositoryException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/JobRepositoryException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MonitorException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MonitorException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MonitorException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MonitorException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/SchedulerException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/SchedulerException.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/SchedulerException.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/SchedulerException.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.structs.exceptions;
+package org.apache.oodt.cas.resource.structs.exceptions;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java Wed Jul 7 08:19:05 2010
@@ -16,21 +16,21 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.system;
+package org.apache.oodt.cas.resource.system;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler;
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobQueueException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.SchedulerException;
-import gov.nasa.jpl.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlRpcStructFactory;
+import org.apache.oodt.cas.resource.scheduler.Scheduler;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException;
+import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
//APACHE imports
import org.apache.xmlrpc.WebServer;
@@ -73,9 +73,9 @@ public class XmlRpcResourceManager {
public XmlRpcResourceManager(int port) throws Exception {
// load properties from workflow manager properties file, if specified
- if (System.getProperty("gov.nasa.jpl.oodt.cas.resource.properties") != null) {
+ if (System.getProperty("org.apache.oodt.cas.resource.properties") != null) {
String configFile = System
- .getProperty("gov.nasa.jpl.oodt.cas.resource.properties");
+ .getProperty("org.apache.oodt.cas.resource.properties");
LOG.log(Level.INFO,
"Loading Resource Manager Configuration Properties from: ["
+ configFile + "]");
@@ -85,7 +85,7 @@ public class XmlRpcResourceManager {
String schedulerClassStr = System.getProperty(
"resource.scheduler.factory",
- "gov.nasa.jpl.oodt.cas.resource.scheduler.LRUSchedulerFactory");
+ "org.apache.oodt.cas.resource.scheduler.LRUSchedulerFactory");
scheduler = GenericResourceManagerObjectFactory
.getSchedulerServiceFromFactory(schedulerClassStr);
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.system;
+package org.apache.oodt.cas.resource.system;
//APACHE imports
import org.apache.xmlrpc.CommonsXmlRpcTransportFactory;
@@ -24,14 +24,14 @@ import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcException;
//OODTimports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobStatus;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobExecutionException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobRepositoryException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlRpcStructFactory;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobStatus;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
//JDK imports
import java.net.URL;
@@ -77,9 +77,9 @@ public class XmlRpcResourceManagerClient
*/
public XmlRpcResourceManagerClient(URL url) {
// set up the configuration, if there is any
- if (System.getProperty("gov.nasa.jpl.oodt.cas.resource.properties") != null) {
+ if (System.getProperty("org.apache.oodt.cas.resource.properties") != null) {
String configFile = System
- .getProperty("gov.nasa.jpl.oodt.cas.resource.properties");
+ .getProperty("org.apache.oodt.cas.resource.properties");
LOG.log(Level.INFO,
"Loading Resource Manager Configuration Properties from: ["
+ configFile + "]");
@@ -98,12 +98,12 @@ public class XmlRpcResourceManagerClient
url);
int connectionTimeoutMins = Integer
.getInteger(
- "gov.nasa.jpl.oodt.cas.resource.system.xmlrpc.connectionTimeout.minutes",
+ "org.apache.oodt.cas.resource.system.xmlrpc.connectionTimeout.minutes",
20).intValue();
int connectionTimeout = connectionTimeoutMins * 60 * 1000;
int requestTimeoutMins = Integer
.getInteger(
- "gov.nasa.jpl.oodt.cas.resource.system.xmlrpc.requestTimeout.minutes",
+ "org.apache.oodt.cas.resource.system.xmlrpc.requestTimeout.minutes",
60).intValue();
int requestTimeout = requestTimeoutMins * 60 * 1000;
transportFactory.setConnectionTimeout(connectionTimeout);
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.system.extern;
+package org.apache.oodt.cas.resource.system.extern;
//JDK imports
import java.util.Date;
@@ -28,13 +28,13 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInstance;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobException;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.JobInputException;
-import gov.nasa.jpl.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
-import gov.nasa.jpl.oodt.cas.resource.util.XmlRpcStructFactory;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobInstance;
+import org.apache.oodt.cas.resource.structs.exceptions.JobException;
+import org.apache.oodt.cas.resource.structs.exceptions.JobInputException;
+import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
//APACHE imports
import org.apache.xmlrpc.WebServer;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/JobSubmitter.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.tools;
+package org.apache.oodt.cas.resource.tools;
//JDK imports
import java.io.File;
@@ -26,10 +26,10 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-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.resource.util.JobBuilder;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.resource.util.JobBuilder;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/tools/RunDirJobSubmitter.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.tools;
+package org.apache.oodt.cas.resource.tools;
//JDK imports
import java.io.BufferedReader;
@@ -28,13 +28,13 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput;
-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.resource.util.JobBuilder;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.NameValueJobInput;
+import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
+import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
+import org.apache.oodt.cas.resource.util.JobBuilder;
/**
* @author cecilia
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Configurable.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import java.util.Properties;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/GenericResourceManagerObjectFactory.java Wed Jul 7 08:19:05 2010
@@ -16,25 +16,25 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.batchmgr.Batchmgr;
-import gov.nasa.jpl.oodt.cas.resource.batchmgr.BatchmgrFactory;
-import gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueue;
-import gov.nasa.jpl.oodt.cas.resource.jobqueue.JobQueueFactory;
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepositoryFactory;
-import gov.nasa.jpl.oodt.cas.resource.monitor.Monitor;
-import gov.nasa.jpl.oodt.cas.resource.monitor.MonitorFactory;
-import gov.nasa.jpl.oodt.cas.resource.scheduler.Scheduler;
-import gov.nasa.jpl.oodt.cas.resource.scheduler.SchedulerFactory;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInstance;
+import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
+import org.apache.oodt.cas.resource.batchmgr.BatchmgrFactory;
+import org.apache.oodt.cas.resource.jobqueue.JobQueue;
+import org.apache.oodt.cas.resource.jobqueue.JobQueueFactory;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.jobrepo.JobRepositoryFactory;
+import org.apache.oodt.cas.resource.monitor.Monitor;
+import org.apache.oodt.cas.resource.monitor.MonitorFactory;
+import org.apache.oodt.cas.resource.scheduler.Scheduler;
+import org.apache.oodt.cas.resource.scheduler.SchedulerFactory;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobInstance;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import java.io.File;
@@ -25,8 +25,8 @@ import java.io.FileInputStream;
import org.w3c.dom.Document;
//OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.resource.structs.JobSpec;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/Ulimit.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import java.io.BufferedReader;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitMetKeys.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitProperty.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitProperty.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitProperty.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/UlimitProperty.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java Wed Jul 7 08:19:05 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
//JDK imports
import java.net.MalformedURLException;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcWriteable.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
/**
* @author mattmann
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java?rev=961293&r1=961256&r2=961293&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java Wed Jul 7 08:19:05 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import java.net.URL;
@@ -29,11 +29,11 @@ import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
//OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
/**
* @author woollard