[Unicore-cvs-commits] SF.net SVN: unicore: [2754] hila/trunk

[<bj...@us...>]

Revision: 2754
          http://unicore.svn.sourceforge.net/unicore/?rev=2754&view=rev
Author:   bjoernh
Date:     2008-04-18 04:55:07 -0700 (Fri, 18 Apr 2008)

Log Message:
-----------
Unicore6Task can take JSDL helper from hila-common as job description

Modified Paths:
--------------
    hila/trunk/hila-common/src/main/java/de/fzj/hila/common/jsdl/JSDL.java
    hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java

Modified: hila/trunk/hila-common/src/main/java/de/fzj/hila/common/jsdl/JSDL.java
===================================================================
--- hila/trunk/hila-common/src/main/java/de/fzj/hila/common/jsdl/JSDL.java	2008-04-18 11:53:46 UTC (rev 2753)
+++ hila/trunk/hila-common/src/main/java/de/fzj/hila/common/jsdl/JSDL.java	2008-04-18 11:55:07 UTC (rev 2754)
@@ -163,4 +163,10 @@
     return this;
   }
 
+  
+  public JobDefinitionDocument getJsdl()
+  {
+    return jsdl;
+  }
+
 }

Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java
===================================================================
--- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java	2008-04-18 11:53:46 UTC (rev 2753)
+++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Task.java	2008-04-18 11:55:07 UTC (rev 2754)
@@ -48,6 +48,7 @@
 import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument;
 import org.unigrids.services.atomic.types.StatusInfoDocument;
 import org.unigrids.services.atomic.types.StatusInfoType;
+import org.unigrids.services.atomic.types.StatusType;
 import org.w3.x2005.x08.addressing.EndpointReferenceType;
 
 import de.fzj.hila.Locatable;
@@ -58,6 +59,7 @@
 import de.fzj.hila.Task;
 import de.fzj.hila.TaskStatus;
 import de.fzj.hila.common.baseimpl.BaseTask;
+import de.fzj.hila.common.jsdl.JSDL;
 import de.fzj.hila.exceptions.HiLAException;
 import de.fzj.hila.exceptions.HiLALocationSyntaxException;
 import de.fzj.unicore.uas.JobManagement;
@@ -410,9 +412,9 @@
 
   }
 
-  public void startSync(File... arg0) throws HiLAException
+  public void startSync(File... localFiles) throws HiLAException
   {
-    startASync(arg0);
+    startASync(localFiles);
     block();
   }
 
@@ -496,6 +498,9 @@
     {
       JobDefinitionDocument jsdl = (JobDefinitionDocument) jobdesc;
       return new Unicore6JSDLTask(site, jsdl);
+    } else if (jobdesc instanceof JSDL) {
+      JobDefinitionDocument jsdl = ((JSDL) jobdesc).getJsdl();
+      return new Unicore6JSDLTask(site, jsdl);
     }
     // else cover other possible job descriptions
     throw new HiLAException("Unknown job description type");


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