continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r179624 - in /maven/continuum/trunk/continuum-core: ./ src/main/java/org/apache/maven/continuum/ src/main/java/org/apache/maven/continuum/core/ src/main/resources/META-INF/plexus/ src/test/java/org/apache/maven/continuum/ src/test/java/org/apache/maven/continuum/core/ src/test/resources/org/apache/maven/continuum/
Date Thu, 02 Jun 2005 18:46:17 GMT
Author: jvanzyl
Date: Thu Jun  2 11:46:16 2005
New Revision: 179624

URL: http://svn.apache.org/viewcvs?rev=179624&view=rev
Log:
o adding the workflow engine

Modified:
    maven/continuum/trunk/continuum-core/pom.xml
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/ContinuumCoreTest.java
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Thu Jun  2 11:46:16 2005
@@ -106,6 +106,17 @@
 
     <!--
      |
+     | Werkflow
+     |
+     |-->
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-workflow</artifactId>
+      <version>1.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+
+    <!--
+     |
      | Test Dependencies
      |
      |-->

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Thu Jun  2 11:46:16 2005
@@ -33,6 +33,7 @@
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
 import org.apache.maven.continuum.scm.CheckOutScmResult;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.workflow.WorkflowEngine;
 
 import java.util.Collection;
 import java.util.Properties;
@@ -49,8 +50,9 @@
     extends AbstractLogEnabled
     implements Continuum
 {
-    /** @requirement */
     private ContinuumCore core;
+
+    private WorkflowEngine workflowEngine;
 
     // ----------------------------------------------------------------------
     // Projects

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
Thu Jun  2 11:46:16 2005
@@ -74,7 +74,7 @@
 
     // TODO: look up these requiremetns in start() to have better control of the
     //       application initialization sequence. The application should make sure
-    //       that the database is properly initialized before starting the store.
+    //       that the database is properly initialized before starting the store.   
 
     /**
      * @requirement

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Thu Jun  2 11:46:16 2005
@@ -40,6 +40,9 @@
         <requirement>
           <role>org.apache.maven.continuum.core.ContinuumCore</role>
         </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.workflow.WorkflowEngine</role>
+        </requirement>
       </requirements>
     </component>
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
Thu Jun  2 11:46:16 2005
@@ -22,11 +22,17 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id:$
+ * @version $Id$
  */
 public class DefaultContinuumTest
     extends PlexusTestCase
 {
+    public void testContinuum()
+        throws Exception
+    {
+        Continuum continuum = (Continuum) lookup( Continuum.ROLE );
+    }
+
     public void testLookups()
         throws Exception
     {

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/ContinuumCoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/ContinuumCoreTest.java?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/ContinuumCoreTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/ContinuumCoreTest.java
Thu Jun  2 11:46:16 2005
@@ -22,6 +22,8 @@
 import org.apache.maven.continuum.store.ContinuumStore;
 
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.codehaus.plexus.util.StringUtils;
 
 /**

Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?rev=179624&r1=179623&r2=179624&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
Thu Jun  2 11:46:16 2005
@@ -7,5 +7,20 @@
         <toOverride>nobody@localhost</toOverride>
       </configuration>
     </component>
+    <!--
+     |
+     | These point to the flows that we use as part of the runtime.
+     |
+     | TODO: these should probably be packaged in the core package but the plexus-workflow
package would
+     | need to be modified in order to find them all packaged in the JAR.
+     |
+     -->
+    <component>
+      <role>org.codehaus.plexus.workflow.WorkflowEngine</role>
+      <implementation>org.codehaus.plexus.workflow.DefaultWorkflowEngine</implementation>
+      <configuration>
+        <workflowDirectory>${basedir}/../continuum-plexus-application/src/conf/workflows</workflowDirectory>
+      </configuration>
+    </component>
   </components>
 </plexus>



Mime
View raw message