[Smartfrog-checkins] SF.net SVN: smartfrog: [3470] trunk/core/smartfrog/src/org/smartfrog/ services/os

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

Revision: 3470
          http://svn.sourceforge.net/smartfrog/?rev=3470&view=rev
Author:   steve_l
Date:     2006-10-09 09:26:36 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
Java classpath setup components (where implemented) are now workflowy

Modified Paths:
--------------
    trunk/core/smartfrog/src/org/smartfrog/services/os/download/components.sf
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/AbstractClasspathImpl.java
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/DirectoryClasspathImpl.java
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/LibraryClasspathImpl.java
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/classpath.sf
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/components.sf
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/library.sf
    trunk/core/smartfrog/src/org/smartfrog/services/os/java/propertyfile.sf

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/download/components.sf
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/download/components.sf	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/download/components.sf	2006-10-09 16:26:36 UTC (rev 3470)
@@ -26,7 +26,7 @@
 #include "org/smartfrog/services/os/runshell/components.sf"
 
 
-DownloadComponent extends Prim {
+DownloadComponent extends WorkflowPrim {
 
     downloadSchema extends DeletableFileSchema  {
 

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/AbstractClasspathImpl.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/AbstractClasspathImpl.java	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/AbstractClasspathImpl.java	2006-10-09 16:26:36 UTC (rev 3470)
@@ -3,6 +3,7 @@
 import org.smartfrog.sfcore.prim.PrimImpl;
 import org.smartfrog.sfcore.common.SmartFrogRuntimeException;
 import org.smartfrog.sfcore.common.SmartFrogException;
+import org.smartfrog.sfcore.utils.ComponentHelper;
 
 import java.rmi.RemoteException;
 import java.util.List;
@@ -15,10 +16,20 @@
  * This is the base class, with a helper method to set the attributes
  */
 public abstract class AbstractClasspathImpl extends PrimImpl implements Classpath {
+
     protected AbstractClasspathImpl() throws RemoteException {
     }
 
+
     /**
+     * something that is called in the {@link #sfStart()} method to start the termination
+     * process. It can be overridden, or called from an overridden sfStart method.
+     */
+    protected void maybeStartTerminator() {
+        new ComponentHelper(this).sfSelfDetachAndOrTerminate(null, "classpath terminating", null, null);
+    }
+
+    /**
      * set the classpath up
      * @param files a List of type File.
      * @throws SmartFrogRuntimeException error in setting classpath

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/DirectoryClasspathImpl.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/DirectoryClasspathImpl.java	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/DirectoryClasspathImpl.java	2006-10-09 16:26:36 UTC (rev 3470)
@@ -56,6 +56,7 @@
         if (!isEarly()) {
             bind();
         }
+        maybeStartTerminator();
     }
 
 

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/LibraryClasspathImpl.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/LibraryClasspathImpl.java	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/LibraryClasspathImpl.java	2006-10-09 16:26:36 UTC (rev 3470)
@@ -50,7 +50,7 @@
         super.sfDeploy();
         repository=sfResolve(ATTR_REPOSITORY,repository,true);
         libraries=sfResolve(ATTR_LIBRARIES,libraries,true);
-
+        //TODO, see SFOS-13.
     }
 
     /**

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/classpath.sf
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/classpath.sf	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/classpath.sf	2006-10-09 16:26:36 UTC (rev 3470)
@@ -40,7 +40,7 @@
 }
 
 
-Classpath extends Prim {
+Classpath extends WorkflowPrim {
     schema extends ClasspathSchema;
 }
 
@@ -76,7 +76,9 @@
      sfClass "org.smartfrog.services.os.java.LibraryClasspathImpl";
 
 }
-
+/**
+ * SFOS-13 implies this is not implemented.
+ */
 Maven2Classpath extends LibraryClasspath {
     maven2ClasspathSchema extends Maven2ClasspathSchema;
 

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/components.sf
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/components.sf	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/components.sf	2006-10-09 16:26:36 UTC (rev 3470)
@@ -91,7 +91,7 @@
     retain extends Boolean;
 }
 
-LoadClass extends Prim {
+LoadClass extends WorkflowPrim {
     schema extends LoadClassSchema;
     sfClass "org.smartfrog.services.os.java.LoadClassImpl";
     create false;

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/library.sf
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/library.sf	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/library.sf	2006-10-09 16:26:36 UTC (rev 3470)
@@ -204,7 +204,7 @@
  * In which case it takes that component as its repository.
  */
 
-LibraryArtifact extends FileUsingComponent {
+LibraryArtifact extends FileUsingWorkflowComponent {
     sfClass "org.smartfrog.services.os.java.LibraryArtifactImpl";
     librarySchema extends Schema {
         library extends OptionalCD;

Modified: trunk/core/smartfrog/src/org/smartfrog/services/os/java/propertyfile.sf
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/os/java/propertyfile.sf	2006-10-09 16:20:14 UTC (rev 3469)
+++ trunk/core/smartfrog/src/org/smartfrog/services/os/java/propertyfile.sf	2006-10-09 16:26:36 UTC (rev 3470)
@@ -32,7 +32,7 @@
 
 #include "/org/smartfrog/components.sf"
 #include "/org/smartfrog/predicates.sf"
-#include "org/smartfrog/services/filesystem/filesystemtemplate.sf"
+#include "/org/smartfrog/services/filesystem/filesystemtemplate.sf"
 
 /**
  Component to read in propery files
@@ -63,7 +63,7 @@
   properties extends OptionalVector;
 }
 
-LoadPropertyFile extends Prim {
+LoadPropertyFile extends WorkflowPrim {
   sfClass "org.smartfrog.services.os.java.LoadPropertyFileImpl";
   propertyFileSchema extends PropertyFileSchema;
   required true;


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