Return-Path: 
 <continuum-commits-return-266-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 5862 invoked from network); 2 Jun 2005 18:46:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Jun 2005 18:46:49 -0000
Received: (qmail 14585 invoked by uid 500); 2 Jun 2005 18:46:49 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 14561 invoked by uid 500); 2 Jun 2005 18:46:48 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 14541 invoked by uid 99); 2 Jun 2005 18:46:48 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 02 Jun 2005 11:46:43 -0700
Received: (qmail 5756 invoked by uid 65534); 2 Jun 2005 18:46:18 -0000
Message-ID: <20050602184618.5755.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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 -0000
To: continuum-commits@maven.apache.org
From: jvanzyl@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jvanzyl
Date: Thu Jun  2 11:46:16 2005
New Revision: 179624

URL: http://svn.apache.org/viewcvs?rev=3D179624&view=3Drev
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/con=
tinuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/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/con=
tinuum/DefaultContinuumTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con=
tinuum/core/ContinuumCoreTest.java
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/mave=
n/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=3D179624&r1=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 @@
=20
     <!--
      |
+     | 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/mav=
en/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=3D179624&r1=
=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/DefaultContinuum.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/DefaultContinuum.java Thu Jun  2 11:46:16 2005
@@ -33,6 +33,7 @@
 import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumP=
rojectBuilder;
 import org.apache.maven.continuum.scm.CheckOutScmResult;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.workflow.WorkflowEngine;
=20
 import java.util.Collection;
 import java.util.Properties;
@@ -49,8 +50,9 @@
     extends AbstractLogEnabled
     implements Continuum
 {
-    /** @requirement */
     private ContinuumCore core;
+
+    private WorkflowEngine workflowEngine;
=20
     // -------------------------------------------------------------------=
---
     // Projects

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav=
en/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=3D=
179624&r1=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/core/DefaultContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/core/DefaultContinuumCore.java Thu Jun  2 11:46:16 2005
@@ -74,7 +74,7 @@
=20
     // TODO: look up these requiremetns in start() to have better control =
of the
     //       application initialization sequence. The application should m=
ake sure
-    //       that the database is properly initialized before starting the=
 store.
+    //       that the database is properly initialized before starting the=
 store.  =20
=20
     /**
      * @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=3D179624&r1=3D179623&r2=
=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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>
=20

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/mav=
en/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=3D17962=
4&r1=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con=
tinuum/DefaultContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con=
tinuum/DefaultContinuumTest.java Thu Jun  2 11:46:16 2005
@@ -22,11 +22,17 @@
=20
 /**
  * @author <a href=3D"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 =3D (Continuum) lookup( Continuum.ROLE );
+    }
+
     public void testLookups()
         throws Exception
     {

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/mav=
en/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=3D179=
624&r1=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con=
tinuum/core/ContinuumCoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con=
tinuum/core/ContinuumCoreTest.java Thu Jun  2 11:46:16 2005
@@ -22,6 +22,8 @@
 import org.apache.maven.continuum.store.ContinuumStore;
=20
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.codehaus.plexus.util.StringUtils;
=20
 /**

Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apach=
e/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=3D1=
79624&r1=3D179623&r2=3D179624&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/mave=
n/continuum/DefaultContinuumTest.xml (original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/mave=
n/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>