[Cogkit-svn] SF.net SVN: cogkit: [1887] trunk/current/src/cog/modules/abstraction-common /src/org/globus/cog/abstraction/xml

[<ha...@us...>]

Revision: 1887
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1887&view=rev
Author:   hategan
Date:     2008-02-12 09:20:25 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
is anybody using this stuff?

Modified Paths:
--------------
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphMarshaller.java
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphUnmarshaller.java
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskUnmarshaller.java

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphMarshaller.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphMarshaller.java	2008-02-12 17:11:11 UTC (rev 1886)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphMarshaller.java	2008-02-12 17:20:25 UTC (rev 1887)
@@ -118,6 +118,9 @@
 
             case Status.SUBMITTED :
                 return "Submitted";
+                
+            case Status.SUBMITTING :
+                return "Submitting";
 
             case Status.SUSPENDED :
                 return "Suspended";

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphUnmarshaller.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphUnmarshaller.java	2008-02-12 17:11:11 UTC (rev 1886)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskGraphUnmarshaller.java	2008-02-12 17:20:25 UTC (rev 1887)
@@ -167,6 +167,8 @@
             return Status.FAILED;
         } else if (statusString.equalsIgnoreCase("Resumed")) {
             return Status.RESUMED;
+        } else if (statusString.equalsIgnoreCase("Submitting")) {
+            return Status.SUBMITTING;
         } else if (statusString.equalsIgnoreCase("Submitted")) {
             return Status.SUBMITTED;
         } else if (statusString.equalsIgnoreCase("Suspended")) {

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java	2008-02-12 17:11:11 UTC (rev 1886)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java	2008-02-12 17:20:25 UTC (rev 1887)
@@ -97,16 +97,6 @@
 
         // set the task status
         xmlTask.setStatus(task.getStatus().getStatusString());
-
-        // set the task submitted and completed time
-        Calendar submittedTime = task.getSubmittedTime();
-        Calendar completedTime = task.getCompletedTime();
-        if (submittedTime != null) {
-            xmlTask.setSubmittedTime(submittedTime.getTime());
-        }
-        if (completedTime != null) {
-            xmlTask.setCompletedTime(completedTime.getTime());
-        }
     }
 
     private static void setServices(

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskUnmarshaller.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskUnmarshaller.java	2008-02-12 17:11:11 UTC (rev 1886)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskUnmarshaller.java	2008-02-12 17:20:25 UTC (rev 1887)
@@ -299,6 +299,8 @@
             return Status.FAILED;
         } else if (statusString.equalsIgnoreCase("Resumed")) {
             return Status.RESUMED;
+        } else if (statusString.equalsIgnoreCase("Submitting")) {
+            return Status.SUBMITTING;
         } else if (statusString.equalsIgnoreCase("Submitted")) {
             return Status.SUBMITTED;
         } else if (statusString.equalsIgnoreCase("Suspended")) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.