[Smartfrog-checkins] core/components/deployapi/src/org/smartfrog/services/deployapi/engine ServerInstance.java,1.22,1.23 JobRepository.java,1.21,1.22 Application.java,1.6,1.7

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29885/components/deployapi/src/org/smartfrog/services/deployapi/engine

Modified Files:
	ServerInstance.java JobRepository.java Application.java 
Log Message:
AddFile; some statistics collection (not routed to anything yet)

Index: Application.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/Application.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Application.java	24 Apr 2006 14:53:10 -0000	1.6
--- Application.java	2 May 2006 16:37:34 -0000	1.7
***************
*** 41,44 ****
--- 41,46 ----
  import org.smartfrog.services.deployapi.transport.wsrf.WSRPResourceSource;
  import org.smartfrog.services.deployapi.transport.wsrf.WsrfUtils;
+ import org.smartfrog.services.filesystem.filestore.AddedFilestore;
+ import org.smartfrog.services.filesystem.filestore.FileEntry;
  import org.smartfrog.sfcore.common.ConfigurationDescriptor;
  import org.smartfrog.sfcore.common.SmartFrogException;
***************
*** 49,52 ****
--- 51,55 ----
  import javax.xml.namespace.QName;
  import java.io.File;
+ import java.io.IOException;
  import java.lang.ref.WeakReference;
  import java.net.URI;
***************
*** 54,57 ****
--- 57,62 ----
  import java.rmi.RemoteException;
  import java.util.Date;
+ import java.util.List;
+ import java.util.ArrayList;
  
  
***************
*** 180,185 ****
      private AlpineEPR alpineEPR;
  
!     public Application(String id) {
          setId(id);
          addInitialProperties();
          enterStateNotifying(LifecycleStateEnum.instantiated, "id=" + id);
--- 185,198 ----
      private AlpineEPR alpineEPR;
  
!     private ServerInstance owner;
! 
!     /**
!      * Attached files
!      */
!     private List<FileEntry> attachments=new ArrayList<FileEntry>();
! 
!     public Application(String id, ServerInstance owner) {
          setId(id);
+         this.owner=owner;
          addInitialProperties();
          enterStateNotifying(LifecycleStateEnum.instantiated, "id=" + id);
***************
*** 499,503 ****
                  return (Prim) result;
              } else {
!                 final String message = "got something not a prim back from a deployer";
                  log.info(message);
                  throw new BaseException(message + " " + result.toString());
--- 512,516 ----
                  return (Prim) result;
              } else {
!                 final String message = "got something not a Prim back from a deployer";
                  log.info(message);
                  throw new BaseException(message + " " + result.toString());
***************
*** 696,698 ****
--- 709,728 ----
  
  
+     /**
+      * Create a temporary file
+      * @param extension
+      * @return
+      */
+     public FileEntry createNewTempFile(String extension) throws IOException {
+         AddedFilestore filestore = owner.getFilestore();
+         FileEntry entry = filestore.createNewFile("file", extension);
+         addAttachment(entry);
+         return entry;
+     }
+ 
+     public synchronized void addAttachment(FileEntry entry) {
+         attachments.add(entry);
+     }
+ 
+ 
  }

Index: JobRepository.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/JobRepository.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JobRepository.java	11 Apr 2006 16:38:13 -0000	1.21
--- JobRepository.java	2 May 2006 16:37:34 -0000	1.22
***************
*** 52,60 ****
      private URL systemsURL;
      public static final String SEARCH_STRING = Constants.JOB_ID_PARAM + "=";
!     Log log= LogFactory.getLog(JobRepository.class);
  
  
!     public JobRepository(URL systemsURL) {
          this.systemsURL = systemsURL;
      }
  
--- 52,62 ----
      private URL systemsURL;
      public static final String SEARCH_STRING = Constants.JOB_ID_PARAM + "=";
!     private static Log log= LogFactory.getLog(JobRepository.class);
  
+     private ServerInstance engine;
  
!     public JobRepository(URL systemsURL, ServerInstance owner) {
          this.systemsURL = systemsURL;
+         this.engine=owner;
      }
  
***************
*** 196,200 ****
  
      public Application createNewJob(String hostname) {
!         Application job = new Application(Utils.createNewID());
          job.setHostname(hostname);
          String id = job.getId();
--- 198,202 ----
  
      public Application createNewJob(String hostname) {
!         Application job = new Application(Utils.createNewID(),engine);
          job.setHostname(hostname);
          String id = job.getId();

Index: ServerInstance.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/engine/ServerInstance.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ServerInstance.java	13 Apr 2006 15:55:05 -0000	1.22
--- ServerInstance.java	2 May 2006 16:37:34 -0000	1.23
***************
*** 147,151 ****
      private void init() throws IOException {
          systemsURL = new URL(protocol, hostname, port, path);
!         jobs = new JobRepository(systemsURL);
          workers = new ActionWorker[WORKERS];
          for (int i = 0; i < workers.length; i++) {
--- 147,151 ----
      private void init() throws IOException {
          systemsURL = new URL(protocol, hostname, port, path);
!         jobs = new JobRepository(systemsURL, this);
          workers = new ActionWorker[WORKERS];
          for (int i = 0; i < workers.length; i++) {