[Unicore-cvs-commits] unigrids/incubating/jsdl2ajo/src demo.java,1.3,1.4

[claudio c. <cl...@us...>]

Update of /cvsroot/unicore/unigrids/incubating/jsdl2ajo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11638/src

Modified Files:
	demo.java 
Log Message:
Add build.xml for library building through Ant.
some bug fixed:
- now the element CreationFlag uses values : "overwrite" and "dontOverwrite".
- the elements application name and version are ignored if the executable is specified.

Index: demo.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/incubating/jsdl2ajo/src/demo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** demo.java	8 Jul 2005 11:11:56 -0000	1.3
--- demo.java	31 Aug 2005 14:26:43 -0000	1.4
***************
*** 16,31 ****
  import org.unicore.ajo.*;
  
! import com.fujitsu.arcon.servlet.Connection;
! import com.fujitsu.arcon.servlet.Gateway;
! import com.fujitsu.arcon.servlet.Identity;
! import com.fujitsu.arcon.servlet.JobManager;
! import com.fujitsu.arcon.servlet.Reference;
! import com.fujitsu.arcon.servlet.VsiteManager;
! import com.fujitsu.arcon.servlet.VsiteTh;
  
  import ml.options.*;
  
  import com.cineca.jsdl2ajo.*;
- //import com.cineca.ajo2jsdl.*;
  
  /**
--- 16,24 ----
  import org.unicore.ajo.*;
  
! import com.fujitsu.arcon.servlet.*;
  
  import ml.options.*;
  
  import com.cineca.jsdl2ajo.*;
  
  /**
***************
*** 43,46 ****
--- 36,40 ----
      	boolean submit = false;
      	boolean save = false;
+     	boolean saveWithEndorser = false;
      	String saveDirName = "";
      	String keystore = "";
***************
*** 48,52 ****
      	String gateway = "";
      	String vname = "";
-     	Identity identity = null;
      	String[] otherArgs = {};
      	
--- 42,45 ----
***************
*** 58,61 ****
--- 51,55 ----
      								Options.Multiplicity.ZERO_OR_ONE);
      	opt.getSet().addOption("r", Options.Multiplicity.ZERO_OR_ONE);
+     	opt.getSet().addOption("u", Options.Multiplicity.ZERO_OR_ONE);
      	
      	if (!opt.check()) {
***************
*** 85,88 ****
--- 79,85 ----
      		submit = true;
      	}
+     	if (opt.getSet().isSet("u")) {
+     		saveWithEndorser = true;
+     	}
      	if (opt.getSet().isSet("s")) {
      		save = true;
***************
*** 113,125 ****
      		
              AbstractJob a;
-             String j;
              Enumeration e = items.elements();
              while( e.hasMoreElements()){
              	a = (AbstractJob) e.nextElement();
- /*            	
-             	AJO2JSDL jsdljob = new AJO2JSDL(a,"A");
-             	j = jsdljob.getJSDL();
-             	System.out.println(j);
- */            	
                 	if (submit) {
                 		if (a.getVsite() != null) {
--- 110,116 ----
***************
*** 137,140 ****
--- 128,135 ----
              	
              	if (save) {
+             		if (saveWithEndorser) {
+             			Identity identity = new Identity(keystore_file, password.toCharArray());
+             			a.setAJOEndorser(identity.getUser());
+             		}
              		String ajoName = (a.getName()).replaceAll(" ", "");
              		(new ObjectOutputStream(new FileOutputStream(saveDirName + ajoName + ".ajo"))).writeObject(a);
***************
*** 179,183 ****
  			Gateway gateway =
  				new Gateway(new Reference.SSL(gateway_url, identity));
- 			VsiteManager.reset();
  			VsiteManager.addGateway(gateway);
  			JobManager.listVsites(gateway);
--- 174,177 ----
***************
*** 272,276 ****
      private static void printUsage() {
          System.err.println("usage: demo [-c=fileconf] [-r]"+
!                            "[-s=dir] filename1 filename2 ... ");
      }	
  	
--- 266,270 ----
      private static void printUsage() {
          System.err.println("usage: demo [-c=fileconf] [-r]"+
!                            "[-u] [-s=dir] filename1 filename2 ... ");
      }