continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r225432 - in /maven/continuum/branches/trygvis-test: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/ continuum-core/src/main/java/org/apache/maven/continuu...
Date Wed, 27 Jul 2005 00:24:23 GMT
Author: trygvis
Date: Tue Jul 26 17:23:48 2005
New Revision: 225432

URL: http://svn.apache.org/viewcvs?rev=225432&view=rev
Log: (empty)

Added:
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml   (with props)
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml   (with props)
    maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml   (with props)
    maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh   (with props)
Modified:
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
    maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
    maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java
    maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo
    maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
    maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
    maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/configuration.xml
    maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
    maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/templates/screens/Summary.vm

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Jul 26 17:23:48 2005
@@ -75,6 +75,7 @@
 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>
@@ -578,6 +579,10 @@
         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." );
+        getLogger().info( result.getWarnings().size() + " warnings." );
+
         // ----------------------------------------------------------------------
         // Look for any warnings.
         // ----------------------------------------------------------------------
@@ -631,16 +636,18 @@
             throw new ContinuumException( "Error while querying for project group.", e );
         }
 
-//        try
-//        {
-//            projectGroup = store.getProjectGroup( projectGroup.getId() );
-//        }
-//        catch ( ContinuumStoreException e )
-//        {
-//            throw new ContinuumException( "Error while querying for project group.", e );
-//        }
-
-        projectGroup.getProjects();
+        try
+        {
+            System.err.println( "----------------------" );
+            System.err.println( "PRE:" );
+            System.err.println( "projectGroup count: " + store.getProjectGroups().size() );
+            System.err.println( "project count: " + store.getAllProjects().size() );
+            System.err.println( "----------------------" );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error while querying for project group.", e );
+        }
 
         // ----------------------------------------------------------------------
         // Save all the projects
@@ -653,22 +660,102 @@
         {
             ContinuumProject project = (ContinuumProject) i.next();
 
-            project.setExecutorId( buildExecutorId );
-
-            projectGroup.addProject( project );
+//            for ( Iterator it = result.getProjects().iterator(); it.hasNext(); )
+//            {
+//                ContinuumProject p2 = (ContinuumProject) it.next();
+//
+//                getLogger().info( "Adding project " + p2.getName() + ", project.hashCode(): " + p2.hashCode() );
+//            }
 
-            context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT, project );
+            project.setExecutorId( buildExecutorId );
 
-            executeAction( "validate-project", context );
+            try
+            {
+//                System.err.println( "=======================" );
+//                System.err.println( "before store" );
+//                System.err.println( "projectGroup.projects.size: " + store.getProjectGroup( projectGroup.getId() ).getProjects().size() );
+//                System.err.println( "projectGroup count: " + store.getProjectGroups().size() );
+//                System.err.println( "project count: " + store.getAllProjects().size() );
+//                for ( Iterator j = store.getAllProjects().iterator(); j.hasNext(); )
+//                {
+//                    project = (ContinuumProject) j.next();
+//                    System.err.println( project.getId() );
+//                }
+//                System.err.println( "=======================" );
+
+                project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) );
+                System.err.println( "persisting " + project.getName() + ", id: " + project.getId() );
+                project = store.addProject( project );
+                System.err.println( "persisting " + project.getName() + ", id: " + project.getId() );
+
+//                dumpJdoObject( projectGroup, "project group before adding project" );
+//                dumpJdoObject( project, "project before setting project group" );
+                projectGroup.addProject( project );
+//                dumpJdoObject( projectGroup, "project group after adding project" );
+//                dumpJdoObject( project, "project after setting project group" );
+
+                projectGroup = store.updateProjectGroup( projectGroup );
+
+//                System.err.println( "=======================" );
+//                System.err.println( "after store" );
+//                System.err.println( "projectGroup.projects.size: " + store.getProjectGroup( projectGroup.getId() ).getProjects().size() );
+//                System.err.println( "projectGroup count: " + store.getProjectGroups().size() );
+//                System.err.println( "project count: " + store.getAllProjects().size() );
+//                for ( Iterator j = store.getAllProjects().iterator(); j.hasNext(); )
+//                {
+//                    project = (ContinuumProject) j.next();
+//                    System.err.println( "project: id: " + project.getId() + ", name: " + project.getName() );
+//                }
+//                System.err.println( "=======================" );
+            }
+            catch ( ContinuumStoreException e )
+            {
+                throw new ContinuumException( "crap", e );
+            }
 
-            executeAction( "store-project", context );
+//            project.setProjectGroup( projectGroup );
+//
+            context = new HashMap();
 
-            project.setId( (String) context.get( StoreProjectAction.KEY_PROJECT_ID ) );
+            context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT, project );
+//
+//            executeAction( "validate-project", context );
+//
+//            executeAction( "store-project", context );
+//
+            context.put( AbstractContinuumAction.KEY_PROJECT_ID, project.getId() );
 
             executeAction( "add-project-to-checkout-queue", context );
         }
 
+//        try
+//        {
+//            System.err.println( "----------------------" );
+//            System.err.println( "POST:" );
+//            System.err.println( "projectGroup count: " + store.getProjectGroups().size() );
+//            System.err.println( "project count: " + store.getAllProjects().size() );
+//            System.err.println( "----------------------" );
+//        }
+//        catch ( ContinuumStoreException e )
+//        {
+//            throw new ContinuumException( "Error while querying for the project group.", e );
+//        }
+
         return result;
+    }
+
+    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( "----------" );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Tue Jul 26 17:23:48 2005
@@ -181,8 +181,6 @@
 
                 cd.setVersion( dependency.getVersion() );
 
-                System.out.println( "adding cd = " + cd );
-
                 dependencies.add( cd );
             }
 

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java Tue Jul 26 17:23:48 2005
@@ -1,8 +1,5 @@
 package org.apache.maven.continuum.initialization;
 
-import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -19,6 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.project.ContinuumBuildSettings;
+
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id:$
@@ -29,8 +28,6 @@
 
     void initialize()
         throws ContinuumInitializationException;
-
-    ContinuumProjectGroup getDefaultProjectGroup();
 
     ContinuumBuildSettings getDefaultBuildSettings();
 }

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Tue Jul 26 17:23:48 2005
@@ -1,12 +1,5 @@
 package org.apache.maven.continuum.initialization;
 
-import org.apache.maven.continuum.build.settings.BuildSettingsConstants;
-import org.apache.maven.continuum.project.ContinuumBuildSettings;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
-import org.apache.maven.continuum.store.ContinuumStore;
-import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -23,6 +16,12 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.build.settings.BuildSettingsConstants;
+import org.apache.maven.continuum.project.ContinuumBuildSettings;
+import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id:$
@@ -55,8 +54,6 @@
     // Default project group and build settings
     // ----------------------------------------------------------------------
 
-    private ContinuumProjectGroup defaultProjectGroup;
-
     private ContinuumBuildSettings defaultBuildSettings;
 
     // ----------------------------------------------------------------------
@@ -85,33 +82,6 @@
         {
             throw new ContinuumInitializationException( "Error storing default Continuum build settings.", e );
         }
-
-        defaultProjectGroup = createDefaultProjectGroup();
-
-        try
-        {
-            defaultProjectGroup = store.addProjectGroup( defaultProjectGroup );
-        }
-        catch ( ContinuumStoreException e )
-        {
-            throw new ContinuumInitializationException( "Error storing default Continuum project group.", e );
-        }
-
-        defaultProjectGroup.addBuildSetting( defaultBuildSettings );
-
-        try
-        {
-            defaultProjectGroup = store.updateProjectGroup( defaultProjectGroup );
-        }
-        catch ( ContinuumStoreException e )
-        {
-            throw new ContinuumInitializationException( "Error updating default Continuum project group.", e );
-        }
-    }
-
-    public ContinuumProjectGroup getDefaultProjectGroup()
-    {
-        return defaultProjectGroup;
     }
 
     public ContinuumBuildSettings getDefaultBuildSettings()
@@ -122,20 +92,6 @@
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
-
-    public ContinuumProjectGroup createDefaultProjectGroup()
-        throws ContinuumInitializationException
-    {
-        ContinuumProjectGroup projectGroup = new ContinuumProjectGroup();
-
-        projectGroup.setName( DEFAULT_PROJECT_GROUP_NAME );
-
-        projectGroup.setGroupId( DEFAULT_PROJECT_GROUP_ID );
-
-        projectGroup.setDescription( DEFAULT_PROJECT_GROUP_DESCRIPTION );
-
-        return projectGroup;
-    }
 
     public ContinuumBuildSettings createDefaultBuildSettings()
         throws ContinuumInitializationException

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Tue Jul 26 17:23:48 2005
@@ -98,9 +98,7 @@
         }
         catch ( IOException e )
         {
-            getLogger().warn( "Could not download the URL", e );
-
-            result.addWarning( "Could not download " + url );
+            result.addWarning( "Could not download " + url + ": " + e.getMessage() );
 
             return;
         }

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Tue Jul 26 17:23:48 2005
@@ -188,6 +188,16 @@
                 pm.attachCopyAll( project.getBuildGroups(), true );
             }
 
+//            if ( project.getProjectGroup() != null )
+//            {
+//                pm.attachCopy( project.getProjectGroup(), true );
+//            }
+//
+//            if ( project.getScmResult() != null )
+//            {
+//                pm.attachCopy( project.getScmResult(), true );
+//            }
+
             pm.attachCopy( project, true );
 
             commit( tx );

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml Tue Jul 26 17:23:48 2005
@@ -525,7 +525,7 @@
           </property>
           <property>
             <name>javax.jdo.option.ConnectionURL</name>
-            <value>jdbc:hsqldb:${plexus.home}/continuum-database</value>
+            <value>jdbc:hsqldb:mem:foo</value>
           </property>
           <property>
             <name>javax.jdo.option.ConnectionUserName</name>

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Tue Jul 26 17:23:48 2005
@@ -17,11 +17,16 @@
  */
 
 import org.apache.maven.continuum.project.MavenTwoProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.io.File;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -30,6 +35,7 @@
 public class DefaultContinuumTest
     extends AbstractContinuumTest
 {
+/*
     public void testContinuumConfiguration()
         throws Exception
     {
@@ -47,7 +53,51 @@
 
         lookup( TaskQueueExecutor.ROLE, "check-out-project" );
     }
+*/
+    public void testAddMavenTwoProjectSet()
+        throws Exception
+    {
+        Continuum continuum = (Continuum) lookup( Continuum.ROLE );
+
+        int projectCount = getStore().getAllProjects().size();
+
+        int projectGroupCount = getStore().getProjectGroups().size();
+
+        File rootPom = getTestFile( "src/test/resources/projects/continuum/continuum-notifiers/pom.xml" );
+
+        ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( rootPom.toURL().toExternalForm() );
+
+        assertNotNull( result );
+
+        assertEquals( "result.warnings.size", 0, result.getWarnings().size() );
+
+        assertEquals( "result.projects.size", 2, result.getProjects().size() );
 
+        assertEquals( "result.projectGroups.size", 1, result.getProjectGroups().size() );
+
+        System.err.println( "number of projects: " + getStore().getAllProjects().size() );
+
+        System.err.println( "number of project groups: " + getStore().getProjectGroups().size() );
+
+        assertEquals( "Total project count", projectCount + 2, getStore().getAllProjects().size() );
+
+        assertEquals( "Total project group count.", projectGroupCount + 1, getStore().getProjectGroups().size() );
+
+        Map projects = new HashMap();
+
+        for ( Iterator i = getStore().getAllProjects().iterator(); i.hasNext(); )
+        {
+            ContinuumProject project = (ContinuumProject) i.next();
+
+            projects.put( project.getName(), project );
+        }
+
+        assertTrue( "no irc notifier", projects.containsKey( "Continuum IRC Notifier" ) );
+
+        assertTrue( "no jabber notifier", projects.containsKey( "Continuum Jabber Notifier" ) );
+        // TODO: assert that the project is the in the group
+    }
+/*
     public void testUpdateMavenTwoProject()
         throws Exception
     {
@@ -81,4 +131,5 @@
 
         assertNotNull( "The command line arguments are null.", project.getCommandLineArguments() );
     }
+*/
 }

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Tue Jul 26 17:23:48 2005
@@ -128,8 +128,8 @@
 
         assertEquals( 1, result.getWarnings().size() );
 
-        assertTrue( "Does not end with I'm-not-here-project/pom.xml",
-                    result.getWarnings().get( 0 ).toString().endsWith( "I'm-not-here-project/pom.xml" ) );
+        assertTrue( "Does not end with \"I'm-not-here-project/pom.xml\"",
+                    result.getWarnings().get( 0 ).toString().indexOf( "I'm-not-here-project/pom.xml" ) != -1 );
 
         // ----------------------------------------------------------------------
         // Assert the project group built

Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/ContinuumTypicalUsageTest.java Tue Jul 26 17:23:48 2005
@@ -17,8 +17,6 @@
  */
 
 import org.apache.maven.continuum.AbstractContinuumTest;
-import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.initialization.DefaultContinuumInitializer;
 import org.apache.maven.continuum.project.ContinuumProjectGroup;
 import org.apache.maven.continuum.project.MavenTwoProject;
 
@@ -55,31 +53,60 @@
     public void testContinuumTypicalUsage()
         throws Exception
     {
-        Continuum continuum = (Continuum) lookup( Continuum.ROLE );
+        ContinuumProjectGroup projectGroup = AbstractContinuumTest.getDefaultProjectGroup( getStore() );
 
-        ContinuumProjectGroup defaultProjectGroup = AbstractContinuumTest.getDefaultProjectGroup( getStore() );
-            //continuum.getDefaultProjectGroup();
+        int projectGroupProjectCount = projectGroup.getProjects().size();
+
+        int projectCount = getStore().getAllProjects().size();
+
+        int projectGroupCount = getStore().getProjectGroups().size();
 
         // ----------------------------------------------------------------------
         // At this point we can now accept new projects into the system
         // ----------------------------------------------------------------------
 
-        MavenTwoProject project = makeStubMavenTwoProject( "test1" );
+        MavenTwoProject project1 = makeStubMavenTwoProject( "Typical Project 1" );
+
+        project1.setProjectGroup( projectGroup );
+
+        project1 = addMavenTwoProject( getStore(), project1 );
 
-        project = addMavenTwoProject( getStore(), project );
+        assertNotNull( project1.getProjectGroup() );
+
+        assertEquals( projectGroup.getName(), project1.getProjectGroup().getName() );
+
+        assertEquals( projectGroup.getDescription(), project1.getProjectGroup().getDescription() );
+
+        assertEquals( projectGroup.getGroupId(), project1.getProjectGroup().getGroupId() );
 
         // ----------------------------------------------------------------------
-        // Now that we have a project we want to add it to the default project group
+        //
         // ----------------------------------------------------------------------
 
-        defaultProjectGroup.addProject( project );
+        MavenTwoProject project2 = makeStubMavenTwoProject( "Typical Project 2" );
+
+        project2.setProjectGroup( projectGroup );
+
+        project2 = addMavenTwoProject( getStore(), project2 );
+
+        assertNotNull( project2.getProjectGroup() );
+
+        assertEquals( projectGroup.getName(), project2.getProjectGroup().getName() );
+
+        assertEquals( projectGroup.getDescription(), project2.getProjectGroup().getDescription() );
+
+        assertEquals( projectGroup.getGroupId(), project2.getProjectGroup().getGroupId() );
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
 
-        getStore().updateProjectGroup( defaultProjectGroup );
+        projectGroup = getDefaultProjectGroup( getStore() );
 
-        assertEquals( defaultProjectGroup.getName(), project.getProjectGroup().getName() );
+        assertEquals( projectGroupProjectCount + 2, projectGroup.getProjects().size() );
 
-        assertEquals( defaultProjectGroup.getDescription(), project.getProjectGroup().getDescription() );
+        assertEquals( projectCount + 2, getStore().getAllProjects().size() );
 
-        assertEquals( defaultProjectGroup.getGroupId(), project.getProjectGroup().getGroupId() );
+        assertEquals( projectGroupCount, getStore().getProjectGroups().size() );
     }
 }

Added: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=225432&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml (added)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml Tue Jul 26 17:23:48 2005
@@ -0,0 +1,23 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent-notifiers</artifactId>
+    <version>1.0-beta-1-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-notifier-irc</artifactId>
+  <name>Continuum IRC Notifier</name>
+  <version>1.0-beta-1-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-notifier-api</artifactId>
+      <version>1.0-beta-1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-ircbot</artifactId>
+      <version>1.1-alpha-4</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=225432&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml (added)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml Tue Jul 26 17:23:48 2005
@@ -0,0 +1,23 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent-notifiers</artifactId>
+    <version>1.0-beta-1-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-notifier-jabber</artifactId>
+  <name>Continuum Jabber Notifier</name>
+  <version>1.0-beta-1-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-notifier-api</artifactId>
+      <version>1.0-beta-1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-jabber</artifactId>
+      <version>1.0-alpha-1</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml?rev=225432&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml (added)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml Tue Jul 26 17:23:48 2005
@@ -0,0 +1,29 @@
+<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-parent-notifiers</artifactId>
+  <version>1.0-beta-1-SNAPSHOT</version>
+  <name>Continuum Notifiers</name>
+  <packaging>pom</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-api</artifactId>
+      <!-- TODO: remove -->
+      <version>1.0-beta-1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-notification</artifactId>
+      <version>1.0-alpha-4</version>
+    </dependency>
+  </dependencies>
+  <modules>
+    <module>continuum-notifier-irc</module>
+    <module>continuum-notifier-jabber</module>
+  </modules>
+</project>

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/branches/trygvis-test/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/META-INF/package.jdo Tue Jul 26 17:23:48 2005
@@ -7,6 +7,11 @@
 <jdo>
   <package name="org.apache.maven.continuum.project">
     <class name="ContinuumProject" detachable="true" identity-type="application">
+      <inheritance strategy="superclass-table">
+        <discriminator strategy="class-name">
+          <column name="PROJECT_TYPE"/>
+        </discriminator>
+      </inheritance>
       <field name="id" persistence-modifier="persistent" primary-key="true" value-strategy="native"/>
       <field name="name" persistence-modifier="persistent"/>
       <field name="scmUrl" persistence-modifier="persistent"/>
@@ -18,8 +23,12 @@
       <field name="previousBuildId" persistence-modifier="persistent"/>
       <field name="buildNumber" persistence-modifier="persistent"/>
       <field name="scmResult" persistence-modifier="persistent" default-fetch-group="true" dependent="true"/>
-      <field name="checkOutErrorMessage" persistence-modifier="persistent"/>
-      <field name="checkOutErrorException" persistence-modifier="persistent"/>
+      <field name="checkOutErrorMessage" persistence-modifier="persistent">
+        <column jdbc-type="CLOB"/>
+      </field>
+      <field name="checkOutErrorException" persistence-modifier="persistent">
+        <column jdbc-type="CLOB"/>
+      </field>
       <field name="mailType" persistence-modifier="persistent"/>
       <field name="commandLineArguments" persistence-modifier="persistent"/>
       <field name="url" persistence-modifier="persistent"/>
@@ -98,21 +107,29 @@
       <field name="version" persistence-modifier="persistent"/>
     </class>
     <class name="MavenTwoProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
-      <inheritance strategy="new-table"/>
-      <field name="goals" persistence-modifier="persistent"/>
+      <inheritance strategy="superclass-table"/>
+      <field name="goals" persistence-modifier="persistent">
+        <column name="M2_GOALS"/>
+      </field>
     </class>
     <class name="MavenOneProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
-      <inheritance strategy="new-table"/>
-      <field name="goals" persistence-modifier="persistent"/>
+      <inheritance strategy="superclass-table"/>
+      <field name="goals" persistence-modifier="persistent">
+        <column name="M1_GOALS"/>
+      </field>
     </class>
     <class name="AntProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
-      <inheritance strategy="new-table"/>
-      <field name="executable" persistence-modifier="persistent"/>
+      <inheritance strategy="superclass-table"/>
+      <field name="executable" persistence-modifier="persistent">
+        <column name="ANT_EXECUTABLE"/>
+      </field>
       <field name="targets" persistence-modifier="persistent"/>
     </class>
     <class name="ShellProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject" detachable="true">
-      <inheritance strategy="new-table"/>
-      <field name="executable" persistence-modifier="persistent"/>
+      <inheritance strategy="superclass-table"/>
+      <field name="executable" persistence-modifier="persistent">
+        <column name="SHELL_EXECUTABLE"/>
+      </field>
     </class>
     <class name="ContinuumBuild" detachable="true" identity-type="application">
       <field name="project" persistence-modifier="persistent" null-value="exception" default-fetch-group="false"/>
@@ -194,8 +211,12 @@
   <package name="org.apache.maven.continuum.scm">
     <class name="ScmResult" detachable="true" identity-type="datastore">
       <field name="success" persistence-modifier="persistent"/>
-      <field name="providerMessage" persistence-modifier="persistent"/>
-      <field name="commandOutput" persistence-modifier="persistent"/>
+      <field name="providerMessage" persistence-modifier="persistent">
+        <column jdbc-type="CLOB"/>
+      </field>
+      <field name="commandOutput" persistence-modifier="persistent">
+        <column jdbc-type="CLOB"/>
+      </field>
       <field name="files" persistence-modifier="persistent" default-fetch-group="true">
         <collection element-type="ScmFile" dependent-element="true"/>
       </field>

Added: maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh?rev=225432&view=auto
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh (added)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh Tue Jul 26 17:23:48 2005
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+
+echo "to connect to the database write: connect 'jdbc:derby:target/plexus-test-runtime/apps/continuum/database';"
+exec java -cp ~/repository/org/apache/incubator/derby/derby/10.0.2.1/derby-10.0.2.1.jar:/home/trygvis/repository/org/apache/incubator/derby/derbytools/10.0.2.1/derbytools-10.0.2.1.jar org.apache.derby.impl.tools.ij.Main
+
+

Propchange: maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/branches/trygvis-test/continuum-plexus-application/debug-derby.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml Tue Jul 26 17:23:48 2005
@@ -154,9 +154,9 @@
     </dependency>
 
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.7.3.0</version>
+      <groupId>org.apache.incubator.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.0.2.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml Tue Jul 26 17:23:48 2005
@@ -139,8 +139,8 @@
           <role>org.codehaus.plexus.ircbot.IrcBot</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>        
-        </requirement>        
+          <role>org.apache.maven.continuum.store.ContinuumStore</role>
+        </requirement>
         <requirement>
           <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
         </requirement>
@@ -168,7 +168,7 @@
         </requirement>
         <!--
         <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>        
+          <role>org.apache.maven.continuum.store.ContinuumStore</role>
         </requirement>
         -->
       </requirements>
@@ -201,7 +201,7 @@
         </requirement>
         <!--
         <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>        
+          <role>org.apache.maven.continuum.store.ContinuumStore</role>
         </requirement>
         -->
       </requirements>
@@ -241,7 +241,7 @@
         <delay>3600</delay>
       </configuration>
     </component>
-    
+
     <component>
       <role>org.apache.maven.continuum.trigger.ContinuumTrigger</role>
       <role-hint>quartz-alarm-clock</role-hint>
@@ -252,7 +252,7 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.continuum.scheduler.ContinuumScheduler</role>
-        </requirement>        
+        </requirement>
       </requirements>
       <configuration>
         <!--
@@ -266,7 +266,7 @@
         |-->
         <delay>3600</delay>
       </configuration>
-    </component>    
+    </component>
 
     <component>
       <role>org.apache.maven.continuum.network.ConnectionFactory</role>
@@ -320,15 +320,15 @@
             <name>org.jpox.autoStartMechanismMode</name>
             <value>Quiet</value>
           </property>
-          <!-- JDBC connection configuration -->
-          <!-- -->
+
+          <!-- Apache Derby Configuration -->
           <property>
             <name>javax.jdo.option.ConnectionDriverName</name>
-            <value>org.hsqldb.jdbcDriver</value>
+            <value>org.apache.derby.jdbc.EmbeddedDriver</value>
           </property>
           <property>
             <name>javax.jdo.option.ConnectionURL</name>
-            <value>jdbc:hsqldb:${plexus.home}/database</value>
+            <value>jdbc:derby:${plexus.home}/database;create=true</value>
           </property>
           <property>
             <name>javax.jdo.option.ConnectionUserName</name>
@@ -338,6 +338,8 @@
             <name>javax.jdo.option.ConnectionPassword</name>
             <value></value>
           </property>
+
+          <!-- Postgresql Configuration -->
           <!--
           <property>
             <name>javax.jdo.option.ConnectionDriverName</name>
@@ -351,29 +353,29 @@
             <name>javax.jdo.option.ConnectionUserName</name>
             <value>trygvis</value>
           </property>
+          <property>
+            <name>javax.jdo.option.ConnectionPassword</name>
+            <value></value>
+          </property>
           -->
-          <!--
-          | NOTE: This is the only value HSQLDB supports so we're hardcoding this value
-          | here to prevent JPOX from complaining about the lack of support when running the
-          | unit tests. When running with Continuum in a production enviroment
-          | READ_COMMITTED should be used.
-          |-->
           <property>
             <name>org.jpox.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>javax.jdo.option.ConnectionPassword</name>
             <value></value>
           </property>
+<!--
           <property>
-            <name>hsqldb.nio_data_file</name>
-            <value>false</value>
+            <name></name>
+            <value></value>
           </property>
+-->
         </properties>
       </configuration>
     </component>
@@ -410,7 +412,7 @@
           <property>
             <name>file.resource.loader.cache</name>
             <value>@velocity.resource.caching@</value>
-          </property>          
+          </property>
         </properties>
       </configuration>
     </component>
@@ -501,6 +503,10 @@
           <level>
             <hierarchy>org.codehaus.plexus.velocity</hierarchy>
             <level>WARN</level>
+          </level>
+          <level>
+            <hierarchy>org.codehaus.plexus.mailsender.MailSender</hierarchy>
+            <level>INFO</level>
           </level>
           <level>
             <hierarchy>JPOX</hierarchy>

Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/configuration.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/configuration.xml?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/configuration.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/configuration.xml Tue Jul 26 17:23:48 2005
@@ -1,4 +1,4 @@
 <configuration>
   <url>http://localhost:8080/continuum/servlet/continuum</url>
-  <working-directory>${plexus.app}/working-directory</working-directory>
+  <working-directory>working-directory</working-directory>
 </configuration>

Modified: maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Tue Jul 26 17:23:48 2005
@@ -39,6 +39,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+import javax.jdo.JDOHelper;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -221,7 +222,9 @@
             project.setProjectGroup( getDefaultProjectGroup( store ) );
         }
 
-        assertNotNull( project.getProjectGroup() );
+        assertNotNull( "project group == null", project.getProjectGroup() );
+
+        assertTrue( "!JDOHelper.isDetached( project.getProjectGroup() )", JDOHelper.isDetached( project.getProjectGroup() ) );
 
         // ----------------------------------------------------------------------
         //
@@ -231,7 +234,7 @@
 
         assertNotNull( addedProject );
 
-        assertNotNull( addedProject.getProjectGroup() );
+        assertNotNull( "project group == null", addedProject.getProjectGroup() );
 
         // ----------------------------------------------------------------------
         //
@@ -251,7 +254,9 @@
 
         scmResult.addFile( scmFile );
 
-        addedProject = setCheckoutDone( store, addedProject, scmResult, null, null );
+//        addedProject = setCheckoutDone( store, addedProject, scmResult, null, null );
+
+        assertNotNull( "project group == null", addedProject.getProjectGroup() );
 
         return (MavenTwoProject) addedProject;
     }

Modified: maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/templates/screens/Summary.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/templates/screens/Summary.vm?rev=225432&r1=225431&r2=225432&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/templates/screens/Summary.vm (original)
+++ maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/templates/screens/Summary.vm Tue Jul 26 17:23:48 2005
@@ -40,17 +40,17 @@
 
       <tr class="$css.nextClass">
         <td>$state.generate( $item )</td>
-        <td>$item.name</td>
-        <td>$item.version</td>
+        <td>$!item.name</td>
+        <td>$!item.version</td>
         <td>$item.buildNumber</td>
-        <td><a href="$link.setPage('View.vm').addPathInfo('fid', "${item.executorId}Project").addPathInfo('id', $item.id)">View</a></td>
+        <td><a href="$link.setPage('View.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">View</a></td>
 
         ## Operations
 
-        <td><a href="$link.setPage('Edit.vm').addPathInfo('fid', "${item.executorId}Project").addPathInfo('id', $item.id)">Edit</a></td>
+        <td><a href="$link.setPage('Edit.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">Edit</a></td>
 
         #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 )
-        <td><a href="$link.setPage('Delete.vm').addPathInfo('fid', "${item.executorId}Project").addPathInfo('id', $item.id)">Delete</a></td>
+        <td><a href="$link.setPage('Delete.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">Delete</a></td>
         #else
         <td>Delete</td>
         #end



Mime
View raw message