continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r431430 [2/3] - in /maven/continuum/branches/continuum-acegi: ./ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ continuum-cc/src/main/java/org/apache/maven/con...
Date Mon, 14 Aug 2006 20:36:21 GMT
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Mon Aug 14 13:36:17 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.project.builder.maven;
 
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 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.
@@ -65,16 +65,10 @@
 
         File pomFile;
 
-        try
-        {
-            pomFile = createMetadataFile( url, username, password );
-        }
-        catch ( IOException e )
+        pomFile = createMetadataFile( result, url, username, password );
+        
+        if ( pomFile == null )
         {
-            getLogger().warn( "Could not download the URL", e );
-
-            result.addWarning( "Could not download the URL '" + url + "'." );
-
             return result;
         }
 
@@ -82,7 +76,12 @@
 
         try
         {
-            metadataHelper.mapMetadata( pomFile, project );
+            metadataHelper.mapMetadata( result, pomFile, project );
+            
+            if ( result.getErrors().size() > 0 )
+            {
+                return result;
+            }
 
             BuildDefinition bd = new BuildDefinition();
 
@@ -102,7 +101,7 @@
             }
             catch ( ContinuumStoreException e )
             {
-                getLogger().warn( "Can't get default schedule.", e );
+                getLogger().error( "Can't get default schedule.", e );
             }
 
             project.addBuildDefinition( bd );
@@ -111,7 +110,9 @@
         }
         catch ( MavenOneMetadataHelperException e )
         {
-            result.addWarning( e.getMessage() );
+            getLogger().error( "Unknown error while processing metadata", e );
+            
+            result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
         }
 
         ProjectGroup projectGroup = new ProjectGroup();
@@ -122,7 +123,7 @@
 
         if ( StringUtils.isEmpty( project.getGroupId() ) )
         {
-            result.addWarning( "groupId is null." );
+            result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_GROUPID );
         }
 
         projectGroup.setGroupId( project.getGroupId() );

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Mon Aug 14 13:36:17 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.project.builder.maven;
 
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 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.
@@ -100,12 +100,14 @@
         }
         catch ( MavenBuilderHelperException e )
         {
+            // TODO add to result with error key
             result.addWarning( e.getMessage() );
 
             return;
         }
         catch ( IOException e )
         {
+            // TODO add to result with error key
             result.addWarning( "Could not download " + url + ": " + e.getMessage() );
 
             return;
@@ -161,7 +163,8 @@
             }
             catch ( MavenBuilderHelperException e )
             {
-                result.addWarning( ContinuumUtils.throwableToString( e ) );
+                // TODO add to result with error key
+                result.addError( ContinuumUtils.throwableToString( e ) );
             }
 
             result.addProject( continuumProject, MavenTwoBuildExecutor.ID );
@@ -200,7 +203,8 @@
             }
             catch ( MalformedURLException e )
             {
-                result.addWarning( "Could not download project from '" + urlString + "'." );
+                // TODO add to result with error key
+                result.addError( "Could not download project from '" + urlString + "'." );
 
                 continue;
             }
@@ -219,7 +223,8 @@
 
         if ( StringUtils.isEmpty( mavenProject.getGroupId() ) )
         {
-            result.addWarning( "groupId is null." );
+            // TODO add to result with error key
+            result.addError( "groupId is null." );
 
             return null;
         }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java Mon Aug 14 13:36:17 2006
@@ -21,10 +21,8 @@
 import org.apache.maven.continuum.model.project.Schedule;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.scheduler.AbstractJob;
-import org.quartz.InterruptableJob;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
-import org.quartz.UnableToInterruptJobException;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -73,7 +71,7 @@
         {
             if ( schedule.getDelay() > 0 )
             {
-                Thread.currentThread().sleep( schedule.getDelay() * 1000 );
+                Thread.sleep( schedule.getDelay() * 1000 );
             }
         }
         catch( InterruptedException e )

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Mon Aug 14 13:36:17 2006
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
-import org.apache.maven.continuum.core.action.CheckoutProjectContinuumAction;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -76,11 +75,11 @@
 
         Map context = new HashMap();
 
-        context.put( CheckoutProjectContinuumAction.KEY_PROJECT_ID, new Integer( projectId ) );
+        context.put( AbstractContinuumAction.KEY_PROJECT_ID, new Integer( projectId ) );
 
-        context.put( CheckoutProjectContinuumAction.KEY_PROJECT, project );
+        context.put( AbstractContinuumAction.KEY_PROJECT, project );
 
-        context.put( CheckoutProjectContinuumAction.KEY_WORKING_DIRECTORY, workingDirectory );
+        context.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, workingDirectory );
 
         try
         {

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Mon Aug 14 13:36:17 2006
@@ -22,6 +22,7 @@
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.codehaus.plexus.mailsender.MailMessage;
+import org.codehaus.plexus.mailsender.MailSender;
 import org.codehaus.plexus.mailsender.test.MockMailSender;
 import org.codehaus.plexus.notification.notifier.Notifier;
 import org.codehaus.plexus.util.CollectionUtils;
@@ -119,7 +120,7 @@
         //
         // ----------------------------------------------------------------------
 
-        MockMailSender mailSender = (MockMailSender) lookup( MockMailSender.ROLE );
+        MockMailSender mailSender = (MockMailSender) lookup( MailSender.ROLE );
 
         assertEquals( 1, mailSender.getReceivedEmailSize() );
 

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Mon Aug 14 13:36:17 2006
@@ -25,8 +25,6 @@
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.codehaus.plexus.notification.notifier.AbstractNotifier;
 
-import java.util.Map;
-
 public abstract class AbstractContinuumNotifier
     extends AbstractNotifier
 {

Modified: maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/test/java/org/apache/maven/continuum/security/acegi/aspectj/ContinuumStub.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/test/java/org/apache/maven/continuum/security/acegi/aspectj/ContinuumStub.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/test/java/org/apache/maven/continuum/security/acegi/aspectj/ContinuumStub.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/test/java/org/apache/maven/continuum/security/acegi/aspectj/ContinuumStub.java Mon Aug 14 13:36:17 2006
@@ -37,6 +37,7 @@
 
 /**
  * Stub implementation of {@link Continuum} with empty implementations.
+ * Needs to be static to be weaved by AspectJ.
  * 
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
@@ -45,6 +46,18 @@
     implements Continuum
 {
 
+    private Collection mockProjects;
+
+    public void setMockProjects( Collection mockProjects )
+    {
+        this.mockProjects = mockProjects;
+    }
+
+    public Collection getMockProjects()
+    {
+        return mockProjects;
+    }
+
     public void addBuildDefinition( int projectId, BuildDefinition buildDefinition )
         throws ContinuumException
     {
@@ -145,7 +158,7 @@
     public Collection getAllProjects( int start, int end )
         throws ContinuumException
     {
-        return null;
+        return getMockProjects();
     }
 
     public List getAllProjectsWithAllDetails( int start, int end )
@@ -439,6 +452,17 @@
     public void updateUserGroup( int userGroupId, Map configuration )
         throws ContinuumException
     {
+    }
+
+    public Collection getAllProjectGroupsWithProjects()
+    {
+        return null;
+    }
+
+    public Collection getProjectsInGroup( int projectGroupId )
+        throws ContinuumException
+    {
+        return null;
     }
 
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Mon Aug 14 13:36:17 2006
@@ -189,11 +189,11 @@
                     else
                     {
                         buildDefinitions = new ArrayList();
+
+                        projects.put( obj[0], buildDefinitions );
                     }
 
                     buildDefinitions.add( obj[1] );
-
-                    projects.put( obj[0], buildDefinitions );
                 }
 
                 return projects;

Modified: maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Mon Aug 14 13:36:17 2006
@@ -538,7 +538,6 @@
     }
 
     public void testGetAllProjects()
-        throws ContinuumStoreException
     {
         List projects = store.getAllProjectsByName();
         assertEquals( "check items", Arrays.asList( new Project[]{testProject1, testProject2} ), projects );
@@ -550,7 +549,6 @@
     }
 
     public void testAddSchedule()
-        throws ContinuumStoreException
     {
         Schedule newSchedule = createTestSchedule( "testAddSchedule", "testAddSchedule desc", 10, "cron test", false );
         Schedule copy = createTestSchedule( newSchedule );
@@ -580,7 +578,6 @@
     }
 
     public void testRemoveSchedule()
-        throws ContinuumStoreException
     {
         Schedule schedule = (Schedule) store.getAllSchedulesByName().get( 2 );
 
@@ -609,7 +606,6 @@
     }
 
     public void testAddProfile()
-        throws ContinuumStoreException
     {
         Installation installationJava14 = createTestInstallation( testInstallationJava14 );
         Installation installationMaven20a3 = createTestInstallation( testInstallationMaven20a3 );
@@ -646,7 +642,6 @@
     }
 
     public void testRemoveProfile()
-        throws ContinuumStoreException
     {
         Profile profile = (Profile) store.getAllProfilesByName().get( 2 );
 
@@ -829,7 +824,6 @@
     }
 
     public void testGetAllProjectsGroupWithDetails()
-        throws ContinuumObjectNotFoundException
     {
         List projectGroups = store.getAllProjectGroupsWithBuildDetails();
         ProjectGroup group1 = (ProjectGroup) projectGroups.get( 0 );

Modified: maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Mon Aug 14 13:36:17 2006
@@ -33,7 +33,7 @@
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
-import java.io.File;
+
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;

Propchange: maven/continuum/branches/continuum-acegi/continuum-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 14 13:36:17 2006
@@ -1,3 +1,4 @@
+
 target
 .classpath
 .project
@@ -5,3 +6,4 @@
 continuum-webapp.iml
 *.ipr
 *.iws
+${plexus.home}

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Mon Aug 14 13:36:17 2006
@@ -12,13 +12,6 @@
   <name>Continuum Web APP</name>
   <version>1.1-SNAPSHOT</version>
   <packaging>war</packaging>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>mortbay-repo</id>
-      <name>mortbay-repo</name>
-      <url>http://www.mortbay.org/maven2/snapshot</url>
-    </pluginRepository>
-  </pluginRepositories>
   <build>
     <filters>
       <filter>src/main/filters/filter.properties</filter>
@@ -44,8 +37,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
         <configuration>
-          <fileName>plexus.xml</fileName>
-          <containerDescriptor>true</containerDescriptor>
           <roleDefaults>
             <roleDefault>
               <role>com.opensymphony.xwork.Action</role>
@@ -60,17 +51,21 @@
               <goal>descriptor</goal>
             </goals>
           </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-8</version>
+        <executions>
           <execution>
-            <id>merge</id>
+            <id>project summary model</id>
             <configuration>
-              <output>${project.build.outputDirectory}/META-INF/plexus/plexus.xml</output>
-              <descriptors>
-                <descriptor>${project.build.directory}/generated-resources/plexus/plexus.xml</descriptor>
-                <descriptor>src/main/plexus/plexus.xml</descriptor>
-              </descriptors>
+              <model>src/main/mdo/view-models.xml</model>
+              <version>1.0.0</version>
             </configuration>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>java</goal>         
             </goals>
           </execution>
         </executions>
@@ -81,6 +76,22 @@
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <contextPath>/</contextPath>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>9090</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <!-- TODO: test not working, and doesn't belong here. It should be mocking the logger, not setting sys out. It fails because the logger can't be created as it tries to write to /logs/continuum.log -->
+            <exclude>**/ContinuumActionLoggingTest.*</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java Mon Aug 14 13:36:17 2006
@@ -19,7 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 import java.util.Map;
 
@@ -28,7 +28,7 @@
  * @version $Id$
  */
 public abstract class AbstractNotifierEditAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
     private Continuum continuum;
 
@@ -49,73 +49,51 @@
     private boolean sendOnWarning;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            boolean isNew = false;
+        boolean isNew = false;
 
-            notifier = getNotifier();
+        notifier = getNotifier();
 
-            if ( notifier == null || notifierId == 0 )
-            {
-                notifier = new ProjectNotifier();
+        if ( notifier == null || notifierId == 0 )
+        {
+            notifier = new ProjectNotifier();
 
-                isNew = true;
-            }
+            isNew = true;
+        }
 
-            notifier.setType( notifierType );
+        notifier.setType( notifierType );
 
-            notifier.setSendOnSuccess( sendOnSuccess );
+        notifier.setSendOnSuccess( sendOnSuccess );
 
-            notifier.setSendOnFailure( sendOnFailure );
+        notifier.setSendOnFailure( sendOnFailure );
 
-            notifier.setSendOnError( sendOnError );
+        notifier.setSendOnError( sendOnError );
 
-            notifier.setSendOnWarning( sendOnWarning );
+        notifier.setSendOnWarning( sendOnWarning );
 
-            setNotifierConfiguration( notifier );
+        setNotifierConfiguration( notifier );
 
-            if ( !isNew )
-            {
-                continuum.updateNotifier( projectId, notifier );
-            }
-            else
-            {
-                continuum.addNotifier( projectId, notifier );
-            }
+        if ( !isNew )
+        {
+            continuum.updateNotifier( projectId, notifier );
         }
-        catch ( ContinuumException e )
+        else
         {
-            addActionMessage( "Can't update notifier (id=" + notifierId + ") for project " + projectId + " : "
-                + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
+            continuum.addNotifier( projectId, notifier );
         }
 
         return SUCCESS;
     }
 
     public String doDefault()
+        throws ContinuumException
     {
-        try
-        {
-            notifier = getNotifier();
+        notifier = getNotifier();
 
-            if ( notifier == null )
-            {
-                notifier = new ProjectNotifier();
-            }
-        }
-        catch ( ContinuumException e )
+        if ( notifier == null )
         {
-            addActionMessage( "Can't get notifier informations (id=" + notifierId + ") for project " + projectId
-                + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
+            notifier = new ProjectNotifier();
         }
 
         notifierType = notifier.getType();

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java Mon Aug 14 13:36:17 2006
@@ -16,11 +16,9 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.Schedule;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -36,12 +34,8 @@
  *   role-hint="addBuildDefinition"
  */
 public class AddBuildDefinitionAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private Project project;
 
@@ -66,32 +60,11 @@
     //    private Profile profile;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            project = continuum.getProject( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get project informations for project " + projectId + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
-
-        try
-        {
-            initSchedulesMap();
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get schedules list : " + e.getMessage() );
+        project = continuum.getProject( projectId );
 
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        initSchedulesMap();
 
         return INPUT;
     }
@@ -200,16 +173,11 @@
     }
 
     public Map getSchedulesMap()
+        throws ContinuumException
     {
         if ( schedulesMap == null )
         {
-            try
-            {
-                initSchedulesMap();
-            }
-            catch ( ContinuumException e )
-            {
-            }
+            initSchedulesMap();
         }
         return schedulesMap;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Mon Aug 14 13:36:17 2006
@@ -16,14 +16,13 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
-import java.io.File;
-import java.net.MalformedURLException;
 
 /**
  * @author Nick Gonzalez
@@ -34,12 +33,8 @@
  *   role-hint="addMavenOneProject"
  */
 public class AddMavenOneProjectAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private String m1PomUrl;
 
@@ -48,6 +43,7 @@
     private String m1Pom = null;
 
     public String execute()
+        throws ContinuumException
     {
         if ( !StringUtils.isEmpty( m1PomUrl ) )
         {
@@ -63,7 +59,8 @@
                 }
                 catch ( MalformedURLException e )
                 {
-                    return INPUT;
+                    // if local file can't be converted to url it's an internal error
+                    throw new RuntimeException( e );
                 }
             }
             else
@@ -74,18 +71,16 @@
 
         ContinuumProjectBuildingResult result = null;
 
-        try
-        {
-            result = continuum.addMavenOneProject( m1Pom );
-        }
-        catch ( ContinuumException e )
-        {
-            return INPUT;
-        }
+        result = continuum.addMavenOneProject( m1Pom );
 
-        if( result.getWarnings().size() > 0 )
+        if ( result.getErrors().size() > 0 )
         {
-            addActionMessage( result.getWarnings().toArray().toString() );
+            Iterator it = result.getErrors().iterator();
+
+            while ( it.hasNext() )
+            {
+                addActionError( (String) it.next() );
+            }
         }
 
         return SUCCESS;

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Mon Aug 14 13:36:17 2006
@@ -16,14 +16,16 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.MalformedURLException;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+
 import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
-import java.io.File;
-import java.net.MalformedURLException;
 
 /**
  * @author Nick Gonzalez
@@ -34,12 +36,8 @@
  *   role-hint="addMavenTwoProject"
  */
 public class AddMavenTwoProjectAction
-    extends PlexusActionSupport
-{
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
+    extends ContinuumActionSupport
+{    
 
     private String m2PomUrl;
 
@@ -48,6 +46,7 @@
     private String m2Pom = null;
 
     public String execute()
+        throws ContinuumException
     {
         if ( !StringUtils.isEmpty( m2PomUrl ) )
         {
@@ -63,29 +62,30 @@
                 }
                 catch ( MalformedURLException e )
                 {
-                    return INPUT;
+                    // if local file can't be converted to url it's an internal error
+                    throw new RuntimeException( e );
                 }
             }
             else
             {
+                // no url or file was filled
+                // TODO add action error, one must be filled in
                 return INPUT;
             }
         }
 
         ContinuumProjectBuildingResult result = null;
 
-        try
-        {
-            result = continuum.addMavenTwoProject( m2Pom );
-        }
-        catch ( ContinuumException e )
-        {
-            return INPUT;
-        }
+        result = continuum.addMavenTwoProject( m2Pom );
 
-        if ( result.getWarnings().size() > 0 )
+        if ( result.getErrors().size() > 0 )
         {
-            addActionMessage( result.getWarnings().toArray().toString() );
+            Iterator it = result.getErrors().iterator();
+
+            while ( it.hasNext() )
+            {
+                addActionError( (String) it.next() );
+            }
 
             return INPUT;
         }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java Mon Aug 14 13:36:17 2006
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
 
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -25,7 +23,7 @@
  * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifier"
  */
 public class AddNotifierAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
     private int projectId;
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Mon Aug 14 13:36:17 2006
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author Nick Gonzalez
@@ -30,12 +28,8 @@
  *   role-hint="addProject"
  */
 public class AddProjectAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private String projectName;
 
@@ -52,6 +46,7 @@
     private String projectType;
 
     public String execute()
+        throws ContinuumException
     {
         Project project = new Project();
 
@@ -67,14 +62,7 @@
 
         project.setScmTag( projectScmTag );
 
-        try
-        {
-            continuum.addProject( project, projectType );
-        }
-        catch ( ContinuumException e )
-        {
-            return INPUT;
-        }
+        continuum.addProject( project, projectType );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java Mon Aug 14 13:36:17 2006
@@ -19,7 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 /**
  * @author Nik Gonzalez
@@ -29,12 +29,8 @@
  *   role-hint="addSchedule"
  */
 public class AddScheduleAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private boolean active = true;
 
@@ -47,23 +43,17 @@
     private String name;
 
     public String execute()
-        throws Exception
+        throws ContinuumException
     {
-        try
-        {
-            Schedule schedule = new Schedule();
-            schedule.setActive( active );
-            schedule.setCronExpression( cronExpression );
-            schedule.setDelay( delay );
-            schedule.setDescription( description );
-            schedule.setName( name );
-
-            continuum.addSchedule( schedule );
-        }
-        catch ( ContinuumException e )
-        {
-            e.printStackTrace();
-        }
+        Schedule schedule = new Schedule();
+        schedule.setActive( active );
+        schedule.setCronExpression( cronExpression );
+        schedule.setDelay( delay );
+        schedule.setDescription( description );
+        schedule.setName( name );
+
+        continuum.addSchedule( schedule );
+
         return SUCCESS;
     }
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java Mon Aug 14 13:36:17 2006
@@ -21,7 +21,6 @@
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.Schedule;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,12 +36,8 @@
  *   role-hint="buildDefinitionEdit"
  */
 public class BuildDefinitionEditAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private BuildDefinition bd;
 
@@ -69,71 +64,49 @@
     //    private Profile profile;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            boolean isNew = false;
+        boolean isNew = false;
 
-            bd = getBuildDefinition();
+        bd = getBuildDefinition();
 
-            if ( bd == null || buildDefinitionId == 0 )
-            {
-                bd = new BuildDefinition();
+        if ( bd == null || buildDefinitionId == 0 )
+        {
+            bd = new BuildDefinition();
 
-                isNew = true;
-            }
+            isNew = true;
+        }
 
-            bd.setGoals( goals );
+        bd.setGoals( goals );
 
-            bd.setBuildFile( buildFile );
+        bd.setBuildFile( buildFile );
 
-            bd.setArguments( arguments );
+        bd.setArguments( arguments );
 
-            bd.setDefaultForProject( defaultForProject );
+        bd.setDefaultForProject( defaultForProject );
 
-            Schedule schedule = continuum.getSchedule( scheduleId );
+        Schedule schedule = continuum.getSchedule( scheduleId );
 
-            bd.setSchedule( schedule );
+        bd.setSchedule( schedule );
 
-            if ( !isNew )
-            {
-                continuum.updateBuildDefinition( bd, projectId );
-            }
-            else
-            {
-                continuum.addBuildDefinition( projectId, bd );
-            }
+        if ( !isNew )
+        {
+            continuum.updateBuildDefinition( bd, projectId );
         }
-        catch ( ContinuumException e )
+        else
         {
-            addActionMessage( "Can't update build definition (id=" + buildDefinitionId + ") for project " + projectId
-                + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
+            continuum.addBuildDefinition( projectId, bd );
         }
 
         return SUCCESS;
     }
 
     public String doDefault()
+        throws ContinuumException
     {
-        try
-        {
-            project = continuum.getProject( projectId );
+        project = continuum.getProject( projectId );
 
-            bd = getBuildDefinition();
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get build definition informations (id=" + buildDefinitionId + ") for project "
-                + projectId + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        bd = getBuildDefinition();
 
         defaultForProject = bd.isDefaultForProject();
 
@@ -147,20 +120,9 @@
 
         scheduleName = bd.getSchedule().getName();
 
-        try
-        {
-            initSchedulesMap();
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get schedules list : " + e.getMessage() );
-
-            e.printStackTrace();
+        initSchedulesMap();
 
-            return ERROR;
-        }
-
-        //        profile = bd.getProfile();
+        // profile = bd.getProfile();
 
         return INPUT;
     }
@@ -275,16 +237,11 @@
     }
 
     public Map getSchedulesMap()
+        throws ContinuumException
     {
         if ( schedulesMap == null )
         {
-            try
-            {
-                initSchedulesMap();
-            }
-            catch ( ContinuumException e )
-            {
-            }
+            initSchedulesMap();
         }
         return schedulesMap;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,35 +27,21 @@
  *   role-hint="buildProject"
  */
 public class BuildProjectAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private int projectId;
 
     public String execute()
+        throws ContinuumException
     {
-        try
+        if ( projectId > 0 )
         {
-            if ( projectId > 0 )
-            {
-                continuum.buildProject( projectId );
-            }
-            else
-            {
-                continuum.buildProjects();
-            }
+            continuum.buildProject( projectId );
         }
-        catch ( ContinuumException e )
+        else
         {
-            addActionMessage( "Can't build project (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
+            continuum.buildProjects();
         }
 
         return SUCCESS;

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Mon Aug 14 13:36:17 2006
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildResult;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.List;
 
@@ -32,13 +30,9 @@
  *   role-hint="buildResult"
  */
 public class BuildResultAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
 
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private BuildResult buildResult;
 
@@ -51,22 +45,11 @@
     private List changeSet;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            buildResult = continuum.getBuildResult( buildId );
-
-            changeSet = continuum.getChangesSinceLastSuccess( projectId, buildId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionError( "Can't get build result (id=" + buildId + ") for project (id=" + projectId + ") : "
-                + e.getMessage() );
+        buildResult = continuum.getBuildResult( buildId );
 
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        changeSet = continuum.getChangesSinceLastSuccess( projectId, buildId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 
@@ -31,13 +29,8 @@
  *   role-hint="buildResults"
  */
 public class BuildResultsListAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
-
     private Collection buildResults;
 
     private int projectId;
@@ -45,19 +38,9 @@
     private String projectName;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            buildResults = continuum.getBuildResultsForProject( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionError( "Can't get build results list for project (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        buildResults = continuum.getBuildResultsForProject( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -28,12 +25,8 @@
  *   role-hint="checkConfiguration"
  */
 public class CheckConfigurationAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     public String execute()
     {

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Mon Aug 14 13:36:17 2006
@@ -18,6 +18,7 @@
 
 import com.opensymphony.xwork.Preparable;
 import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
@@ -72,7 +73,7 @@
     }
 
     public String execute()
-        throws Exception
+        throws ConfigurationStoringException
     {
         continuum.getConfiguration().setGuestAccountEnabled( guestAccountEnabled );
 
@@ -88,16 +89,8 @@
 
         continuum.getConfiguration().setCompanyUrl( companyUrl );
 
-        try
-        {
-            continuum.getConfiguration().store();
-        }
-        catch ( ConfigurationStoringException e )
-        {
-            addActionError( "Can't store configuration :" + e.getMessage() );
-
-            return INPUT;
-        }
+        continuum.getConfiguration().setInitialized( true );
+        continuum.getConfiguration().store();            
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,31 +27,16 @@
  *   role-hint="deleteBuildDefinition"
  */
 public class DeleteBuildDefinitionAction
-    extends PlexusActionSupport
-{
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
-
+    extends ContinuumActionSupport
+{    
     private int projectId;
 
     private int buildDefinitionId;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            continuum.removeBuildDefinition( projectId, buildDefinitionId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't delete build definition (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        continuum.removeBuildDefinition( projectId, buildDefinitionId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java Mon Aug 14 13:36:17 2006
@@ -18,7 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,12 +29,8 @@
  *   role-hint="deleteNotifier"
  */
 public class DeleteNotifierAction
-    extends PlexusActionSupport
-{
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
+    extends ContinuumActionSupport
+{    
 
     private int projectId;
 
@@ -43,19 +39,9 @@
     private String notifierType;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            continuum.removeNotifier( projectId, notifierId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't delete notifier (id=" + notifierId + ") for project " + projectId + " : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        continuum.removeNotifier( projectId, notifierId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,31 +27,16 @@
  *   role-hint="deleteProject"
  */
 public class DeleteProjectAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
-
     private int projectId;
 
     private String projectName;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            continuum.removeProject( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't delete project (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        continuum.removeProject( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java Mon Aug 14 13:36:17 2006
@@ -19,7 +19,6 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author Nik Gonzalez
@@ -29,13 +28,8 @@
  *   role-hint="editSchedule"
  */
 public class EditScheduleAction
-    extends PlexusActionSupport
-{
-
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
+    extends ContinuumActionSupport
+{   
 
     private Schedule schedule;
 
@@ -52,7 +46,7 @@
     private String name;
 
     public String execute()
-        throws Exception
+        throws ContinuumException
     {
         try
         {
@@ -69,29 +63,15 @@
         schedule.setDescription( description );
         schedule.setName( name );
 
-        try
-        {
-            continuum.updateSchedule( schedule );
-        }
-        catch ( ContinuumException e )
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+        continuum.updateSchedule( schedule );
+
         return SUCCESS;
     }
 
     public String doEdit()
-        throws Exception
+        throws ContinuumException
     {
-        try
-        {
-            schedule = continuum.getSchedule( id );
-        }
-        catch ( ContinuumException e )
-        {
-            e.printStackTrace();
-        }
+        schedule = continuum.getSchedule( id );
 
         active = schedule.isActive();
         cronExpression = schedule.getCronExpression();

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java Mon Aug 14 13:36:17 2006
@@ -1,7 +1,5 @@
 package org.apache.maven.continuum.web.action;
 
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -27,7 +25,7 @@
  *   role-hint="login"
  */
 public class LoginAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
     private String username = "";
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Mon Aug 14 13:36:17 2006
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -30,12 +28,8 @@
  *   role-hint="projectEdit"
  */
 public class ProjectEditAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private Project project;
 
@@ -54,19 +48,9 @@
     private String scmTag;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            project = getProject( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get project informations (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        project = getProject( projectId );
 
         project.setName( name );
 
@@ -80,36 +64,15 @@
 
         project.setScmTag( scmTag );
 
-        try
-        {
-            continuum.updateProject( project );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't update project (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        continuum.updateProject( project );
 
         return SUCCESS;
     }
 
     public String doEdit()
+        throws ContinuumException
     {
-        try
-        {
-            project = getProject( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get project informations (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        project = getProject( projectId );
 
         name = project.getName();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Mon Aug 14 13:36:17 2006
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -30,31 +28,17 @@
  *   role-hint="projectView"
  */
 public class ProjectViewAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private Project project;
 
     private int projectId;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            project = continuum.getProjectWithAllDetails( projectId );
-        }
-        catch ( ContinuumException e )
-        {
-            addActionMessage( "Can't get project informations (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
-        }
+        project = continuum.getProjectWithAllDetails( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Mon Aug 14 13:36:17 2006
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 
@@ -30,26 +28,15 @@
  *   role-hint="schedules"
  */
 public class ScheduleAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     private Collection schedules;
 
     public String execute()
-        throws Exception
+        throws ContinuumException
     {
-        try
-        {
-            schedules = continuum.getSchedules();
-        }
-        catch ( ContinuumException e )
-        {
-            e.printStackTrace();
-        }
+        schedules = continuum.getSchedules();
 
         return SUCCESS;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Mon Aug 14 13:36:17 2006
@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.web.model.ProjectSummary;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,12 +36,9 @@
  *   role-hint="summary"
  */
 public class SummaryAction
-    extends PlexusActionSupport
-{
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
+    extends ContinuumActionSupport
+{    
+    private int projectGroupId = -1;
 
     private int nbSuccesses;
 
@@ -53,85 +49,92 @@
     private List summary;
     
     public String execute()
-        throws Exception
+        throws ContinuumException
     {
-        try
+        Collection projects;
+
+        // original logic on this page shows all projects across project groups, however if projectGroupId
+        // is set then display only those projects in the given group.
+        if ( projectGroupId == -1 )
+        {
+            getLogger().debug("SummaryAction: serving up all projects");
+            projects = continuum.getProjects();
+        }
+        else
         {
+            getLogger().debug("SummaryAction: serving up project id -> " + projectGroupId );
+
             //TODO: Create a summary jpox request so code will be more simple and performance will be better
-            Collection projects = continuum.getProjects();
+            projects = continuum.getProjectsInGroup( projectGroupId );
+        }
 
-            Map buildResults = continuum.getLatestBuildResults();
+        Map buildResults = continuum.getLatestBuildResults();
 
-            Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+        Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
 
-            summary = new ArrayList();
+        summary = new ArrayList();
 
-            for ( Iterator i = projects.iterator(); i.hasNext(); )
-            {
-                Project project = (Project) i.next();
+        for ( Iterator i = projects.iterator(); i.hasNext(); )
+        {
+            Project project = (Project) i.next();
 
-                SummaryProjectModel model = new SummaryProjectModel();
+            ProjectSummary model = new ProjectSummary();
 
-                model.setId( project.getId() );
+            model.setId( project.getId() );
 
-                model.setName( project.getName() );
+            model.setName( project.getName() );
 
-                model.setVersion( project.getVersion() );
+            model.setVersion( project.getVersion() );
 
-                model.setProjectGroupName( project.getProjectGroup().getName() );
+            model.setProjectGroupName( project.getProjectGroup().getName() );
 
-                if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
-                {
-                    model.setInQueue( true );
-                }
-                else
-                {
-                    model.setInQueue( false );
-                }
+            if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
+            {
+                model.setInQueue( true );
+            }
+            else
+            {
+                model.setInQueue( false );
+            }
 
-                model.setState( project.getState() );
+            model.setState( project.getState() );
 
-                if ( project.getState() == 2 )
-                {
-                    nbSuccesses++;
-                }
-                else if ( project.getState() == 3 )
-                {
-                    nbFailures++;
-                }
-                else if ( project.getState() == 4 )
-                {
-                    nbErrors++;
-                }
+            if ( project.getState() == 2 )
+            {
+                nbSuccesses++;
+            }
+            else if ( project.getState() == 3 )
+            {
+                nbFailures++;
+            }
+            else if ( project.getState() == 4 )
+            {
+                nbErrors++;
+            }
 
-                model.setBuildNumber( project.getBuildNumber() );
+            model.setBuildNumber( project.getBuildNumber() );
 
-                if ( buildResultsInSuccess != null )
-                {
-                    BuildResult buildInSuccess = (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) );
+            if ( buildResultsInSuccess != null )
+            {
+                BuildResult buildInSuccess = (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) );
 
-                    if ( buildInSuccess != null )
-                    {
-                        model.setBuildInSuccessId( buildInSuccess.getId() );
-                    }
+                if ( buildInSuccess != null )
+                {
+                    model.setBuildInSuccessId( buildInSuccess.getId() );
                 }
+            }
 
-                if ( buildResults != null )
-                {
-                    BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) );
+            if ( buildResults != null )
+            {
+                BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) );
 
-                    if ( latestBuild != null )
-                    {
-                        model.setLatestBuildId( latestBuild.getId() );
-                    }
+                if ( latestBuild != null )
+                {
+                    model.setLatestBuildId( latestBuild.getId() );
                 }
-
-                summary.add( model );
             }
-        }
-        catch( Exception e )
-        {
-            e.printStackTrace();
+
+            summary.add( model );
         }
 
         return SUCCESS;
@@ -155,5 +158,16 @@
     public List getProjects()
     {
         return summary;
+    }
+
+
+    public int getProjectGroupId()
+    {
+        return projectGroupId;
+    }
+
+    public void setProjectGroupId( int projectGroupId )
+    {
+        this.projectGroupId = projectGroupId;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Mon Aug 14 13:36:17 2006
@@ -19,7 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 import com.opensymphony.webwork.ServletActionContext;
 import com.opensymphony.webwork.views.util.UrlHelper;
@@ -36,16 +36,11 @@
  *   role-hint="workingCopy"
  */
 public class WorkingCopyAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
 {
     /**
      * @plexus.requirement
      */
-    private Continuum continuum;
-
-    /**
-     * @plexus.requirement
-     */
     private WorkingCopyContentGenerator generator;
 
     private int projectId;
@@ -63,38 +58,29 @@
     private String output;
 
     public String execute()
+        throws ContinuumException
     {
-        try
-        {
-            files = continuum.getFiles( projectId, userDirectory );
+        files = continuum.getFiles( projectId, userDirectory );
 
-            HashMap params = new HashMap();
+        HashMap params = new HashMap();
 
-            params.put( "projectId", new Integer( projectId ) );
+        params.put( "projectId", new Integer( projectId ) );
 
-            params.put( "projectName", projectName );
+        params.put( "projectName", projectName );
 
-            String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(), ServletActionContext.getResponse(), params );
+        String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(), ServletActionContext.getResponse(), params );
 
-            output = generator.generate( files, baseUrl, continuum.getWorkingDirectory( projectId ) );
+        output = generator.generate( files, baseUrl, continuum.getWorkingDirectory( projectId ) );
 
-            if ( currentFile != null && currentFile != "" )
-            {
-                currentFileContent = continuum.getFileContent( projectId, userDirectory, currentFile );
-            }
-            else
-            {
-                currentFileContent = "";
-            }
+        if ( currentFile != null && currentFile != "" )
+        {
+            currentFileContent = continuum.getFileContent( projectId, userDirectory, currentFile );
         }
-        catch ( ContinuumException e )
+        else
         {
-            addActionError( "Can't get file list for project (id=" + projectId + ") : " + e.getMessage() );
-
-            e.printStackTrace();
-
-            return ERROR;
+            currentFileContent = "";
         }
+
         return SUCCESS;
     }
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Mon Aug 14 13:36:17 2006
@@ -17,7 +17,7 @@
  */
 
 import com.opensymphony.webwork.views.util.UrlHelper;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
 import org.extremecomponents.table.core.TableModel;
@@ -38,7 +38,7 @@
 {
     protected String getCellValue( TableModel tableModel, Column column )
     {
-        SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+        ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
 
         String contextPath = tableModel.getContext().getContextPath();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java Mon Aug 14 13:36:17 2006
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
 import org.extremecomponents.table.core.TableModel;
@@ -32,7 +32,7 @@
 {
     protected String getCellValue( TableModel tableModel, Column column )
     {
-        SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+        ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
 
         String contextPath = tableModel.getContext().getContextPath();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Mon Aug 14 13:36:17 2006
@@ -18,7 +18,7 @@
 
 import com.opensymphony.webwork.ServletActionContext;
 import com.opensymphony.webwork.views.util.UrlHelper;
-import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.apache.maven.continuum.web.util.StateGenerator;
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
@@ -37,7 +37,7 @@
 {
     protected String getCellValue( TableModel tableModel, Column column )
     {
-        SummaryProjectModel project = (SummaryProjectModel) tableModel.getCurrentRowBean();
+        ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
 
         int latestBuildId = project.getLatestBuildId();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Mon Aug 14 13:36:17 2006
@@ -61,7 +61,7 @@
     public int doEndTag()
         throws JspException
     {
-        actualName = (String) findString( nameAttr );
+        actualName = findString( nameAttr );
         String msg = null;
         OgnlValueStack stack = getStack();
         //find the name on the valueStack, and cast it to a date



Mime
View raw message