unicore-cvs-commits

[Donal K. F. <dk...@us...>]

Update of /cvsroot/unicore/unigrids/core/unicoregs/src/client/sample/brokerwsrf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18769/src/client/sample/brokerwsrf

Modified Files:
	BrokerDemoClient.java UnicoreWSRFBroker_Client.java 
Log Message:
Minor updates


Index: BrokerDemoClient.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/client/sample/brokerwsrf/BrokerDemoClient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BrokerDemoClient.java	20 Feb 2006 11:31:52 -0000	1.4
--- BrokerDemoClient.java	1 Mar 2006 16:35:47 -0000	1.5
***************
*** 3,11 ****
  import java.io.FileInputStream;
  import java.net.URL;
! import java.util.ArrayList;
! import java.util.Arrays;
! import java.util.Calendar;
! import java.util.Iterator;
! import java.util.List;
  
  import javax.xml.namespace.QName;
--- 3,7 ----
  import java.io.FileInputStream;
  import java.net.URL;
! import java.util.*;
  
  import javax.xml.namespace.QName;
***************
*** 23,40 ****
  import org.oasis.wsrf.resourceproperties.SetResourceProperties_Element;
  import org.oasis.wsrf.resourceproperties.UpdateType;
! import org.unigrids.services.atomic.broker.Broker;
! import org.unigrids.services.atomic.broker.BrokerAndRun;
! import org.unigrids.services.atomic.broker.BrokerAndRunResponse;
! import org.unigrids.services.atomic.broker.BrokerFactory;
! import org.unigrids.services.atomic.broker.BrokerFactoryServiceAddressingLocator;
! import org.unigrids.services.atomic.broker.BrokerProperties;
! import org.unigrids.services.atomic.broker.BrokerServiceAddressingLocator;
! import org.unigrids.services.atomic.broker.ClaimToken;
! import org.unigrids.services.atomic.broker.GetQoS;
! import org.unigrids.services.atomic.broker.GetQoSResponse;
! import org.unigrids.services.atomic.broker.InstantiateBroker;
! import org.unigrids.services.atomic.broker.InstantiateBrokerResponse;
! import org.unigrids.services.atomic.broker.QoS;
! import org.unigrids.services.atomic.broker.Ticket;
  import org.unigrids.services.wsrf.lt.ResourceLifetimePortType;
  import org.unigrids.services.wsrf.lt.ResourceLifetimeServiceLocator;
--- 19,23 ----
  import org.oasis.wsrf.resourceproperties.SetResourceProperties_Element;
  import org.oasis.wsrf.resourceproperties.UpdateType;
! import org.unigrids.services.atomic.broker.*;
  import org.unigrids.services.wsrf.lt.ResourceLifetimePortType;
  import org.unigrids.services.wsrf.lt.ResourceLifetimeServiceLocator;
***************
*** 141,145 ****
          Calendar c = Calendar.getInstance();
          c.add(Calendar.HOUR, 1);
!         return b.brokerAndRun(new BrokerAndRun(jsdl, new TerminationTime(c), info));
      }
  
--- 124,129 ----
          Calendar c = Calendar.getInstance();
          c.add(Calendar.HOUR, 1);
!         // TODO: Read the policy from the info file
!         return b.brokerAndRun(new BrokerAndRun(jsdl, new TerminationTime(c), null));
      }
  
***************
*** 187,191 ****
          System.out.println("\t\tstart time: (" + q.getStartTimeEarliest() + ") to (" + q.getStartTimeLatest() + ")");
          //
!         System.out.println("\tresource set: " + Arrays.asList(t.getResourceSet().get_null()));
          //
          System.out.println("\ttarget job id: " + t.getTargetJobID());
--- 171,178 ----
          System.out.println("\t\tstart time: (" + q.getStartTimeEarliest() + ") to (" + q.getStartTimeLatest() + ")");
          //
!         // Print as XML; it's much easier that way
!         System.out.println("\tresource set: " +
!             new MessageElement(Ticket.getTypeDesc().getElementNameForField("resourceSet"),
!         	t.getResourceSet()));
          //
          System.out.println("\ttarget job id: " + t.getTargetJobID());
***************
*** 196,199 ****
--- 183,192 ----
      }
  
+     /**
+      * Run the client.
+      * @param args Arguments from command line
+      * @throws Exception
+      * @deprecated Use {@link UnicoreWSRFBroker_Client} instead.
+      */
      public static void main(String[] args) throws Exception {
          if (args.length < 2) {

Index: UnicoreWSRFBroker_Client.java
===================================================================
RCS file: /cvsroot/unicore/unigrids/core/unicoregs/src/client/sample/brokerwsrf/UnicoreWSRFBroker_Client.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** UnicoreWSRFBroker_Client.java	27 Feb 2006 15:48:21 -0000	1.11
--- UnicoreWSRFBroker_Client.java	1 Mar 2006 16:35:47 -0000	1.12
***************
*** 11,26 ****
  import java.io.FileReader;
  import java.io.InputStreamReader;
  import java.net.URL;
  import java.rmi.RemoteException;
! import java.util.ArrayList;
! import java.util.Arrays;
! import java.util.Calendar;
! import java.util.Collections;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.StringTokenizer;
! import java.util.Vector;
  
  import javax.xml.namespace.QName;
--- 11,18 ----
  import java.io.FileReader;
  import java.io.InputStreamReader;
+ import java.math.BigInteger;
  import java.net.URL;
  import java.rmi.RemoteException;
! import java.util.*;
  
  import javax.xml.namespace.QName;
***************
*** 46,94 ****
  import org.unigrids.services.atomic.bfts.BaselineFileTransferServiceAddressingLocator;
  import org.unigrids.services.atomic.bfts.BaselineFileTransferSoapBindingStub;
! import org.unigrids.services.atomic.broker.ArbitraryXML;
! import org.unigrids.services.atomic.broker.Broker;
! import org.unigrids.services.atomic.broker.BrokerAndRun;
! import org.unigrids.services.atomic.broker.BrokerAndRunResponse;
! import org.unigrids.services.atomic.broker.BrokerFactory;
! import org.unigrids.services.atomic.broker.BrokerFactoryServiceLocator;
! import org.unigrids.services.atomic.broker.BrokerProperties;
! import org.unigrids.services.atomic.broker.BrokerServiceAddressing;
! import org.unigrids.services.atomic.broker.BrokerServiceAddressingLocator;
! import org.unigrids.services.atomic.broker.DelegateTo;
! import org.unigrids.services.atomic.broker.ExtensionModule;
! import org.unigrids.services.atomic.broker.GetQoS;
! import org.unigrids.services.atomic.broker.GetQoSResponseOffers;
! import org.unigrids.services.atomic.broker.InstantiateBroker;
! import org.unigrids.services.atomic.broker.QoS;
! import org.unigrids.services.atomic.broker.Ticket;
! import org.unigrids.services.atomic.jms.Abort;
! import org.unigrids.services.atomic.jms.Hold;
! import org.unigrids.services.atomic.jms.JobManagement;
! import org.unigrids.services.atomic.jms.JobManagementServiceAddressing;
! import org.unigrids.services.atomic.jms.JobManagementServiceAddressingLocator;
! import org.unigrids.services.atomic.jms.Resume;
! import org.unigrids.services.atomic.jms.Start;
! import org.unigrids.services.atomic.sms.ChangePermissions;
! import org.unigrids.services.atomic.sms.Copy;
! import org.unigrids.services.atomic.sms.CreateDirectory;
! import org.unigrids.services.atomic.sms.Delete;
! import org.unigrids.services.atomic.sms.ExportFile;
! import org.unigrids.services.atomic.sms.ExportFileResponse;
! import org.unigrids.services.atomic.sms.ImportFile;
! import org.unigrids.services.atomic.sms.ImportFileResponse;
! import org.unigrids.services.atomic.sms.ListDirectory;
! import org.unigrids.services.atomic.sms.ListProperties;
! import org.unigrids.services.atomic.sms.Rename;
! import org.unigrids.services.atomic.sms.StorageManagement;
! import org.unigrids.services.atomic.sms.StorageManagementServiceAddressing;
! import org.unigrids.services.atomic.sms.StorageManagementServiceAddressingLocator;
  import org.unigrids.services.atomic.tsf.CreateTSR;
  import org.unigrids.services.atomic.tsf.TargetSystemFactory;
  import org.unigrids.services.atomic.tsf.TargetSystemFactoryServiceLocator;
! import org.unigrids.services.atomic.tss.Submit;
! import org.unigrids.services.atomic.tss.SubmitResponse;
! import org.unigrids.services.atomic.tss.TargetSystem;
! import org.unigrids.services.atomic.tss.TargetSystemServiceAddressing;
! import org.unigrids.services.atomic.tss.TargetSystemServiceAddressingLocator;
  import org.unigrids.services.atomic.types.GridFileType;
  import org.unigrids.services.atomic.types.PermissionsType;
--- 38,48 ----
  import org.unigrids.services.atomic.bfts.BaselineFileTransferServiceAddressingLocator;
  import org.unigrids.services.atomic.bfts.BaselineFileTransferSoapBindingStub;
! import org.unigrids.services.atomic.broker.*;
! import org.unigrids.services.atomic.jms.*;
! import org.unigrids.services.atomic.sms.*;
  import org.unigrids.services.atomic.tsf.CreateTSR;
  import org.unigrids.services.atomic.tsf.TargetSystemFactory;
  import org.unigrids.services.atomic.tsf.TargetSystemFactoryServiceLocator;
! import org.unigrids.services.atomic.tss.*;
  import org.unigrids.services.atomic.types.GridFileType;
  import org.unigrids.services.atomic.types.PermissionsType;
***************
*** 365,368 ****
--- 319,339 ----
          return me;
      }
+     private BrokerProperties props(Calendar termTime,
+ 	    EndpointReferenceType[] delegateTo, ExtensionModule localChecker,
+ 	    ExtensionModule policyEngine, ExtensionModule[] experts) {
+ 	Calendar now = Calendar.getInstance();
+ 	BrokerProperties p = new BrokerProperties();
+ 	p.setCurrentTime(new CurrentTime(now));
+ 	p.setTerminationTime(new TerminationTime(termTime));
+ 	p.setDescription("Demonstration Resource Broker for " + System.getProperty("user.name"));
+ 	p.setName("broker(TSS)");
+ 	p.setLog("Uploaded initial log from client at " + now.getTime() + "\n");
+ 	p.setDelegateTo(new DelegateTo(delegateTo));
+ 	p.setLocalChecker(localChecker);
+ 	p.setPolicyEngine(policyEngine);
+ 	p.setExpertBroker(experts);
+ 	p.setTotalNumberOfJobs(BigInteger.ZERO);
+ 	return p;
+     }
      private Broker createBroker(EndpointReferenceType epr) throws SOAPException {
          println("creating a Broker instance");
***************
*** 373,393 ****
          MessageElement pricing3 = pricing("3", "3", "3", "3", "Simoleons", "3", epr);
  
-         Calendar now = Calendar.getInstance();
          Calendar then = Calendar.getInstance();
          then.add(Calendar.HOUR, 1);
  
!         BrokerProperties props = new BrokerProperties(
!                 "Uploaded initial log from client at " + now.getTime() + "\n",
!                 new DelegateTo(new EndpointReferenceType[0]),
!                 xm(DemoResourceChecker.class, new MessageElement[]{pricing1, pricing2, pricing3}),
!                 xm(VerySimpleSelectionPolicy.class, (MessageElement)null),
!                 new ExtensionModule[0],
!                 new CurrentTime(now),
!                 new TerminationTime(then),
!                 null,null,null,null);
  
          try {
              BrokerFactory factory = new BrokerFactoryServiceLocator().getBrokerFactoryService(broker_endpoint);
!             EndpointReferenceType brokerEpr = factory.instantiateBroker(new InstantiateBroker(props, null)).getBrokerReference();
              broker_epr.add(brokerEpr);
  
--- 344,358 ----
          MessageElement pricing3 = pricing("3", "3", "3", "3", "Simoleons", "3", epr);
  
          Calendar then = Calendar.getInstance();
          then.add(Calendar.HOUR, 1);
  
!         InstantiateBroker ib = new InstantiateBroker(props(then, new EndpointReferenceType[0],
!             xm(DemoResourceChecker.class, new MessageElement[]{pricing1, pricing2, pricing3}),
!             xm(VerySimpleSelectionPolicy.class, (MessageElement)null),
!             new ExtensionModule[0]), new TerminationTime(then));
  
          try {
              BrokerFactory factory = new BrokerFactoryServiceLocator().getBrokerFactoryService(broker_endpoint);
!             EndpointReferenceType brokerEpr = factory.instantiateBroker(ib).getBrokerReference();
              broker_epr.add(brokerEpr);
  
***************
*** 1047,1051 ****
              tt.add(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
  
!             BrokerAndRun run = new BrokerAndRun(jsdl, new TerminationTime(tt), "");
              BrokerAndRunResponse r = broker.brokerAndRun(run);
              //add the returned job epr into the vector list
--- 1012,1016 ----
              tt.add(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
  
!             BrokerAndRun run = new BrokerAndRun(jsdl, new TerminationTime(tt), null);
              BrokerAndRunResponse r = broker.brokerAndRun(run);
              //add the returned job epr into the vector list
***************
*** 1261,1264 ****
--- 1226,1230 ----
  //
  // Copyright (c) Fujitsu Ltd 2000 - 2005
+ // Copyright (c) University of Manchester 2005 - 2006
  //
  // Use and distribution is subject a License.