continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r437056 - in /maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action: ./ component/
Date Sat, 26 Aug 2006 02:31:02 GMT
Author: carlos
Date: Fri Aug 25 19:30:58 2006
New Revision: 437056

URL: http://svn.apache.org/viewvc?rev=437056&view=rev
Log:
Reduce visibility of continuum object

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SessionAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserGroupManagementAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserManagementAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -16,12 +16,10 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
+import java.util.Map;
+
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-
-import java.util.Map;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -30,8 +28,6 @@
 public abstract class AbstractNotifierEditAction
     extends ContinuumActionSupport
 {
-    private Continuum continuum;
-
     private ProjectNotifier notifier;
 
     private int projectId;
@@ -76,11 +72,11 @@
 
         if ( !isNew )
         {
-            continuum.updateNotifier( projectId, notifier );
+            getContinuum().updateNotifier( projectId, notifier );
         }
         else
         {
-            continuum.addNotifier( projectId, notifier );
+            getContinuum().addNotifier( projectId, notifier );
         }
 
         return SUCCESS;
@@ -118,7 +114,7 @@
     private ProjectNotifier getNotifier()
         throws ContinuumException
     {
-        return continuum.getNotifier( projectId, notifierId );
+        return getContinuum().getNotifier( projectId, notifierId );
     }
 
     public int getProjectId()

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Fri Aug 25 19:30:58 2006
@@ -22,7 +22,7 @@
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 
 /**
- * Add a Maven 1 project to continuum.
+ * Add a Maven 1 project to Continuum.
  * 
  * @author Nick Gonzalez
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
@@ -39,7 +39,7 @@
     protected ContinuumProjectBuildingResult doExecute( String pomUrl )
         throws ContinuumException
     {
-        return continuum.addMavenOneProject( pomUrl );
+        return getContinuum().addMavenOneProject( pomUrl );
     }
 
     /**

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Fri Aug 25 19:30:58 2006
@@ -22,7 +22,7 @@
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 
 /**
- * Add a Maven 2 project to continuum.
+ * Add a Maven 2 project to Continuum.
  * 
  * @author Nick Gonzalez
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
@@ -39,7 +39,7 @@
     protected ContinuumProjectBuildingResult doExecute( String pomUrl )
         throws ContinuumException
     {
-        return continuum.addMavenTwoProject( pomUrl );
+        return getContinuum().addMavenTwoProject( pomUrl );
     }
 
     public String doDefault()

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -62,7 +62,7 @@
 
         project.setScmTag( projectScmTag );
 
-        continuum.addProject( project, projectType );
+        getContinuum().addProject( project, projectType );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Fri Aug 25 19:30:58 2006
@@ -1,17 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.model.project.Schedule;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.web.exception.ContinuumActionException;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-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.
@@ -26,6 +16,17 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.Schedule;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.web.exception.ContinuumActionException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 /**
  * BuildDefinitionAction:
  *
@@ -72,7 +73,7 @@
         {
             schedules = new HashMap();
 
-            Collection allSchedules = continuum.getSchedules();
+            Collection allSchedules = getContinuum().getSchedules();
 
             for ( Iterator i = allSchedules.iterator(); i.hasNext(); )
             {
@@ -94,7 +95,7 @@
     /**
      * if there is a build definition id set, then retrieve it..either way set us to up to work with build definition
      *
-     * @return
+     * @return action result
      */
     public String input()
     {
@@ -104,11 +105,11 @@
         {
             if ( projectId != 0 )
             {
-                executor = continuum.getProject( projectId ).getExecutorId();
+                executor = getContinuum().getProject( projectId ).getExecutorId();
             }
             else
             {
-                Project project = (Project)continuum.getProjectGroup( projectGroupId ).getProjects().get( 0 );
+                Project project = (Project) getContinuum().getProjectGroup( projectGroupId ).getProjects().get( 0 );
                 executor = project.getExecutorId();
 
             }
@@ -125,7 +126,7 @@
         {
             try
             {
-                BuildDefinition buildDefinition = continuum.getBuildDefinition( buildDefinitionId );
+                BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId );
                 goals = buildDefinition.getGoals();
                 arguments = buildDefinition.getArguments();
                 buildFile = buildDefinition.getBuildFile();
@@ -149,11 +150,11 @@
         {
             if ( buildDefinitionId == 0 )
             {
-                continuum.addBuildDefinitionToProject( projectId, getBuildDefinitionFromInput() );
+                getContinuum().addBuildDefinitionToProject( projectId, getBuildDefinitionFromInput() );
             }
             else
             {
-                continuum.updateBuildDefinitionForProject( projectId, getBuildDefinitionFromInput() );
+                getContinuum().updateBuildDefinitionForProject( projectId, getBuildDefinitionFromInput() );
             }
         }
         catch ( ContinuumActionException cae )
@@ -177,11 +178,11 @@
         {
             if ( buildDefinitionId == 0 )
             {
-                continuum.addBuildDefinitionToProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
+                getContinuum().addBuildDefinitionToProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
             }
             else
             {
-                continuum.updateBuildDefinitionForProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
+                getContinuum().updateBuildDefinitionForProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
             }
         }
         catch ( ContinuumActionException cae )
@@ -205,7 +206,7 @@
         {
             try
             {
-                continuum.removeBuildDefinitionFromProject( projectId, buildDefinitionId );
+                getContinuum().removeBuildDefinitionFromProject( projectId, buildDefinitionId );
 
                 return SUCCESS;
             }
@@ -228,7 +229,7 @@
         {
             try
             {
-                continuum.removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
+                getContinuum().removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
 
                 return SUCCESS;
             }
@@ -253,7 +254,7 @@
 
         try
         {
-            schedule = continuum.getSchedule( scheduleId );
+            schedule = getContinuum().getSchedule( scheduleId );
         }
         catch ( ContinuumException e )
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -37,11 +37,11 @@
     {
         if ( projectId > 0 )
         {
-            continuum.buildProject( projectId );
+            getContinuum().buildProject( projectId );
         }
         else
         {
-            continuum.buildProjects();
+            getContinuum().buildProjects();
         }
 
         return SUCCESS;

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -47,9 +47,9 @@
     public String execute()
         throws ContinuumException
     {
-        buildResult = continuum.getBuildResult( buildId );
+        buildResult = getContinuum().getBuildResult( buildId );
 
-        changeSet = continuum.getChangesSinceLastSuccess( projectId, buildId );
+        changeSet = getContinuum().getChangesSinceLastSuccess( projectId, buildId );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -38,7 +38,7 @@
     public String execute()
         throws ContinuumException
     {
-        buildResults = continuum.getBuildResultsForProject( projectId );
+        buildResults = getContinuum().getBuildResultsForProject( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.configuration.ConfigurationService;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -30,7 +32,9 @@
 
     public String execute()
     {
-        if ( !continuum.getConfiguration().isInitialized() )
+        ConfigurationService configuration = getContinuum().getConfiguration();
+
+        if ( ! configuration.isInitialized() )
         {
             return INPUT;
         }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -16,18 +16,18 @@
  * limitations under the License.
  */
 
-import com.opensymphony.xwork.Preparable;
-import org.apache.maven.continuum.Continuum;
+import java.io.File;
+import java.util.Collections;
+
+import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
 import org.apache.maven.continuum.model.system.ContinuumUser;
 import org.apache.maven.continuum.model.system.UserGroup;
 import org.apache.maven.continuum.security.ContinuumSecurity;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
-import java.io.File;
-import java.util.Collections;
+import com.opensymphony.xwork.Preparable;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -38,13 +38,9 @@
  *   role-hint="configuration"
  */
 public class ConfigurationAction
-    extends PlexusActionSupport
+    extends ContinuumActionSupport
     implements Preparable
 {
-    /**
-     * @plexus.requirement
-     */
-    private Continuum continuum;
 
     /**
      * @plexus.requirement
@@ -77,19 +73,21 @@
 
     public void prepare()
     {
-        guestAccountEnabled = continuum.getConfiguration().isGuestAccountEnabled();
+        ConfigurationService configuration = getContinuum().getConfiguration();
+
+        guestAccountEnabled = configuration.isGuestAccountEnabled();
 
-        workingDirectory = continuum.getConfiguration().getWorkingDirectory().getAbsolutePath();
+        workingDirectory = configuration.getWorkingDirectory().getAbsolutePath();
 
-        buildOutputDirectory = continuum.getConfiguration().getBuildOutputDirectory().getAbsolutePath();
+        buildOutputDirectory = configuration.getBuildOutputDirectory().getAbsolutePath();
 
-        baseUrl = continuum.getConfiguration().getUrl();
+        baseUrl = configuration.getUrl();
 
-        companyLogo = continuum.getConfiguration().getCompanyLogo();
+        companyLogo = configuration.getCompanyLogo();
 
-        companyName = continuum.getConfiguration().getCompanyName();
+        companyName = configuration.getCompanyName();
 
-        companyUrl = continuum.getConfiguration().getCompanyUrl();
+        companyUrl = configuration.getCompanyUrl();
     }
 
     public String execute()
@@ -106,14 +104,16 @@
         adminUser.setGroup( store.getUserGroup( ContinuumSecurity.ADMIN_GROUP_NAME ) );
 
         store.addUser( adminUser );
+        
+        ConfigurationService configuration = getContinuum().getConfiguration();
 
         if ( guestAccountEnabled )
         {
-            continuum.getConfiguration().setGuestAccountEnabled( guestAccountEnabled );
+            configuration.setGuestAccountEnabled( guestAccountEnabled );
         }
         else
         {
-            continuum.getConfiguration().setGuestAccountEnabled( false );
+            configuration.setGuestAccountEnabled( false );
 
             UserGroup guestGroup = store.getUserGroup( ContinuumSecurity.GUEST_GROUP_NAME );
 
@@ -122,20 +122,23 @@
             store.updateUserGroup( guestGroup );
         }
 
-        continuum.getConfiguration().setWorkingDirectory( new File( workingDirectory ) );
+        configuration.setWorkingDirectory( new File( workingDirectory ) );
+
+        configuration.setWorkingDirectory( new File( workingDirectory ) );
 
-        continuum.getConfiguration().setBuildOutputDirectory( new File( buildOutputDirectory ) );
+        configuration.setBuildOutputDirectory( new File( buildOutputDirectory ) );
 
-        continuum.getConfiguration().setUrl( baseUrl );
+        configuration.setUrl( baseUrl );
 
-        continuum.getConfiguration().setCompanyLogo( companyLogo );
+        configuration.setCompanyLogo( companyLogo );
 
-        continuum.getConfiguration().setCompanyName( companyName );
+        configuration.setCompanyName( companyName );
 
-        continuum.getConfiguration().setCompanyUrl( companyUrl );
+        configuration.setInitialized( true );
+        configuration.store();
 
-        continuum.getConfiguration().setInitialized( true );
-        continuum.getConfiguration().store();
+        configuration.setInitialized( true );
+        configuration.store();            
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Fri Aug 25 19:30:58 2006
@@ -34,7 +34,7 @@
     /**
      * @plexus.requirement
      */
-    protected Continuum continuum;
+    private Continuum continuum;
 
     public void prepare()
         throws Exception

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -41,7 +39,7 @@
     public String execute()
         throws ContinuumException
     {
-        continuum.removeNotifier( projectId, notifierId );
+        getContinuum().removeNotifier( projectId, notifierId );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -36,7 +36,7 @@
     public String execute()
         throws ContinuumException
     {
-        continuum.removeProject( projectId );
+        getContinuum().removeProject( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Fri Aug 25 19:30:58 2006
@@ -1,17 +1,20 @@
 package org.apache.maven.continuum.web.action;
 
-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.model.project.ProjectGroup;
-import org.apache.maven.continuum.web.model.GroupSummary;
-import org.apache.maven.continuum.web.model.ProjectSummary;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+/*
+ * Copyright 2005-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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /*
  * Copyright 2005 The Codehaus.
  *
@@ -28,6 +31,19 @@
  * limitations under the License.
  */
 
+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.model.project.ProjectGroup;
+import org.apache.maven.continuum.web.model.GroupSummary;
+import org.apache.maven.continuum.web.model.ProjectSummary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -45,7 +61,7 @@
     {
         groups = new ArrayList();
 
-        Collection projectGroups = continuum.getAllProjectGroupsWithProjects();
+        Collection projectGroups = getContinuum().getAllProjectGroupsWithProjects();
 
         for ( Iterator j = projectGroups.iterator(); j.hasNext(); )
         {
@@ -64,9 +80,9 @@
 
             groupModel.setNumProjects( projects.size() );
 
-            Map buildResults = continuum.getLatestBuildResults();
+            Map buildResults = getContinuum().getLatestBuildResults();
 
-            Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+            Map buildResultsInSuccess = getContinuum().getBuildResultsInSuccess();
 
             List projectModels = new ArrayList();
             int numSuccesses = 0;
@@ -94,7 +110,7 @@
 
                 model.setProjectGroupName( project.getProjectGroup().getName() );
 
-                if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
+                if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue( project.getId() ) )
                 {
                     model.setInQueue( true );
                 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -64,7 +64,7 @@
 
         project.setScmTag( scmTag );
 
-        continuum.updateProject( project );
+        getContinuum().updateProject( project );
 
         return SUCCESS;
     }
@@ -92,7 +92,7 @@
     private Project getProject( int projectId )
         throws ContinuumException
     {
-        return continuum.getProject( projectId );
+        return getContinuum().getProject( projectId );
     }
 
     public int getProjectId()

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Fri Aug 25 19:30:58 2006
@@ -1,9 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.ContinuumException;
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-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.
@@ -18,6 +16,9 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.ContinuumException;
+
 /**
  * ProjectGroupAction:
  *
@@ -41,7 +42,7 @@
     {
         try
         {
-            projectGroup = continuum.getProjectGroup( projectGroupId );
+            projectGroup = getContinuum().getProjectGroup( projectGroupId );
         }
         catch ( ContinuumException e)
         {
@@ -72,7 +73,7 @@
         //todo add confirm page like removing build definition
         try
         {
-            continuum.removeProjectGroup( projectGroupId );
+            getContinuum().removeProjectGroup( projectGroupId );
         }
         catch ( ContinuumException e )
         {
@@ -87,7 +88,7 @@
     {
         try
         {
-            continuum.buildProjectGroup( projectGroupId );
+            getContinuum().buildProjectGroup( projectGroupId );
         }
         catch ( ContinuumException e )
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -38,7 +38,7 @@
     public String execute()
         throws ContinuumException
     {
-        project = continuum.getProjectWithAllDetails( projectId );
+        project = getContinuum().getProjectWithAllDetails( projectId );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -48,7 +48,7 @@
     public String summary()
         throws ContinuumException
     {
-        schedules = continuum.getSchedules();
+        schedules = getContinuum().getSchedules();
 
         return SUCCESS;
     }
@@ -59,7 +59,7 @@
         {
             try
             {
-                schedule = continuum.getSchedule( id );
+                schedule = getContinuum().getSchedule( id );
                 active = schedule.isActive();
                 cronExpression= schedule.getCronExpression();
                 description = schedule.getDescription();
@@ -88,7 +88,7 @@
                 schedule.setDescription( description );
                 schedule.setName( name );
 
-                continuum.addSchedule( schedule );
+                getContinuum().addSchedule( schedule );
             }
             catch ( ContinuumException e )
             {
@@ -102,7 +102,7 @@
 
             try
             {
-                schedule = continuum.getSchedule( id );
+                schedule = getContinuum().getSchedule( id );
 
                 schedule.setActive( active );
                 schedule.setCronExpression( cronExpression );
@@ -110,7 +110,7 @@
                 schedule.setDescription( description );
                 schedule.setName( name );
 
-                continuum.updateSchedule( schedule );
+                getContinuum().updateSchedule( schedule );
 
             }
             catch ( ContinuumException e )

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SessionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SessionAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SessionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SessionAction.java Fri Aug 25 19:30:58 2006
@@ -53,7 +53,7 @@
                 return INPUT;
             }
 
-            List userList = continuum.getUsers();
+            List userList = getContinuum().getUsers();
 
             for ( Iterator i = userList.iterator(); i.hasNext(); )
             {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -52,11 +52,11 @@
         Collection projects;
 
         //TODO: Create a summary jpox request so code will be more simple and performance will be better
-        projects = continuum.getProjectsInGroup( projectGroupId );
+        projects = getContinuum().getProjectsInGroup( projectGroupId );
 
-        Map buildResults = continuum.getLatestBuildResults();
+        Map buildResults = getContinuum().getLatestBuildResults();
 
-        Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+        Map buildResultsInSuccess = getContinuum().getBuildResultsInSuccess();
 
         summary = new ArrayList();
 
@@ -74,7 +74,7 @@
 
             model.setProjectGroupName( project.getProjectGroup().getName() );
 
-            if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
+            if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue( project.getId() ) )
             {
                 model.setInQueue( true );
             }

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserGroupManagementAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserGroupManagementAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserGroupManagementAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserGroupManagementAction.java Fri Aug 25 19:30:58 2006
@@ -45,7 +45,7 @@
     {
         try
         {
-            userGroups = continuum.getUserGroups();
+            userGroups = getContinuum().getUserGroups();
         }
         catch ( ContinuumException e )
         {
@@ -62,7 +62,7 @@
         {
             try
             {
-                UserGroup userGroup = continuum.getUserGroup( userGroupId );
+                UserGroup userGroup = getContinuum().getUserGroup( userGroupId );
 
                 name = userGroup.getName();
                 description = userGroup.getDescription();
@@ -86,18 +86,18 @@
             userGroup.setName( name );
             userGroup.setDescription( description );
 
-            continuum.addUserGroup( userGroup );
+            getContinuum().addUserGroup( userGroup );
         }
         else
         {
             try
             {
-                UserGroup userGroup = continuum.getUserGroup( userGroupId );
+                UserGroup userGroup = getContinuum().getUserGroup( userGroupId );
 
                 userGroup.setName( name );
                 userGroup.setDescription( description );
 
-                continuum.updateUserGroup( userGroup );
+                getContinuum().updateUserGroup( userGroup );
             }
             catch ( ContinuumException e )
             {
@@ -113,7 +113,7 @@
     {
         try
         {
-            continuum.removeUserGroup( userGroupId );
+            getContinuum().removeUserGroup( userGroupId );
         }
         catch ( ContinuumException e )
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserManagementAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserManagementAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserManagementAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/UserManagementAction.java Fri Aug 25 19:30:58 2006
@@ -69,7 +69,7 @@
         {
             userGroups = new HashMap();
 
-            for ( Iterator i = continuum.getUserGroups().iterator(); i.hasNext();)
+            for ( Iterator i = getContinuum().getUserGroups().iterator(); i.hasNext();)
             {
                 UserGroup group = (UserGroup)i.next();
                 userGroups.put( new Integer( group.getId() ), group.getName() );
@@ -81,7 +81,7 @@
     {
         try
         {
-            users = continuum.getUsers();
+            users = getContinuum().getUsers();
         }
         catch ( ContinuumException e )
         {
@@ -99,7 +99,7 @@
         {
             try
             {
-                ContinuumUser user = continuum.getUser( userId );
+                ContinuumUser user = getContinuum().getUser( userId );
 
                 username = user.getUsername();
                 fullName = user.getFullName();
@@ -129,8 +129,8 @@
                 newUser.setFullName( fullName );
                 newUser.setEmail( email );
                 newUser.setPassword( password );
-                newUser.setGroup( continuum.getUserGroup( userGroupId ) );
-                continuum.addUser( newUser );
+                newUser.setGroup( getContinuum().getUserGroup( userGroupId ) );
+                getContinuum().addUser( newUser );
             }
             catch ( ContinuumException e )
             {
@@ -142,14 +142,14 @@
         {
             try
             {
-                ContinuumUser editUser = continuum.getUser( userId );
+                ContinuumUser editUser = getContinuum().getUser( userId );
 
                 editUser.setUsername( username );
                 editUser.setFullName( fullName );
                 editUser.setEmail( email );
                 editUser.setPassword( password );
-                editUser.setGroup( continuum.getUserGroup( userGroupId ) );
-                continuum.updateUser( editUser );
+                editUser.setGroup( getContinuum().getUserGroup( userGroupId ) );
+                getContinuum().updateUser( editUser );
 
             }
             catch ( ContinuumException e )
@@ -166,7 +166,7 @@
     {
         try
         {
-            continuum.removeUser( userId );
+            getContinuum().removeUser( userId );
         }
         catch ( ContinuumException e )
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Fri Aug 25 19:30:58 2006
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
 /*
- * 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.
@@ -58,9 +58,9 @@
     public String execute()
         throws ContinuumException
     {
-        files = continuum.getFiles( projectId, userDirectory );
+        files = getContinuum().getFiles( projectId, userDirectory );
 
-        projectName = continuum.getProject( projectId ).getName();
+        projectName = getContinuum().getProject( projectId ).getName();
 
         HashMap params = new HashMap();
 
@@ -70,11 +70,11 @@
 
         String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(), ServletActionContext.getResponse(), params );
 
-        output = generator.generate( files, baseUrl, continuum.getWorkingDirectory( projectId ) );
+        output = generator.generate( files, baseUrl, getContinuum().getWorkingDirectory( projectId ) );
 
         if ( currentFile != null && currentFile != "" )
         {
-            currentFileContent = continuum.getFileContent( projectId, userDirectory, currentFile );
+            currentFileContent = getContinuum().getFileContent( projectId, userDirectory, currentFile );
         }
         else
         {

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=437056&r1=437055&r2=437056&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Fri Aug 25 19:30:58 2006
@@ -1,17 +1,7 @@
 package org.apache.maven.continuum.web.action.component;
 
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.maven.continuum.web.model.BuildDefinitionSummary;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 /*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-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.
@@ -26,6 +16,17 @@
  * limitations under the License.
  */
 
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.model.BuildDefinitionSummary;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * BuildDefinitionSummaryAction:
  *
@@ -51,7 +52,7 @@
     {
         try
         {
-            projectGroupId = continuum.getProjectGroupByProjectId( projectId ).getId();
+            projectGroupId = getContinuum().getProjectGroupByProjectId( projectId ).getId();
             groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
             projectBuildDefinitionSummaries = gatherProjectBuildDefinitionSummaries( projectId );
 
@@ -73,7 +74,7 @@
         {
             groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
 
-            ProjectGroup projectGroup = continuum.getProjectGroup( projectGroupId );
+            ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
 
             for (Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); )
             {
@@ -99,7 +100,7 @@
     {
         List summaryList = new ArrayList();
 
-        Project project = continuum.getProjectWithAllDetails( projectId );
+        Project project = getContinuum().getProjectWithAllDetails( projectId );
         for ( Iterator i = project.getBuildDefinitions().iterator(); i.hasNext(); )
         {
             BuildDefinitionSummary bds = generateBuildDefinitionSummary( (BuildDefinition) i.next() );
@@ -119,7 +120,7 @@
     {
         List summaryList = new ArrayList();
 
-        ProjectGroup projectGroup = continuum.getProjectGroup( projectGroupId );
+        ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
 
         for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); )
         {



Mime
View raw message