continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r227420 - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/configuration/ continuum-api/src/main/java/org/apache/maven/continuum/store/ continuum-api/src/main/resources/ continuum-api/src/main/resources/M...
Date Thu, 04 Aug 2005 15:57:26 GMT
Author: brett
Date: Thu Aug  4 08:56:36 2005
New Revision: 227420

URL: http://svn.apache.org/viewcvs?rev=227420&view=rev
Log:
separate store

Added:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java   (contents, props changed)
      - copied, changed from r227315, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    maven/continuum/trunk/continuum-api/src/main/resources/
    maven/continuum/trunk/continuum-api/src/main/resources/META-INF/
    maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/
    maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml   (with props)
    maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/
    maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java   (contents, props changed)
      - copied, changed from r227315, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
    maven/continuum/trunk/continuum-api/src/test/resources/
    maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml   (contents, props changed)
      - copied, changed from r227315, maven/continuum/trunk/continuum-core/src/test/resources/configuration.xml
    maven/continuum/trunk/continuum-api/src/test/resources/org/
    maven/continuum/trunk/continuum-api/src/test/resources/org/apache/
    maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/
    maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/
    maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/
    maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml   (contents, props changed)
      - copied, changed from r227314, maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml
    maven/continuum/trunk/continuum-store/   (with props)
    maven/continuum/trunk/continuum-store/pom.xml   (with props)
    maven/continuum/trunk/continuum-store/src/
    maven/continuum/trunk/continuum-store/src/main/
    maven/continuum/trunk/continuum-store/src/main/java/
    maven/continuum/trunk/continuum-store/src/main/java/org/
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/
      - copied from r227314, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
      - copied, changed from r227418, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
      - copied unchanged from r227418, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/trunk/continuum-store/src/main/resources/
    maven/continuum/trunk/continuum-store/src/main/resources/META-INF/
    maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/
    maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml   (with props)
    maven/continuum/trunk/continuum-store/src/test/
    maven/continuum/trunk/continuum-store/src/test/java/
    maven/continuum/trunk/continuum-store/src/test/java/org/
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/
      - copied from r227314, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
      - copied, changed from r227418, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java
      - copied unchanged from r227418, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/JdoContinuumStoreTest.java
      - copied unchanged from r227418, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/JdoContinuumStoreTest.java
    maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/NewModelTest.java
      - copied unchanged from r227418, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java
Removed:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/
    maven/continuum/trunk/continuum-core/src/test/resources/configuration.xml
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/store/
Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
    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/action/ExecuteBuilderContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
    maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
    maven/continuum/trunk/pom.xml

Copied: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (from r227315, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?p2=maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java&r1=227315&r2=227420&rev=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Thu Aug  4 08:56:36 2005
@@ -1,5 +1,21 @@
 package org.apache.maven.continuum.configuration;
 
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.maven.continuum.profile.ContinuumJdk;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -7,7 +23,6 @@
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.Xpp3DomWriter;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -25,7 +40,6 @@
  * @version $Id$
  */
 public class DefaultConfigurationService
-    extends AbstractLogEnabled
     implements ConfigurationService
 {
     /**
@@ -68,8 +82,6 @@
 
     public void setInitialized( boolean initialized )
     {
-        getLogger().info( "Setting the initialization state to " + initialized );
-
         this.initialized = initialized;
     }
 
@@ -151,7 +163,7 @@
         {
             String booleanString = initializedDom.getValue();
 
-            initialized = booleanString.equals( "true" ) || booleanString.equals( "1" );
+            initialized = "true".equals( booleanString ) || "1".equals( booleanString );
         }
 
         Xpp3Dom urlDom = configuration.getChild( CONFIGURATION_URL );

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java Thu Aug  4 08:56:36 2005
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;

Added: maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml?rev=227420&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml Thu Aug  4 08:56:36 2005
@@ -0,0 +1,12 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
+      <implementation>org.apache.maven.continuum.configuration.DefaultConfigurationService</implementation>
+      <configuration>
+        <source>${plexus.home}/conf/configuration.xml</source>
+        <application-home>${plexus.home}</application-home>
+      </configuration>
+    </component>
+  </components>
+</component-set>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java (from r227315, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java?p2=maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java&p1=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java&r1=227315&r2=227420&rev=227420&view=diff
==============================================================================
    (empty)

Propchange: maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml (from r227315, maven/continuum/trunk/continuum-core/src/test/resources/configuration.xml)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml?p2=maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml&p1=maven/continuum/trunk/continuum-core/src/test/resources/configuration.xml&r1=227315&r2=227420&rev=227420&view=diff
==============================================================================
    (empty)

Propchange: maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/test/resources/configuration.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml (from r227314, maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml?p2=maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml&p1=maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml&r1=227314&r2=227420&rev=227420&view=diff
==============================================================================
    (empty)

Propchange: maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/test/resources/org/apache/maven/continuum/configuration/ConfigurationServiceTest.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Thu Aug  4 08:56:36 2005
@@ -20,17 +20,13 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
-import org.apache.maven.continuum.store.ContinuumStore;
-import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
-import org.apache.maven.continuum.scm.ScmResult;
-import org.apache.maven.continuum.scm.ScmFile;
-import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.scm.ScmFile;
 import org.apache.maven.continuum.scm.ScmResult;
+import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
 import org.codehaus.plexus.PlexusTestCase;

Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Thu Aug  4 08:56:36 2005
@@ -29,6 +29,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-store</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-test</artifactId>
     </dependency>
     <dependency>

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=227420&r1=227419&r2=227420&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 Aug  4 08:56:36 2005
@@ -65,6 +65,7 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
+import javax.jdo.JDOHelper;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -75,7 +76,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import javax.jdo.JDOHelper;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -84,7 +84,7 @@
  */
 public class DefaultContinuum
     extends AbstractLogEnabled
-    implements Continuum, Initializable,Startable
+    implements Continuum, Initializable, Startable
 {
     /**
      * @plexus.requirement
@@ -136,12 +136,6 @@
     private String appHome;
 
     // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    private static final String DEFAULT_PROJECT_GROUP_NAME = "Default Project";
-
-    // ----------------------------------------------------------------------
     // Projects
     // ----------------------------------------------------------------------
 
@@ -354,8 +348,8 @@
             }
             catch ( ContinuumException ex )
             {
-                getLogger().error( "Could not enqueue project: " + project.getId() + " " +
-                                   "('" + project.getName() + "').", ex );
+                getLogger().error(
+                    "Could not enqueue project: " + project.getId() + " " + "('" + project.getName() + "').", ex );
             }
         }
     }
@@ -444,8 +438,7 @@
     public ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl )
         throws ContinuumException
     {
-        return executeAddProjectsFromMetadataActivity( metadataUrl,
-                                                       MavenOneContinuumProjectBuilder.ID,
+        return executeAddProjectsFromMetadataActivity( metadataUrl, MavenOneContinuumProjectBuilder.ID,
                                                        MavenOneBuildExecutor.ID );
     }
 
@@ -476,8 +469,7 @@
     public ContinuumProjectBuildingResult addMavenTwoProject( String metadataUrl )
         throws ContinuumException
     {
-        return executeAddProjectsFromMetadataActivity( metadataUrl,
-                                                       MavenTwoContinuumProjectBuilder.ID,
+        return executeAddProjectsFromMetadataActivity( metadataUrl, MavenTwoContinuumProjectBuilder.ID,
                                                        MavenTwoBuildExecutor.ID );
     }
 
@@ -576,8 +568,8 @@
 
         executeAction( "create-projects-from-metadata", context );
 
-        ContinuumProjectBuildingResult result = (ContinuumProjectBuildingResult)
-            context.get( CreateProjectsFromMetadata.KEY_PROJECT_BUILDING_RESULT );
+        ContinuumProjectBuildingResult result = (ContinuumProjectBuildingResult) context.get(
+            CreateProjectsFromMetadata.KEY_PROJECT_BUILDING_RESULT );
 
         getLogger().info( "Created " + result.getProjects().size() + " projects." );
         getLogger().info( "Created " + result.getProjectGroups().size() + " project groups." );
@@ -610,11 +602,12 @@
             {
                 projectGroup = store.getProjectGroupByGroupId( projectGroup.getGroupId() );
 
-                getLogger().info( "Using existing project group with the group id: '" + projectGroup.getGroupId() + "'." );
+                getLogger().info(
+                    "Using existing project group with the group id: '" + projectGroup.getGroupId() + "'." );
             }
             catch ( ContinuumObjectNotFoundException e )
             {
-                getLogger().info("Creating project group with the group id: '" + projectGroup.getGroupId() + "'." );
+                getLogger().info( "Creating project group with the group id: '" + projectGroup.getGroupId() + "'." );
 
                 Map pgContext = new HashMap();
 
@@ -746,16 +739,16 @@
 
     private void dumpJdoObject( Object object, String message )
     {
-        System.err.println( "---------- Dumping JDO Object: " + message );
-        System.err.println( "object.hashCode: " + object.hashCode() );
-        System.err.println( "persistent: " + JDOHelper.isPersistent( object ) );
-        System.err.println( "transactional: " + JDOHelper.isTransactional( object ) );
-        System.err.println( "dirty: " + JDOHelper.isDirty( object ) );
-        System.err.println( "new: " + JDOHelper.isNew( object ) );
-        System.err.println( "deleted: " + JDOHelper.isDeleted( object ) );
-        System.err.println( "detached: " + JDOHelper.isDetached( object ) );
-        System.err.println( "object id: " + JDOHelper.getObjectId( object ) );
-        System.err.println( "----------" );
+        getLogger().debug( "---------- Dumping JDO Object: " + message );
+        getLogger().debug( "object.hashCode: " + object.hashCode() );
+        getLogger().debug( "persistent: " + JDOHelper.isPersistent( object ) );
+        getLogger().debug( "transactional: " + JDOHelper.isTransactional( object ) );
+        getLogger().debug( "dirty: " + JDOHelper.isDirty( object ) );
+        getLogger().debug( "new: " + JDOHelper.isNew( object ) );
+        getLogger().debug( "deleted: " + JDOHelper.isDeleted( object ) );
+        getLogger().debug( "detached: " + JDOHelper.isDetached( object ) );
+        getLogger().debug( "object id: " + JDOHelper.getObjectId( object ) );
+        getLogger().debug( "----------" );
     }
 
     // ----------------------------------------------------------------------
@@ -866,16 +859,16 @@
         {
             if ( !wdFile.isDirectory() )
             {
-                throw new InitializationException( "The specified working directory isn't a directory: " +
-                                                   "'" + wdFile.getAbsolutePath() + "'." );
+                throw new InitializationException(
+                    "The specified working directory isn't a directory: " + "'" + wdFile.getAbsolutePath() + "'." );
             }
         }
         else
         {
             if ( !wdFile.mkdirs() )
             {
-                throw new InitializationException( "Could not making the working directory: " +
-                                                   "'" + wdFile.getAbsolutePath() + "'." );
+                throw new InitializationException(
+                    "Could not making the working directory: " + "'" + wdFile.getAbsolutePath() + "'." );
             }
         }
 
@@ -916,15 +909,11 @@
             // Activate all the Build settings in the system
             // ----------------------------------------------------------------------
 
-            try
-            {
-                buildSettingsActivator.activateBuildSettings( this );
-            }
-            catch ( BuildSettingsActivationException e )
-            {
-                throw new StartingException( "Error activating build settings.", e );
-            }
-
+            buildSettingsActivator.activateBuildSettings( this );
+        }
+        catch ( BuildSettingsActivationException e )
+        {
+            throw new StartingException( "Error activating build settings.", e );
         }
         catch ( ConfigurationLoadingException e )
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Thu Aug  4 08:56:36 2005
@@ -28,10 +28,10 @@
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUtils;
 
+import java.io.File;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
-import java.io.File;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -97,8 +97,6 @@
         // ----------------------------------------------------------------------
 
         build = store.getBuild( buildId );
-
-        String output = null;
 
         try
         {

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=227420&r1=227419&r2=227420&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 Aug  4 08:56:36 2005
@@ -139,55 +139,11 @@
     </component>
 
     <component>
-      <role>org.apache.maven.continuum.store.ContinuumStore</role>
-      <implementation>org.apache.maven.continuum.store.JdoContinuumStore</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.jdo.JdoFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
       <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
       <implementation>org.apache.maven.continuum.utils.DefaultWorkingDirectoryService</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <!-- TODO: Remove these two once the plexus bug where plexus would pick
-the first component with role hint if no component without a role hint exists
-and was looked up -->
-    <component>
-      <role>ContinuumStore</role>
-      <role-hint>modello</role-hint>
-      <implementation>org.apache.maven.continuum.store.ModelloJPoxContinuumStore</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.jdo.JdoFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>ContinuumStore</role>
-      <role-hint>jdo</role-hint>
-      <implementation>org.apache.maven.continuum.store.JdoContinuumStore</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.jdo.JdoFactory</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.continuum.configuration.ConfigurationService</role>

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Thu Aug  4 08:56:36 2005
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
@@ -28,11 +23,14 @@
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-
 import org.codehaus.plexus.jabber.JabberClient;
 import org.codehaus.plexus.jabber.JabberClientException;
 import org.codehaus.plexus.notification.NotificationException;
-import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -153,7 +151,7 @@
                               Map configuration )
         throws NotificationException
     {
-        String message = "";
+        String message;
 
         try
         {
@@ -261,9 +259,7 @@
     {
         if ( configuration.containsKey( "password" ) )
         {
-            String password = (String) configuration.get( "password" );
-
-            return password;
+            return (String) configuration.get( "password" );
         }
 
         return fromPassword;

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Thu Aug  4 08:56:36 2005
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
@@ -28,11 +23,14 @@
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-
 import org.codehaus.plexus.msn.MsnClient;
 import org.codehaus.plexus.msn.MsnException;
 import org.codehaus.plexus.notification.NotificationException;
-import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -147,7 +145,7 @@
                               Map configuration )
         throws NotificationException
     {
-        String message = "";
+        String message;
 
         try
         {
@@ -203,9 +201,7 @@
     {
         if ( configuration.containsKey( "login" ) )
         {
-            String username = (String) configuration.get( "login" );
-
-            return username;
+            return (String) configuration.get( "login" );
         }
 
         return fromAddress;
@@ -215,9 +211,7 @@
     {
         if ( configuration.containsKey( "password" ) )
         {
-            String password = (String) configuration.get( "password" );
-
-            return password;
+            return (String) configuration.get( "password" );
         }
 
         return fromPassword;

Propchange: maven/continuum/trunk/continuum-store/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug  4 08:56:36 2005
@@ -0,0 +1,4 @@
+target
+*.iml
+*.iws
+*.ipr

Added: maven/continuum/trunk/continuum-store/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/pom.xml?rev=227420&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-store/pom.xml (added)
+++ maven/continuum/trunk/continuum-store/pom.xml Thu Aug  4 08:56:36 2005
@@ -0,0 +1,56 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent</artifactId>
+    <version>1.0-beta-1-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-store</artifactId>
+  <version>1.0-beta-1-SNAPSHOT</version>
+  <name>Continuum Store</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-jdo2</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>jdo</groupId>
+      <artifactId>jdo</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.3.0</version>
+      <scope>test</scope>
+    </dependency>
+<!--
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>7.4</version>
+      <classifier>jdbc3</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>incubator-derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.0.2.1</version>
+      <scope>test</scope>
+    </dependency>
+-->
+  </dependencies>
+</project>

Propchange: maven/continuum/trunk/continuum-store/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-store/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java (from r227418, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java?p2=maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java&r1=227418&r2=227420&rev=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java Thu Aug  4 08:56:36 2005
@@ -24,6 +24,7 @@
 import java.io.IOException;
 
 /**
+ * @todo remove this class - these methods belong in the build class or similar
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */

Added: maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml?rev=227420&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml Thu Aug  4 08:56:36 2005
@@ -0,0 +1,30 @@
+<component-set>
+  <components>
+    <!-- 
+    <component>
+      <role>org.apache.maven.continuum.store.ContinuumStore</role>
+      <role-hint>modello</role-hint>
+      <implementation>org.apache.maven.continuum.store.ModelloJPoxContinuumStore</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.jdo.JdoFactory</role>
+        </requirement>
+      </requirements>
+    </component>
+    -->
+
+    <component>
+      <role>org.apache.maven.continuum.store.ContinuumStore</role>
+      <role-hint>jdo</role-hint>
+      <implementation>org.apache.maven.continuum.store.JdoContinuumStore</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.jdo.JdoFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>

Propchange: maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-store/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java (from r227418, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java?p2=maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java&p1=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java&r1=227418&r2=227420&rev=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java Thu Aug  4 08:56:36 2005
@@ -16,31 +16,28 @@
  * limitations under the License.
  */
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.maven.continuum.AbstractContinuumTest;
-import org.apache.maven.continuum.scheduler.ContinuumSchedulerConstants;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
-import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
 import org.apache.maven.continuum.project.ContinuumBuild;
 import org.apache.maven.continuum.project.ContinuumNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
+import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.scm.ScmFile;
 import org.apache.maven.continuum.scm.ScmResult;
-
 import org.codehaus.plexus.jdo.JdoFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -54,6 +51,15 @@
 
     private Class implementationClass;
 
+    // TODO
+//    private static final String MAVEN2_ID = MavenTwoBuildExecutor.ID;
+//    private static final int SCM_MODE = ContinuumSchedulerConstants.SCM_MODE_UPDATE;
+
+    private static final int SCM_MODE = 1;
+
+    private static final String MAVEN2_ID = "maven2";
+
+
     public AbstractContinuumStoreTest( String roleHint, Class implementationClass )
     {
         this.roleHint = roleHint;
@@ -66,7 +72,7 @@
     {
         super.setUp();
 
-        store = (ContinuumStore) lookup( "ContinuumStore", roleHint );
+        store = (ContinuumStore) lookup( ContinuumStore.ROLE, roleHint );
 
         assertEquals( implementationClass, store.getClass() );
 
@@ -85,10 +91,7 @@
     public void testAddProject()
         throws Exception
     {
-        MavenTwoProject expected = makeMavenTwoProject( "Test Project",
-                                                        "foo@bar.com",
-                                                        "1.0",
-                                                        "a b" );
+        MavenTwoProject expected = makeMavenTwoProject( "Test Project", "foo@bar.com", "1.0", "a b" );
 
         ContinuumProject actual = store.addProject( expected );
 
@@ -96,11 +99,7 @@
 
         assertNotNull( "The project id is null.", actual.getId() );
 
-        assertProjectEquals( makeMavenTwoProject( "Test Project",
-                                                  "foo@bar.com",
-                                                  "1.0",
-                                                  "a b" ),
-                                actual );
+        assertProjectEquals( makeMavenTwoProject( "Test Project", "foo@bar.com", "1.0", "a b" ), actual );
     }
 
     public void testAddProjectWithProjectGroup()
@@ -108,10 +107,7 @@
     {
         ContinuumProjectGroup projectGroup = createStubProjectGroup( "name", "description" );
 
-        MavenTwoProject expected = makeMavenTwoProject( "Test Project",
-                                                        "foo@bar.com",
-                                                        "1.0",
-                                                        "a b" );
+        MavenTwoProject expected = makeMavenTwoProject( "Test Project", "foo@bar.com", "1.0", "a b" );
 
         expected.setProjectGroup( projectGroup );
 
@@ -123,11 +119,7 @@
 
         assertNotNull( "The project group is null.", actual.getProjectGroup() );
 
-        assertProjectEquals( makeMavenTwoProject( "Test Project",
-                                                  "foo@bar.com",
-                                                  "1.0",
-                                                  "a b" ),
-                             actual );
+        assertProjectEquals( makeMavenTwoProject( "Test Project", "foo@bar.com", "1.0", "a b" ), actual );
     }
 
     public void testGetNonExistingProject()
@@ -137,9 +129,9 @@
         {
             store.getProject( "foo" );
 
-            fail( "Expected ContinuumObjectNotFoundException.") ;
+            fail( "Expected ContinuumObjectNotFoundException." );
         }
-        catch( ContinuumObjectNotFoundException ex )
+        catch ( ContinuumObjectNotFoundException ex )
         {
             // expected
         }
@@ -158,10 +150,7 @@
         String version = "1.0";
         String commandLineArguments = "";
 
-        ContinuumProject expected = makeMavenTwoProject( name,
-                                                         nagEmailAddress,
-                                                         version,
-                                                         commandLineArguments );
+        ContinuumProject expected = makeMavenTwoProject( name, nagEmailAddress, version, commandLineArguments );
 
         ContinuumProject project = store.addProject( expected );
 
@@ -242,12 +231,7 @@
         List notifiers = new ArrayList();
         notifiers.add( notifier );
 
-        assertProjectEquals( name2,
-                             notifiers,
-                             version2,
-                             commandLineArguments2,
-                             MavenTwoBuildExecutor.ID,
-                             project );
+        assertProjectEquals( name2, notifiers, version2, commandLineArguments2, MAVEN2_ID, project );
 
         // ----------------------------------------------------------------------
         //
@@ -279,10 +263,7 @@
         String version1 = "1.0";
         String commandLineArguments1 = "";
 
-        ContinuumProject project1 = addMavenTwoProject( store,
-                                                        name1,
-                                                        nagEmailAddress1,
-                                                        version1,
+        ContinuumProject project1 = addMavenTwoProject( store, name1, nagEmailAddress1, version1,
                                                         commandLineArguments1 );
 
         String name2 = "Test All Projects 2";
@@ -290,10 +271,7 @@
         String version2 = "1.0";
         String commandLineArguments2 = "";
 
-        ContinuumProject project2 = addMavenTwoProject( store,
-                                                        name2,
-                                                        nagEmailAddress2,
-                                                        version2,
+        ContinuumProject project2 = addMavenTwoProject( store, name2, nagEmailAddress2, version2,
                                                         commandLineArguments2 );
         Map projects = new HashMap();
 
@@ -312,18 +290,10 @@
             projects.put( project.getName(), project );
         }
 
-        assertProjectEquals( name1,
-                             (String)null,
-                             version1,
-                             commandLineArguments1,
-                             MavenTwoBuildExecutor.ID,
+        assertProjectEquals( name1, (String) null, version1, commandLineArguments1, MAVEN2_ID,
                              (ContinuumProject) projects.get( name1 ) );
 
-        assertProjectEquals( name2,
-                             (String)null,
-                             version2,
-                             commandLineArguments2,
-                             MavenTwoBuildExecutor.ID,
+        assertProjectEquals( name2, (String) null, version2, commandLineArguments2, MAVEN2_ID,
                              (ContinuumProject) projects.get( name2 ) );
     }
 
@@ -332,10 +302,7 @@
     {
 //        ContinuumProject project = addMavenTwoProject( store,
 //                                                       "Remove Test Project" );
-        ContinuumProject project = addMavenTwoProject( store,
-                                                       "name1",
-                                                       "nagEmailAddress1",
-                                                       "version1",
+        ContinuumProject project = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
                                                        "commandLineArguments1" );
 
         ContinuumBuild build = createBuild( store, project.getId(), false );
@@ -348,21 +315,15 @@
 
         scmResult.addFile( file );
 
-        setBuildResult( store,
-                        build,
-                        ContinuumProjectState.OK,
-                        makeContinuumBuildExecutionResult( "", 0 ),
-                        scmResult,
+        setBuildResult( store, build, ContinuumProjectState.OK, makeContinuumBuildExecutionResult( "", 0 ), scmResult,
                         null );
 
         store.removeProject( project.getId() );
     }
 
-    private ContinuumBuildExecutionResult makeContinuumBuildExecutionResult( String output,
-                                                                             int exitCode )
+    private ContinuumBuildExecutionResult makeContinuumBuildExecutionResult( String output, int exitCode )
     {
-        return new ContinuumBuildExecutionResult( output,
-                                                  exitCode );
+        return new ContinuumBuildExecutionResult( output, exitCode );
     }
 
     public void testGetLatestBuildForProject()
@@ -370,10 +331,7 @@
     {
 //        String projectId = addMavenTwoProject( store,
 //                                               makeStubMavenTwoProject( "Last project" ) ).getId();
-        ContinuumProject project = addMavenTwoProject( store,
-                                                       "name1",
-                                                       "nagEmailAddress1",
-                                                       "version1",
+        ContinuumProject project = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
                                                        "commandLineArguments1" );
 
         String projectId = project.getId();
@@ -399,11 +357,8 @@
         throws Exception
     {
 //        ContinuumProject project = addMavenTwoProject( store, "Maven Two Project" );
-        MavenTwoProject project = addMavenTwoProject( store,
-                                                       "name1",
-                                                       "nagEmailAddress1",
-                                                       "version1",
-                                                       "commandLineArguments1" );
+        MavenTwoProject project = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
+                                                      "commandLineArguments1" );
 
         String projectId = project.getId();
 
@@ -414,7 +369,6 @@
 
         project = (MavenTwoProject) store.getProject( projectId );
 
-
         assertEquals( "New name", project.getName() );
         assertEquals( "clean test", project.getGoals() );
     }
@@ -466,10 +420,7 @@
         lookup( JdoFactory.ROLE );
 
 //        String projectId = addMavenTwoProject( store, "Build Test Project" ).getId();
-        String projectId = addMavenTwoProject( store,
-                                               "name1",
-                                               "nagEmailAddress1",
-                                               "version1",
+        String projectId = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
                                                "commandLineArguments1" ).getId();
 
         // ----------------------------------------------------------------------
@@ -494,10 +445,7 @@
 
         scmResult.getFiles().add( scmFile );
 
-        setBuildComplete( store,
-                          build,
-                          scmResult,
-                          makeContinuumBuildExecutionResult( "output", 10 ) );
+        setBuildComplete( store, build, scmResult, makeContinuumBuildExecutionResult( "output", 10 ) );
 
         // ----------------------------------------------------------------------
         // Store and check the build object
@@ -516,9 +464,7 @@
         assertEquals( "build.id", buildId, build.getId() );
     }
 
-    private void setBuildComplete( ContinuumStore store,
-                                   ContinuumBuild build,
-                                   ScmResult scmResult,
+    private void setBuildComplete( ContinuumStore store, ContinuumBuild build, ScmResult scmResult,
                                    ContinuumBuildExecutionResult result )
         throws ContinuumStoreException
     {
@@ -541,24 +487,15 @@
         // ----------------------------------------------------------------------
 
 //        String projectId = addMavenTwoProject( store, "Association Test Project" ).getId();
-        String projectId = addMavenTwoProject( store,
-                                               "Association Test Project",
-                                               "nagEmailAddress1",
-                                               "version1",
+        String projectId = addMavenTwoProject( store, "Association Test Project", "nagEmailAddress1", "version1",
                                                "commandLineArguments1" ).getId();
 
 //        String projectIdFoo = addMavenTwoProject( store, "Foo Project" ).getId();
-        String projectIdFoo = addMavenTwoProject( store,
-                                                  "Foo Project",
-                                                  "nagEmailAddress1",
-                                                  "version1",
+        String projectIdFoo = addMavenTwoProject( store, "Foo Project", "nagEmailAddress1", "version1",
                                                   "commandLineArguments1" ).getId();
 
 //        String projectIdBar = addMavenTwoProject( store, "Bar Project" ).getId();
-        String projectIdBar = addMavenTwoProject( store,
-                                                  "Bar Project",
-                                                  "nagEmailAddress1",
-                                                  "version1",
+        String projectIdBar = addMavenTwoProject( store, "Bar Project", "nagEmailAddress1", "version1",
                                                   "commandLineArguments1" ).getId();
 
         // ----------------------------------------------------------------------
@@ -571,7 +508,6 @@
         {
             expectedBuilds.add( createBuild( store, projectId, false ).getId() );
 
-
             createBuild( store, projectIdFoo, false );
 
             createBuild( store, projectIdBar, false );
@@ -587,7 +523,7 @@
 
         assertNotNull( build );
 
-        assertEquals( build.getId(), (String) expectedBuilds.get( expectedBuilds.size() - 1) );
+        assertEquals( build.getId(), (String) expectedBuilds.get( expectedBuilds.size() - 1 ) );
 
         List actualBuilds = new ArrayList( store.getBuildsForProject( projectId, 0, 0 ) );
 
@@ -603,7 +539,7 @@
         {
             String expectedBuildId = (String) expectedIt.next();
 
-            String actualBuildId = ((ContinuumBuild) actualIt.next()).getId();
+            String actualBuildId = ( (ContinuumBuild) actualIt.next() ).getId();
 
             assertEquals( "builds[" + i + "]", expectedBuildId, actualBuildId );
         }
@@ -613,10 +549,7 @@
         throws Exception
     {
 //        String projectId = addMavenTwoProject( store, "Association Test Project" ).getId();
-        String projectId = addMavenTwoProject( store,
-                                               "name1",
-                                               "nagEmailAddress1",
-                                               "version1",
+        String projectId = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
                                                "commandLineArguments1" ).getId();
 
         int size = 10;
@@ -655,10 +588,7 @@
         // ----------------------------------------------------------------------
 
 //        String projectId = addMavenTwoProject( store, "Build Result Project" ).getId();
-        String projectId = addMavenTwoProject( store,
-                                               "name1",
-                                               "nagEmailAddress1",
-                                               "version1",
+        String projectId = addMavenTwoProject( store, "name1", "nagEmailAddress1", "version1",
                                                "commandLineArguments1" ).getId();
 
         long now = System.currentTimeMillis();
@@ -683,12 +613,8 @@
 
         ScmResult scmResult = new ScmResult();
 
-        setBuildResult( store,
-                        build,
-                        ContinuumProjectState.OK,
-                        makeContinuumBuildExecutionResult(  "output", 1 ),
-                        scmResult,
-                        null );
+        setBuildResult( store, build, ContinuumProjectState.OK, makeContinuumBuildExecutionResult( "output", 1 ),
+                        scmResult, null );
 
         // ----------------------------------------------------------------------
         //
@@ -750,10 +676,7 @@
     {
         // create project
 //        ContinuumProject project = addMavenTwoProject( store, "Project Scheduling" );
-        ContinuumProject project = addMavenTwoProject( store,
-                                                       "Project Scheduling",
-                                                       "nagEmailAddress1",
-                                                       "version1",
+        ContinuumProject project = addMavenTwoProject( store, "Project Scheduling", "nagEmailAddress1", "version1",
                                                        "commandLineArguments1" );
 
         String projectId = project.getId();
@@ -791,7 +714,7 @@
 
         assertTrue( schedule.isActive() );
 
-        assertEquals( ContinuumSchedulerConstants.SCM_MODE_UPDATE, schedule.getScmMode() );
+        assertEquals( SCM_MODE, schedule.getScmMode() );
 
         assertEquals( 3600, schedule.getDelay() );
 
@@ -835,11 +758,8 @@
         schedule = store.addSchedule( schedule );
 
 //        ContinuumProject project = addMavenTwoProject( store, "Project" );
-        ContinuumProject project = addMavenTwoProject( store,
-                                                       "Project Schedule Test Project",
-                                                       "nagEmailAddress1",
-                                                       "version1",
-                                                       "commandLineArguments1" );
+        ContinuumProject project = addMavenTwoProject( store, "Project Schedule Test Project", "nagEmailAddress1",
+                                                       "version1", "commandLineArguments1" );
 
         // add project
         schedule.addProject( project );
@@ -905,7 +825,7 @@
 
         schedule.setActive( true );
 
-        schedule.setScmMode( ContinuumSchedulerConstants.SCM_MODE_UPDATE );
+        schedule.setScmMode( SCM_MODE );
 
         schedule.setDelay( 3600 );
 

Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Thu Aug  4 08:56:36 2005
@@ -34,22 +34,22 @@
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUtils;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.jdo.JdoFactory;
-import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.ConfigurableJdoFactory;
+import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.util.FileUtils;
 import org.jpox.SchemaTool;
 
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.Properties;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.PersistenceManager;
-import java.io.IOException;
+import java.util.Properties;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -406,7 +406,7 @@
         return store.updateProject( project );
     }
 
-    public static void setBuildResult( ContinuumStore store,
+    public void setBuildResult( ContinuumStore store,
                                        ContinuumBuild build,
                                        int state,
                                        ContinuumBuildExecutionResult result,
@@ -428,10 +428,10 @@
 
         build.setExitCode( result.getExitCode() );
 
-        String outputFile = store.getBuildOutputFile( build.getId() ).getAbsolutePath();
-
         try
         {
+            String outputFile = store.getBuildOutputFile( build.getId() ).getAbsolutePath();
+
             FileUtils.fileWrite( outputFile, result.getOutput() );
         }
         catch ( IOException e )

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=227420&r1=227419&r2=227420&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Aug  4 08:56:36 2005
@@ -82,6 +82,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
+        <artifactId>continuum-store</artifactId>
+        <version>1.0-beta-1-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-core</artifactId>
         <version>1.0-beta-1-SNAPSHOT</version>
       </dependency>
@@ -244,6 +249,7 @@
     <module>continuum-model</module>
     <module>continuum-notifiers</module>
     <module>continuum-plexus-application</module>
+    <module>continuum-store</module>
     <module>continuum-test</module>
     <module>continuum-web</module>
     <!--



Mime
View raw message