continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r766895 [1/2] - in /continuum/branches/continuum-1.3.x: continuum-api/src/main/java/org/apache/continuum/buildmanager/ continuum-api/src/main/java/org/apache/continuum/taskqueue/ continuum-api/src/main/java/org/apache/maven/continuum/releas...
Date Mon, 20 Apr 2009 22:02:14 GMT
Author: evenisse
Date: Mon Apr 20 22:02:13 2009
New Revision: 766895

URL: http://svn.apache.org/viewvc?rev=766895&view=rev
Log:
More java5 code and clean up lot of warnings found by Idea

Modified:
    continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java
    continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java
    continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
    continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
    continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java
    continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
    continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java
    continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java
    continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
    continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java

Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java Mon Apr 20 22:02:13 2009
@@ -23,16 +23,16 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
+import org.apache.continuum.taskqueue.BuildProjectTask;
+import org.apache.continuum.taskqueue.CheckOutTask;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildQueue;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.scm.ScmResult;
-import org.codehaus.plexus.taskqueue.Task;
 
 /**
  * BuildsManager. All builds whether forced or triggered will go through (or have to be added through) a builds manager.
- * 
+ *
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
 public interface BuildsManager
@@ -40,48 +40,50 @@
     /**
      * Build projects using their corresponding build definitions. This method adds the group of projects to the
      * build queue of the overall queue with the least amount of tasks queued.
-     * 
+     *
      * @param projects
      * @param projectsBuildDefinitionsMap
      * @param trigger
-     * @param scmResultMap TODO
+     * @param scmResultMap                TODO
      * @throws BuildManagerException
      */
-    void buildProjects( List<Project> projects, Map<Integer, BuildDefinition> projectsBuildDefinitionsMap, int trigger, Map<Integer, ScmResult> scmResultMap )
+    void buildProjects( List<Project> projects, Map<Integer, BuildDefinition> projectsBuildDefinitionsMap, int trigger,
+                        Map<Integer, ScmResult> scmResultMap )
         throws BuildManagerException;
 
     /**
      * Build the project using the specified build definition. Adds the project to the build queue of the overall queue with the
-     * least among of tasks queued. The overall queue is chosen from the pool of queues attached to the schedule of the 
+     * least among of tasks queued. The overall queue is chosen from the pool of queues attached to the schedule of the
      * build definition.
-     * 
+     *
      * @param projectId
-     * @param buildDefinition 
+     * @param buildDefinition
      * @param projectName
      * @param trigger
-     * @param scmResult TODO
+     * @param scmResult       TODO
      * @throws BuildManagerException
      */
-    void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger, ScmResult scmResult )
+    void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, int trigger,
+                       ScmResult scmResult )
         throws BuildManagerException;
 
     /**
      * Adds the projects in the prepare-build-queue.
-     * 
+     *
      * @param projectsBuildDefinitionsMap
      * @param trigger
-     * @param projectGroupId TODO
-     * @param scmRootAddress TODO
+     * @param projectGroupId              TODO
+     * @param scmRootAddress              TODO
      * @throws BuildManagerException
      */
-    void prepareBuildProjects( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger, int projectGroupId, 
+    void prepareBuildProjects( Map<Integer, Integer> projectsBuildDefinitionsMap, int trigger, int projectGroupId,
                                String projectGroupName, String scmRootAddress, int scmRootId )
         throws BuildManagerException;
 
     /**
      * Adds the project to the checkout queue of the overall build queue with the least amount of tasks queued.
      * The overall queue is chosen from the pool of queues attached to the schedule of the build definition.
-     * 
+     *
      * @param projectId
      * @param projectName
      * @param workingDirectory
@@ -96,7 +98,7 @@
 
     /**
      * Cancels the specified project's build.
-     * 
+     *
      * @param projectId
      * @return
      * @throws BuildManagerException
@@ -106,7 +108,7 @@
 
     /**
      * Cancels all the builds in all the overall queues.
-     * 
+     *
      * @return
      * @throws BuildManagerException
      */
@@ -115,7 +117,7 @@
 
     /**
      * Cancels the current build on the specified overall queue.
-     * 
+     *
      * @param buildQueueId
      * @return
      * @throws BuildManagerException
@@ -124,7 +126,6 @@
         throws BuildManagerException;
 
     /**
-     *  
      * @param projectId
      * @return
      * @throws BuildManagerException
@@ -133,7 +134,6 @@
         throws BuildManagerException;
 
     /**
-     * 
      * @return
      * @throws BuildManagerException
      */
@@ -142,11 +142,12 @@
 
     // public boolean cancelPrepareBuild(int projectId) throws BuildManagerException;
 
-    boolean cancelAllPrepareBuilds() throws BuildManagerException;
+    boolean cancelAllPrepareBuilds()
+        throws BuildManagerException;
 
     /**
      * Removes the project from the build queue.
-     * 
+     *
      * @param projectId
      * @throws BuildManagerException
      */
@@ -155,7 +156,7 @@
 
     /**
      * Removes the project built using the specified build definition from the build queue.
-     * 
+     *
      * @param projectId
      * @param buildDefinitionId
      * @param trigger
@@ -168,14 +169,14 @@
     // TODO: should we throw an exception when one of the projects cannot be removed?
     /**
      * Removes the specified projects from their build queues.
-     * 
+     *
      * @param projectIds
      */
     void removeProjectsFromBuildQueue( int[] projectIds );
 
     /**
      * Removes a set of projects using the specified hashcodes from the build queues.
-     * 
+     *
      * @param hascodes
      * @throws BuildManagerException
      */
@@ -184,7 +185,7 @@
 
     /**
      * Removes the project from the checkout queue.
-     * 
+     *
      * @param projectId
      * @throws BuildManagerException
      */
@@ -193,38 +194,39 @@
 
     /**
      * Removes the specified projects from their checkout queues.
-     * 
+     *
      * @param projectIds
      */
     void removeProjectsFromCheckoutQueue( int[] projectIds );
 
     /**
      * Removes a set of projects using the specified hashcodes from the checkout queues.
-     * 
+     *
      * @param hashcodes
      * @throws BuildManagerException
      */
     void removeProjectsFromCheckoutQueueWithHashcodes( int[] hashcodes )
         throws BuildManagerException;
-    
+
     boolean removeProjectGroupFromPrepareBuildQueue( int projectGroupId, String scmRootAddress )
         throws BuildManagerException;
-    
+
     /*void removeProjectFromPrepareBuildQueue( int projectId ) throws BuildManagerException;
 
-    void removeProjectsFromPrepareBuildQueue( int[] projectIds ) throws BuildManagerException;*/
+void removeProjectsFromPrepareBuildQueue( int[] projectIds ) throws BuildManagerException;*/
 
     /**
      * Add an overall build queue.
-     * 
+     *
      * @param buildQueue
      * @throws BuildManagerException TODO
      */
-    void addOverallBuildQueue( BuildQueue buildQueue ) throws BuildManagerException;
+    void addOverallBuildQueue( BuildQueue buildQueue )
+        throws BuildManagerException;
 
     /**
      * Remove an overall build queue.
-     * 
+     *
      * @param overallBuildQueueId
      * @throws BuildManagerException
      */
@@ -233,7 +235,7 @@
 
     /**
      * Checks whether the project build is queued.
-     * 
+     *
      * @param projectId
      * @return
      * @throws BuildManagerException
@@ -243,7 +245,7 @@
 
     /**
      * Checks whether the project build using the specified build definition is queued.
-     * 
+     *
      * @param projectId
      * @param buildDefinitionId
      * @return
@@ -254,17 +256,17 @@
 
     /**
      * Checks whether the project checkout is already queued.
-     * 
+     *
      * @param projectId
      * @return
      * @throws BuildManagerException
      */
     boolean isInAnyCheckoutQueue( int projectId )
         throws BuildManagerException;
-    
+
     /**
      * Checks if at least one of the projects is currently being checked out.
-     * 
+     *
      * @param projectIds
      * @return
      * @throws BuildManagerException
@@ -274,7 +276,7 @@
 
     /**
      * Checks whether the project is already in the prepare-build queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws BuildManagerException
@@ -284,7 +286,7 @@
 
     /**
      * Checks whether the project is currently being built.
-     * 
+     *
      * @param projectId
      * @return
      * @throws BuildManagerException
@@ -296,42 +298,43 @@
 
     /**
      * Returns all the build tasks currently being executed.
-     * 
+     *
      * @return
      * @throws BuildManagerException
      */
-    Map<String, Task> getCurrentBuilds()
+    Map<String, BuildProjectTask> getCurrentBuilds()
         throws BuildManagerException;
 
     /**
      * Returns all the checkout tasks currently being executed.
+     *
      * @return
      * @throws BuildManagerException
      */
-    Map<String, Task> getCurrentCheckouts()
+    Map<String, CheckOutTask> getCurrentCheckouts()
         throws BuildManagerException;
 
     /**
      * Returns all the overall build queues together with a list of the build tasks in it's build queue.
-     * 
+     *
      * @return
      * @throws BuildManagerException
      */
-    Map<String, List<Task>> getProjectsInBuildQueues()
+    Map<String, List<BuildProjectTask>> getProjectsInBuildQueues()
         throws BuildManagerException;
 
     /**
      * Returns all the overall build queues together with a list of checkout tasks in it's checkout queue.
-     * 
+     *
      * @return
      * @throws BuildManagerException
      */
-    Map<String, List<Task>> getProjectsInCheckoutQueues()
+    Map<String, List<CheckOutTask>> getProjectsInCheckoutQueues()
         throws BuildManagerException;
 
     /**
      * Checks whether a build is in progress.
-     * 
+     *
      * @return
      */
     boolean isBuildInProgress();

Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java Mon Apr 20 22:02:13 2009
@@ -21,98 +21,98 @@
 
 import java.util.List;
 
-import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 
 /**
- * 
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
 public interface OverallBuildQueue
-{       
+{
     /**
      * Returns the id of the "overall" build queue
-     * 
+     *
      * @return
      */
     int getId();
-    
+
     void setId( int id );
-    
+
     /**
      * Returns the name of the "overall" build queue
+     *
      * @return
      */
     String getName();
-    
+
     void setName( String name );
-    
+
     /* Checkout Queue */
-    
+
     /**
      * Returns the checkout queue.
-     * 
+     *
      * @return
      */
     TaskQueue getCheckoutQueue();
 
     /**
      * Add checkout task to checkout queue.
-     * 
+     *
      * @param checkoutTask
      * @throws TaskQueueException TODO
      */
-    void addToCheckoutQueue( Task checkoutTask )
+    void addToCheckoutQueue( CheckOutTask checkoutTask )
         throws TaskQueueException;
-    
-   /**
-    * Add checkout tasks to checkout queue.
-    * 
-    * @param checkoutTasks
-    * @throws TaskQueueException TODO
-    */
-    void addToCheckoutQueue( List<Task> checkoutTasks )
+
+    /**
+     * Add checkout tasks to checkout queue.
+     *
+     * @param checkoutTasks
+     * @throws TaskQueueException TODO
+     */
+    void addToCheckoutQueue( List<CheckOutTask> checkoutTasks )
         throws TaskQueueException;
 
     /**
      * Get all checkout tasks in checkout queue.
-     * 
+     *
      * @return
      * @throws TaskQueueException TODO
      */
-    List /* CheckOutTask */getProjectsInCheckoutQueue()
+    List<CheckOutTask> getProjectsInCheckoutQueue()
         throws TaskQueueException;
 
     /**
      * Check if the project is in the checkout queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws TaskQueueException TODO
      */
     boolean isInCheckoutQueue( int projectId )
         throws TaskQueueException;
-    
+
     /**
      * Cancel checkout of project.
-     * 
+     *
      * @param projectId
      * @throws TaskQueueException
      */
     void cancelCheckoutTask( int projectId )
         throws TaskQueueException;
-    
+
     /**
      * Cancel current checkout.
+     *
      * @return TODO
      */
     boolean cancelCurrentCheckout();
 
     /**
      * Remove project from checkout queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws TaskQueueException TODO
@@ -122,7 +122,7 @@
 
     /**
      * Remove the specified projects in the checkout queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws TaskQueueException TODO
@@ -131,7 +131,6 @@
         throws TaskQueueException;
 
     /**
-     * 
      * @param hashCodes
      * @throws TaskQueueException TODO
      */
@@ -142,41 +141,41 @@
 
     /**
      * Returns the build queue.
-     * 
+     *
      * @return
      */
     TaskQueue getBuildQueue();
 
     /**
      * Add the build task to the build queue.
-     * 
+     *
      * @param buildTask
      * @throws Exception
      */
-    void addToBuildQueue( Task buildTask )
+    void addToBuildQueue( BuildProjectTask buildTask )
         throws TaskQueueException;
-    
+
     /**
      * Add the build tasks to the build queue.
-     * 
+     *
      * @param buildTasks
      * @throws TaskQueueException TODO
      */
-    void addToBuildQueue( List<Task> buildTasks )
+    void addToBuildQueue( List<BuildProjectTask> buildTasks )
         throws TaskQueueException;
 
     /**
      * Returns the build tasks in the build queue.
-     * 
+     *
      * @return
      * @throws TaskQueueException TODO
      */
-    List<Task> getProjectsInBuildQueue()
+    List<BuildProjectTask> getProjectsInBuildQueue()
         throws TaskQueueException;
 
     /**
      * Checks if the specified project is in the build queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws TaskQueueException TODO
@@ -186,7 +185,7 @@
 
     /**
      * Checks if the specified project with the specified build definition is in the build queue.
-     * 
+     *
      * @param projectId
      * @param buildDefinitionId
      * @return
@@ -197,21 +196,21 @@
 
     /**
      * Cancel the build task of the corresponding project.
-     * 
+     *
      * @param projectId
      */
     void cancelBuildTask( int projectId );
 
     /**
      * Cancel the current build.
-     * 
+     *
      * @return
      */
     boolean cancelCurrentBuild();
 
     /**
      * Remove the project matching the specified id, name, build definition and trigger from the build queue.
-     * 
+     *
      * @param projectId
      * @param buildDefinitionId
      * @param trigger
@@ -224,7 +223,7 @@
 
     /**
      * Remove the specified project from the build queue.
-     * 
+     *
      * @param projectId
      * @return
      * @throws TaskQueueException TODO
@@ -234,7 +233,7 @@
 
     /**
      * Remove the specified projects from the build queue.
-     * 
+     *
      * @param projectIds
      * @return
      * @throws TaskQueueException TODO
@@ -244,23 +243,23 @@
 
     /**
      * Remove the projects matching the specified hashcodes from the build queue.
-     * 
+     *
      * @param hashCodes
      * @throws TaskQueueException TODO
      */
     void removeProjectsFromBuildQueueWithHashCodes( int[] hashCodes )
         throws TaskQueueException;
-    
+
     /**
      * Returns the build task queue executor used.
-     * 
+     *
      * @return
      */
     TaskQueueExecutor getBuildTaskQueueExecutor();
-    
+
     /**
      * Returns the checkout task queue executor used.
-     * 
+     *
      * @return
      */
     TaskQueueExecutor getCheckoutTaskQueueExecutor();

Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManagerListener.java Mon Apr 20 22:02:13 2009
@@ -29,13 +29,13 @@
 {
     int INITIALIZED = 0, LISTENING = 1, FINISHED = 3;
 
-    List getCompletedPhases();
+    List<String> getCompletedPhases();
 
     String getInProgress();
 
     String getGoalName();
 
-    List getPhases();
+    List<String> getPhases();
 
     String getError();
 

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java Mon Apr 20 22:02:13 2009
@@ -120,7 +120,7 @@
             buildDefinitionLabel = buildDefinition.getGoals();
         }
 
-        Task buildTask =
+        BuildProjectTask buildTask =
             new BuildProjectTask( projectId, buildDefinition.getId(), trigger, projectName, buildDefinitionLabel,
                                   scmResult );
         try
@@ -468,11 +468,11 @@
     {
         for ( int projectId : projectIds )
         {
-            Map<String, Task> checkouts = getCurrentCheckouts();
+            Map<String, CheckOutTask> checkouts = getCurrentCheckouts();
             Set<String> keySet = checkouts.keySet();
             for ( String key : keySet )
             {
-                CheckOutTask task = (CheckOutTask) checkouts.get( key );
+                CheckOutTask task = checkouts.get( key );
                 if ( task.getProjectId() == projectId )
                 {
                     return true;
@@ -801,7 +801,7 @@
     public void removeOverallBuildQueue( int overallBuildQueueId )
         throws BuildManagerException
     {
-        List<Task> tasks;
+        List<BuildProjectTask> tasks;
         List<CheckOutTask> checkoutTasks;
 
         synchronized ( overallBuildQueues )
@@ -851,9 +851,8 @@
             log.info( "Removed overall build queue '" + overallBuildQueueId + "' from build queues map." );
         }
 
-        for ( Task task : tasks )
+        for ( BuildProjectTask buildTask : tasks )
         {
-            BuildProjectTask buildTask = (BuildProjectTask) task;
             try
             {
                 BuildDefinition buildDefinition =
@@ -891,17 +890,18 @@
     /**
      * @see BuildsManager#getCurrentBuilds()
      */
-    public Map<String, Task> getCurrentBuilds()
+    public Map<String, BuildProjectTask> getCurrentBuilds()
         throws BuildManagerException
     {
         synchronized ( overallBuildQueues )
         {
-            Map<String, Task> currentBuilds = new HashMap<String, Task>();
+            Map<String, BuildProjectTask> currentBuilds = new HashMap<String, BuildProjectTask>();
             Set<Integer> keys = overallBuildQueues.keySet();
             for ( Integer key : keys )
             {
                 OverallBuildQueue overallBuildQueue = overallBuildQueues.get( key );
-                Task task = overallBuildQueue.getBuildTaskQueueExecutor().getCurrentTask();
+                BuildProjectTask task =
+                    (BuildProjectTask) overallBuildQueue.getBuildTaskQueueExecutor().getCurrentTask();
                 if ( task != null )
                 {
                     currentBuilds.put( overallBuildQueue.getName(), task );
@@ -914,17 +914,17 @@
     /**
      * @see BuildsManager#getCurrentCheckouts()
      */
-    public Map<String, Task> getCurrentCheckouts()
+    public Map<String, CheckOutTask> getCurrentCheckouts()
         throws BuildManagerException
     {
         synchronized ( overallBuildQueues )
         {
-            Map<String, Task> currentCheckouts = new HashMap<String, Task>();
+            Map<String, CheckOutTask> currentCheckouts = new HashMap<String, CheckOutTask>();
             Set<Integer> keys = overallBuildQueues.keySet();
             for ( Integer key : keys )
             {
                 OverallBuildQueue overallBuildQueue = overallBuildQueues.get( key );
-                Task task = overallBuildQueue.getCheckoutTaskQueueExecutor().getCurrentTask();
+                CheckOutTask task = (CheckOutTask) overallBuildQueue.getCheckoutTaskQueueExecutor().getCurrentTask();
                 if ( task != null )
                 {
                     currentCheckouts.put( overallBuildQueue.getName(), task );
@@ -937,12 +937,12 @@
     /**
      * @see BuildsManager#getProjectsInBuildQueues()
      */
-    public Map<String, List<Task>> getProjectsInBuildQueues()
+    public Map<String, List<BuildProjectTask>> getProjectsInBuildQueues()
         throws BuildManagerException
     {
         synchronized ( overallBuildQueues )
         {
-            Map<String, List<Task>> queuedBuilds = new HashMap<String, List<Task>>();
+            Map<String, List<BuildProjectTask>> queuedBuilds = new HashMap<String, List<BuildProjectTask>>();
             Set<Integer> keySet = overallBuildQueues.keySet();
             for ( Integer key : keySet )
             {
@@ -965,12 +965,12 @@
     /**
      * @see BuildsManager#getProjectsInCheckoutQueues()
      */
-    public Map<String, List<Task>> getProjectsInCheckoutQueues()
+    public Map<String, List<CheckOutTask>> getProjectsInCheckoutQueues()
         throws BuildManagerException
     {
         synchronized ( overallBuildQueues )
         {
-            Map<String, List<Task>> queuedCheckouts = new HashMap<String, List<Task>>();
+            Map<String, List<CheckOutTask>> queuedCheckouts = new HashMap<String, List<CheckOutTask>>();
             Set<Integer> keySet = overallBuildQueues.keySet();
             for ( Integer key : keySet )
             {

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java Mon Apr 20 22:02:13 2009
@@ -80,9 +80,9 @@
     }
 
     /**
-     * @see OverallBuildQueue#addToCheckoutQueue(Task)
+     * @see OverallBuildQueue#addToCheckoutQueue(CheckOutTask)
      */
-    public void addToCheckoutQueue( Task checkoutTask )
+    public void addToCheckoutQueue( CheckOutTask checkoutTask )
         throws TaskQueueException
     {
         getCheckoutQueue().put( checkoutTask );
@@ -91,10 +91,10 @@
     /**
      * @see OverallBuildQueue#addToCheckoutQueue(List)
      */
-    public void addToCheckoutQueue( List<Task> checkoutTasks )
+    public void addToCheckoutQueue( List<CheckOutTask> checkoutTasks )
         throws TaskQueueException
     {
-        for ( Task checkoutTask : checkoutTasks )
+        for ( CheckOutTask checkoutTask : checkoutTasks )
         {
             getCheckoutQueue().put( checkoutTask );
         }
@@ -194,9 +194,9 @@
     }
 
     /**
-     * @see OverallBuildQueue#addToBuildQueue(Task)
+     * @see OverallBuildQueue#addToBuildQueue(BuildProjectTask)
      */
-    public void addToBuildQueue( Task buildTask )
+    public void addToBuildQueue( BuildProjectTask buildTask )
         throws TaskQueueException
     {
         getBuildQueue().put( buildTask );
@@ -205,10 +205,10 @@
     /**
      * @see OverallBuildQueue#addToBuildQueue(List)
      */
-    public void addToBuildQueue( List<Task> buildTasks )
+    public void addToBuildQueue( List<BuildProjectTask> buildTasks )
         throws TaskQueueException
     {
-        for ( Task buildTask : buildTasks )
+        for ( BuildProjectTask buildTask : buildTasks )
         {
             getBuildQueue().put( buildTask );
         }
@@ -217,7 +217,7 @@
     /**
      * @see OverallBuildQueue#getProjectsInBuildQueue()
      */
-    public List<Task> getProjectsInBuildQueue()
+    public List<BuildProjectTask> getProjectsInBuildQueue()
         throws TaskQueueException
     {
         return getBuildQueue().getQueueSnapshot();
@@ -238,11 +238,10 @@
     public boolean isInBuildQueue( int projectId, int buildDefinitionId )
         throws TaskQueueException
     {
-        List<Task> queue = getProjectsInBuildQueue();
-        for ( Task task : queue )
+        List<BuildProjectTask> queue = getProjectsInBuildQueue();
+        for ( BuildProjectTask buildTask : queue )
         {
-            BuildProjectTask buildTask = (BuildProjectTask) task;
-            if ( task != null )
+            if ( buildTask != null )
             {
                 if ( buildDefinitionId < 0 )
                 {
@@ -367,14 +366,13 @@
         {
             return false;
         }
-        List<Task> queue = getProjectsInBuildQueue();
+        List<BuildProjectTask> queue = getProjectsInBuildQueue();
 
         List<BuildProjectTask> tasks = new ArrayList<BuildProjectTask>();
 
-        for ( Task task : queue )
+        for ( BuildProjectTask buildTask : queue )
         {
-            BuildProjectTask buildTask = (BuildProjectTask) task;
-            if ( task != null )
+            if ( buildTask != null )
             {
                 if ( ArrayUtils.contains( projectIds, buildTask.getProjectId() ) )
                 {
@@ -397,14 +395,13 @@
     public boolean removeProjectFromBuildQueue( int projectId )
         throws TaskQueueException
     {
-        List<Task> queue = getProjectsInBuildQueue();
+        List<BuildProjectTask> queue = getProjectsInBuildQueue();
 
-        for ( Task task : queue )
+        for ( BuildProjectTask buildTask : queue )
         {
-            BuildProjectTask buildTask = (BuildProjectTask) task;
-            if ( task != null && buildTask.getProjectId() == projectId )
+            if ( buildTask != null && buildTask.getProjectId() == projectId )
             {
-                return getBuildQueue().remove( task );
+                return getBuildQueue().remove( buildTask );
             }
         }
         return false;
@@ -416,8 +413,8 @@
     public void removeProjectsFromBuildQueueWithHashCodes( int[] hashCodes )
         throws TaskQueueException
     {
-        List<Task> queue = getProjectsInBuildQueue();
-        for ( Task task : queue )
+        List<BuildProjectTask> queue = getProjectsInBuildQueue();
+        for ( BuildProjectTask task : queue )
         {
             if ( ArrayUtils.contains( hashCodes, task.hashCode() ) )
             {

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java Mon Apr 20 22:02:13 2009
@@ -183,15 +183,15 @@
     {
         try
         {
-            Map<String, Task> currentBuilds = buildsManager.getCurrentBuilds();
+            Map<String, BuildProjectTask> currentBuilds = buildsManager.getCurrentBuilds();
             Set<String> keys = currentBuilds.keySet();
 
             for ( String key : keys )
             {
-                Task task = currentBuilds.get( key );
-                if ( task != null && task instanceof BuildProjectTask )
+                BuildProjectTask task = currentBuilds.get( key );
+                if ( task != null )
                 {
-                    int projectId = ( (BuildProjectTask) task ).getProjectId();
+                    int projectId = task.getProjectId();
 
                     Project project = projectDao.getProject( projectId );
                     LocalRepository repository = project.getProjectGroup().getLocalRepository();

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Apr 20 22:02:13 2009
@@ -1222,12 +1222,12 @@
 
     public ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl, int projectGroupId,
                                                               boolean checkProtocol, boolean useCredentialsCache,
-                                                              int buildDefintionTemplateId )
+                                                              int buildDefinitionTemplateId )
         throws ContinuumException
     {
         return executeAddProjectsFromMetadataActivity( metadataUrl, MavenOneContinuumProjectBuilder.ID, projectGroupId,
                                                        checkProtocol, useCredentialsCache, true,
-                                                       buildDefintionTemplateId );
+                                                       buildDefinitionTemplateId );
     }
 
     // ----------------------------------------------------------------------
@@ -1304,12 +1304,12 @@
 
     public ContinuumProjectBuildingResult addMavenTwoProject( String metadataUrl, int projectGroupId,
                                                               boolean checkProtocol, boolean useCredentialsCache,
-                                                              boolean recursiveProjects, int buildDefintionTemplateId )
+                                                              boolean recursiveProjects, int buildDefinitionTemplateId )
         throws ContinuumException
     {
         return executeAddProjectsFromMetadataActivity( metadataUrl, MavenTwoContinuumProjectBuilder.ID, projectGroupId,
                                                        checkProtocol, useCredentialsCache, recursiveProjects,
-                                                       buildDefintionTemplateId );
+                                                       buildDefinitionTemplateId );
     }
 
     // ----------------------------------------------------------------------
@@ -1325,19 +1325,19 @@
     /**
      * @see org.apache.maven.continuum.Continuum#addProject(org.apache.maven.continuum.model.project.Project, java.lang.String, int, int)
      */
-    public int addProject( Project project, String executorId, int groupId, int buildDefintionTemplateId )
+    public int addProject( Project project, String executorId, int groupId, int buildDefinitionTemplateId )
         throws ContinuumException
     {
         project.setExecutorId( executorId );
 
-        return executeAddProjectFromScmActivity( project, groupId, buildDefintionTemplateId );
+        return executeAddProjectFromScmActivity( project, groupId, buildDefinitionTemplateId );
     }
 
     // ----------------------------------------------------------------------
     // Activities. These should end up as workflows in werkflow
     // ----------------------------------------------------------------------
 
-    private int executeAddProjectFromScmActivity( Project project, int groupId, int buildDefintionTemplateId )
+    private int executeAddProjectFromScmActivity( Project project, int groupId, int buildDefinitionTemplateId )
         throws ContinuumException
     {
         String executorId = project.getExecutorId();
@@ -1371,25 +1371,25 @@
 
             if ( executorId.equalsIgnoreCase( ContinuumBuildExecutorConstants.ANT_BUILD_EXECUTOR ) )
             {
-                if ( buildDefintionTemplateId <= 0 )
+                if ( buildDefinitionTemplateId <= 0 )
                 {
                     bdt = buildDefinitionService.getDefaultAntBuildDefinitionTemplate();
                 }
                 else
                 {
-                    bdt = buildDefinitionService.getBuildDefinitionTemplate( buildDefintionTemplateId );
+                    bdt = buildDefinitionService.getBuildDefinitionTemplate( buildDefinitionTemplateId );
                 }
             }
             else
             {
                 //shell default
-                if ( buildDefintionTemplateId <= 0 )
+                if ( buildDefinitionTemplateId <= 0 )
                 {
                     bdt = buildDefinitionService.getDefaultShellBuildDefinitionTemplate();
                 }
                 else
                 {
-                    bdt = buildDefinitionService.getBuildDefinitionTemplate( buildDefintionTemplateId );
+                    bdt = buildDefinitionService.getBuildDefinitionTemplate( buildDefinitionTemplateId );
                 }
             }
 
@@ -1419,11 +1419,11 @@
                                                                                    String projectBuilderId,
                                                                                    int projectGroupId,
                                                                                    boolean checkProtocol,
-                                                                                   int buildDefintionTemplateId )
+                                                                                   int buildDefinitionTemplateId )
         throws ContinuumException
     {
         return executeAddProjectsFromMetadataActivity( metadataUrl, projectBuilderId, projectGroupId, checkProtocol,
-                                                       false, false, buildDefintionTemplateId );
+                                                       false, false, buildDefinitionTemplateId );
     }
 
 
@@ -1433,7 +1433,7 @@
                                                                                      boolean checkProtocol,
                                                                                      boolean useCredentialsCache,
                                                                                      boolean loadRecursiveProjects,
-                                                                                     int buildDefintionTemplateId,
+                                                                                     int buildDefinitionTemplateId,
                                                                                      boolean addAssignableRoles )
         throws ContinuumException
     {
@@ -1460,12 +1460,12 @@
         context.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, getWorkingDirectory() );
 
         // CreateProjectsFromMetadataAction will check null and use default
-        if ( buildDefintionTemplateId > 0 )
+        if ( buildDefinitionTemplateId > 0 )
         {
             try
             {
                 context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_TEMPLATE,
-                             buildDefinitionService.getBuildDefinitionTemplate( buildDefintionTemplateId ) );
+                             buildDefinitionService.getBuildDefinitionTemplate( buildDefinitionTemplateId ) );
             }
             catch ( BuildDefinitionServiceException e )
             {
@@ -1611,9 +1611,9 @@
 
                 // CONTINUUM-1953 olamy : attached buildDefs from template here
                 // if no group creation
-                if ( !projectGroupCreation && buildDefintionTemplateId > 0 )
+                if ( !projectGroupCreation && buildDefinitionTemplateId > 0 )
                 {
-                    buildDefinitionService.addTemplateInProject( buildDefintionTemplateId,
+                    buildDefinitionService.addTemplateInProject( buildDefinitionTemplateId,
                                                                  projectDao.getProject( project.getId() ) );
                 }
 
@@ -1688,12 +1688,12 @@
                                                                                      boolean checkProtocol,
                                                                                      boolean useCredentialsCache,
                                                                                      boolean loadRecursiveProjects,
-                                                                                     int buildDefintionTemplateId )
+                                                                                     int buildDefinitionTemplateId )
         throws ContinuumException
     {
         return executeAddProjectsFromMetadataActivity( metadataUrl, projectBuilderId, projectGroupId, checkProtocol,
                                                        useCredentialsCache, loadRecursiveProjects,
-                                                       buildDefintionTemplateId, true );
+                                                       buildDefinitionTemplateId, true );
     }
 
     // ----------------------------------------------------------------------

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java Mon Apr 20 22:02:13 2009
@@ -201,7 +201,7 @@
         context.checking( new Expectations()
         {
             {
-                one( overallBuildQueue ).addToBuildQueue( with( any( Task.class ) ) );
+                one( overallBuildQueue ).addToBuildQueue( with( any( BuildProjectTask.class ) ) );
             }} );
     }
 
@@ -249,7 +249,7 @@
         context.checking( new Expectations()
         {
             {
-                one( overallBuildQueue ).addToCheckoutQueue( with( any( Task.class ) ) );
+                one( overallBuildQueue ).addToCheckoutQueue( with( any( CheckOutTask.class ) ) );
             }} );
     }
 
@@ -682,7 +682,7 @@
         final TaskQueueExecutor buildQueueExecutor = context.mock( TaskQueueExecutor.class, "build-queue-executor" );
         final Task buildTask = new BuildProjectTask( 1, 1, 1, "continuum-project-test-1", "BUILD_DEF", null );
 
-        final List<Task> buildTasks = new ArrayList<Task>();
+        final List<BuildProjectTask> buildTasks = new ArrayList<BuildProjectTask>();
         buildTasks.add( new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null ) );
 
         final List<CheckOutTask> checkoutTasks = new ArrayList<CheckOutTask>();
@@ -749,7 +749,7 @@
                 exactly( 2 ).of( overallBuildQueue ).getName();
                 will( returnValue( ConfigurationService.DEFAULT_BUILD_QUEUE_NAME ) );
 
-                one( overallBuildQueue ).addToBuildQueue( with( any( Task.class ) ) );
+                one( overallBuildQueue ).addToBuildQueue( with( any( BuildProjectTask.class ) ) );
             }} );
 
         buildsManager.buildProject( 1, buildDef, "continuum-project-test-1", 1, null );

Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueueTest.java Mon Apr 20 22:02:13 2009
@@ -25,8 +25,6 @@
 
 import org.apache.continuum.dao.BuildDefinitionDao;
 import org.apache.continuum.taskqueueexecutor.ParallelBuildsThreadedTaskQueueExecutor;
-import org.apache.continuum.taskqueue.BuildProjectTask;
-import org.apache.continuum.taskqueue.CheckOutTask;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.codehaus.plexus.taskqueue.Task;
@@ -38,9 +36,8 @@
 
 /**
  * DefaultOverallBuildQueueTest
- * 
- * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  *
+ * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
 public class DefaultOverallBuildQueueTest
     extends PlexusInSpringTestCase
@@ -85,7 +82,7 @@
     public void testAddToCheckoutQueue()
         throws Exception
     {
-        final Task checkoutTask =
+        final CheckOutTask checkoutTask =
             new CheckOutTask( 1, new File( getBasedir(), "/target/test-working-dir/1" ), "continuum-project-test-1",
                               "dummy", "dummypass" );
         final TaskQueue checkoutQueue = context.mock( TaskQueue.class, "checkout-queue" );
@@ -97,8 +94,7 @@
                 will( returnValue( checkoutQueue ) );
 
                 one( checkoutQueue ).put( checkoutTask );
-            }
-        } );
+            }} );
 
         overallQueue.addToCheckoutQueue( checkoutTask );
         context.assertIsSatisfied();
@@ -109,8 +105,9 @@
     {
         final TaskQueue checkoutQueue = context.mock( TaskQueue.class, "checkout-queue" );
         final List<Task> tasks = new ArrayList<Task>();
-        tasks.add( new CheckOutTask( 1, new File( getBasedir(), "/target/test-working-dir/1" ),
-                                     "continuum-project-test-1", "dummy", "dummypass" ) );
+        tasks.add(
+            new CheckOutTask( 1, new File( getBasedir(), "/target/test-working-dir/1" ), "continuum-project-test-1",
+                              "dummy", "dummypass" ) );
 
         context.checking( new Expectations()
         {
@@ -120,8 +117,7 @@
 
                 one( checkoutQueue ).getQueueSnapshot();
                 will( returnValue( tasks ) );
-            }
-        } );
+            }} );
 
         List<CheckOutTask> returnedTasks = overallQueue.getProjectsInCheckoutQueue();
         context.assertIsSatisfied();
@@ -135,8 +131,9 @@
     {
         final TaskQueue checkoutQueue = context.mock( TaskQueue.class, "checkout-queue" );
         final List<Task> tasks = new ArrayList<Task>();
-        tasks.add( new CheckOutTask( 1, new File( getBasedir(), "/target/test-working-dir/1" ),
-                                     "continuum-project-test-1", "dummy", "dummypass" ) );
+        tasks.add(
+            new CheckOutTask( 1, new File( getBasedir(), "/target/test-working-dir/1" ), "continuum-project-test-1",
+                              "dummy", "dummypass" ) );
 
         context.checking( new Expectations()
         {
@@ -146,8 +143,7 @@
 
                 one( checkoutQueue ).getQueueSnapshot();
                 will( returnValue( tasks ) );
-            }
-        } );
+            }} );
 
         assertTrue( overallQueue.isInCheckoutQueue( 1 ) );
         context.assertIsSatisfied();
@@ -176,8 +172,7 @@
                 will( returnValue( checkoutQueue ) );
 
                 one( checkoutQueue ).remove( checkoutTask );
-            }
-        } );
+            }} );
 
         overallQueue.removeProjectFromCheckoutQueue( 1 );
         context.assertIsSatisfied();
@@ -188,7 +183,8 @@
     public void testAddToBuildQueue()
         throws Exception
     {
-        final Task buildTask = new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
+        final BuildProjectTask buildTask =
+            new BuildProjectTask( 2, 1, 1, "continuum-project-test-2", "BUILD_DEF", null );
         final TaskQueue buildQueue = context.mock( TaskQueue.class, "build-queue" );
 
         context.checking( new Expectations()
@@ -198,8 +194,7 @@
                 will( returnValue( buildQueue ) );
 
                 one( buildQueue ).put( buildTask );
-            }
-        } );
+            }} );
 
         overallQueue.addToBuildQueue( buildTask );
         context.assertIsSatisfied();
@@ -220,10 +215,9 @@
 
                 one( buildQueue ).getQueueSnapshot();
                 will( returnValue( tasks ) );
-            }
-        } );
+            }} );
 
-        List<Task> returnedTasks = overallQueue.getProjectsInBuildQueue();
+        List<BuildProjectTask> returnedTasks = overallQueue.getProjectsInBuildQueue();
         context.assertIsSatisfied();
 
         assertNotNull( returnedTasks );
@@ -245,8 +239,7 @@
 
                 one( buildQueue ).getQueueSnapshot();
                 will( returnValue( tasks ) );
-            }
-        } );
+            }} );
 
         assertTrue( overallQueue.isInBuildQueue( 2 ) );
         context.assertIsSatisfied();
@@ -264,8 +257,7 @@
                 will( returnValue( buildTask ) );
 
                 one( buildTaskQueueExecutor ).cancelTask( buildTask );
-            }
-        } );
+            }} );
 
         overallQueue.cancelBuildTask( 2 );
         context.assertIsSatisfied();
@@ -283,8 +275,7 @@
                 will( returnValue( buildTask ) );
 
                 one( buildTaskQueueExecutor ).cancelTask( buildTask );
-            }
-        } );
+            }} );
 
         overallQueue.cancelCurrentBuild();
         context.assertIsSatisfied();
@@ -309,8 +300,7 @@
                 will( returnValue( buildQueue ) );
 
                 one( buildQueue ).remove( with( any( Task.class ) ) );
-            }
-        } );
+            }} );
 
         overallQueue.removeProjectFromBuildQueue( 1, 1, 1, "continuum-project-test-1" );
         context.assertIsSatisfied();
@@ -338,8 +328,7 @@
                 will( returnValue( buildQueue ) );
 
                 one( buildQueue ).remove( buildTask );
-            }
-        } );
+            }} );
 
         overallQueue.removeProjectFromBuildQueue( 1 );
         context.assertIsSatisfied();

Modified: continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Mon Apr 20 22:02:13 2009
@@ -19,12 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.shared.release.ReleaseManagerListener;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.maven.shared.release.ReleaseManagerListener;
+
 /**
  * @author Edwin Punzalan
  * @version $Id$
@@ -38,7 +38,7 @@
 
     private String inProgress;
 
-    private List phases;
+    private List<String> phases;
 
     private String error;
 
@@ -81,7 +81,7 @@
         goalEnd();
     }
 
-    public List getCompletedPhases()
+    public List<String> getCompletedPhases()
     {
         return completedPhases;
     }
@@ -91,7 +91,7 @@
         return inProgress;
     }
 
-    public List getPhases()
+    public List<String> getPhases()
     {
         return phases;
     }

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java Mon Apr 20 22:02:13 2009
@@ -25,32 +25,32 @@
 import org.apache.continuum.taskqueue.BuildProjectTask;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.codehaus.plexus.taskqueue.Task;
 
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 5 oct. 07
  * @version $Id$
+ * @since 5 oct. 07
  */
 public abstract class AbstractBuildAction
     extends ContinuumConfirmAction
-{    
+{
     private int projectId;
-    
+
     private boolean canDelete = true;
-    
-    protected boolean canRemoveBuildResult(BuildResult buildResult)
+
+    protected boolean canRemoveBuildResult( BuildResult buildResult )
         throws BuildManagerException
     {
-        Map<String, Task> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
+        Map<String, BuildProjectTask> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
         Set<String> keySet = currentBuilds.keySet();
-        for( String key : keySet )
+        for ( String key : keySet )
         {
-            BuildProjectTask buildProjectTask = (BuildProjectTask) currentBuilds.get( key );
+            BuildProjectTask buildProjectTask = currentBuilds.get( key );
             if ( buildProjectTask != null && buildResult != null )
             {
-                return !( buildResult.getState() == ContinuumProjectState.BUILDING && ( buildProjectTask
-                    .getBuildDefinitionId() == buildResult.getBuildDefinition().getId() && buildProjectTask.getProjectId() == this.getProjectId() ) );
+                return !( buildResult.getState() == ContinuumProjectState.BUILDING &&
+                    ( buildProjectTask.getBuildDefinitionId() == buildResult.getBuildDefinition().getId() &&
+                        buildProjectTask.getProjectId() == this.getProjectId() ) );
             }
         }
         return true;

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java Mon Apr 20 22:02:13 2009
@@ -33,7 +33,6 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -204,18 +203,15 @@
     protected int getCurrentProjectIdBuilding()
         throws ContinuumException, BuildManagerException
     {
-        Map<String, Task> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
+        Map<String, BuildProjectTask> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
         Set<String> keySet = currentBuilds.keySet();
 
         for ( String key : keySet )
         {
-            Task task = currentBuilds.get( key );
+            BuildProjectTask task = currentBuilds.get( key );
             if ( task != null )
             {
-                if ( task instanceof BuildProjectTask )
-                {
-                    return ( (BuildProjectTask) task ).getProjectId();
-                }
+                return task.getProjectId();
             }
         }
         return -1;

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Mon Apr 20 22:02:13 2009
@@ -43,7 +43,6 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.model.DistributedBuildSummary;
 import org.codehaus.plexus.redback.rbac.Resource;
-import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -243,11 +242,11 @@
             try
             {
                 // current builds
-                Map<String, Task> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
+                Map<String, BuildProjectTask> currentBuilds = getContinuum().getBuildsManager().getCurrentBuilds();
                 Set<String> keySet = currentBuilds.keySet();
                 for ( String key : keySet )
                 {
-                    BuildProjectTask buildTask = (BuildProjectTask) currentBuilds.get( key );
+                    BuildProjectTask buildTask = currentBuilds.get( key );
                     currentBuildProjectTasks.put( key, buildTask );
                 }
             }
@@ -260,15 +259,15 @@
             try
             {
                 // queued builds
-                Map<String, List<Task>> builds = getContinuum().getBuildsManager().getProjectsInBuildQueues();
+                Map<String, List<BuildProjectTask>> builds =
+                    getContinuum().getBuildsManager().getProjectsInBuildQueues();
                 Set<String> keySet = builds.keySet();
                 for ( String key : keySet )
                 {
                     List<BuildProjectTask> buildTasks = new ArrayList<BuildProjectTask>();
-                    for ( Task task : builds.get( key ) )
+                    for ( BuildProjectTask task : builds.get( key ) )
                     {
-                        BuildProjectTask buildTask = (BuildProjectTask) task;
-                        buildTasks.add( buildTask );
+                        buildTasks.add( task );
                     }
                     buildsInQueue.put( key, buildTasks );
                 }
@@ -282,11 +281,11 @@
             try
             {
                 // current checkouts
-                Map<String, Task> currentCheckouts = getContinuum().getBuildsManager().getCurrentCheckouts();
+                Map<String, CheckOutTask> currentCheckouts = getContinuum().getBuildsManager().getCurrentCheckouts();
                 Set<String> keySet = currentCheckouts.keySet();
                 for ( String key : keySet )
                 {
-                    CheckOutTask checkoutTask = (CheckOutTask) currentCheckouts.get( key );
+                    CheckOutTask checkoutTask = currentCheckouts.get( key );
                     currentCheckoutTasks.put( key, checkoutTask );
                 }
             }
@@ -299,15 +298,15 @@
             try
             {
                 // queued checkouts
-                Map<String, List<Task>> checkouts = getContinuum().getBuildsManager().getProjectsInCheckoutQueues();
+                Map<String, List<CheckOutTask>> checkouts =
+                    getContinuum().getBuildsManager().getProjectsInCheckoutQueues();
                 Set<String> keySet = checkouts.keySet();
                 for ( String key : keySet )
                 {
                     List<CheckOutTask> checkoutTasks = new ArrayList<CheckOutTask>();
-                    for ( Task task : checkouts.get( key ) )
+                    for ( CheckOutTask task : checkouts.get( key ) )
                     {
-                        CheckOutTask checkoutTask = (CheckOutTask) task;
-                        checkoutTasks.add( checkoutTask );
+                        checkoutTasks.add( task );
                     }
                     checkoutsInQueue.put( key, checkoutTasks );
                 }
@@ -496,24 +495,25 @@
     private boolean cancelCheckout( int projectId )
         throws BuildManagerException
     {
-        Map<String, Task> tasks = getContinuum().getBuildsManager().getCurrentCheckouts();
+        Map<String, CheckOutTask> tasks = getContinuum().getBuildsManager().getCurrentCheckouts();
         if ( tasks != null )
         {
             Set<String> keySet = tasks.keySet();
             for ( String key : keySet )
             {
-                Task task = tasks.get( key );
-                if ( task != null && task instanceof CheckOutTask )
+                CheckOutTask task = tasks.get( key );
+                if ( task != null )
                 {
-                    if ( ( (CheckOutTask) task ).getProjectId() == projectId )
+                    if ( task.getProjectId() == projectId )
                     {
                         logger.info( "Cancelling checkout for project " + projectId );
                         return getContinuum().getBuildsManager().cancelCheckout( projectId );
                     }
                     else
                     {
-                        logger.warn( "Current task is not for the given projectId (" + projectId + "): " +
-                            ( (CheckOutTask) task ).getProjectId() + "; not cancelling checkout" );
+                        logger.warn(
+                            "Current task is not for the given projectId (" + projectId + "): " + task.getProjectId() +
+                                "; not cancelling checkout" );
                     }
                 }
             }

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java Mon Apr 20 22:02:13 2009
@@ -19,13 +19,13 @@
  * under the License.
  */
 
+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 org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 
-import java.util.Map;
-
 /**
  * Common base class that consolidates the common properties used by extending
  * <code>XXXEditAction</code> implementations and defines a contract expected of
@@ -327,13 +327,13 @@
      *
      * @param configuration map of configuration key-value pairs.
      */
-    protected abstract void initConfiguration( Map configuration );
+    protected abstract void initConfiguration( Map<String, String> configuration );
 
     /**
      * Sets the configuration for the specified {@link ProjectNotifier}
      * instance.
      *
-     * @param notifier
+     * @param notifier The project notifier.
      * @see #initConfiguration(Map)
      */
     protected abstract void setNotifierConfiguration( ProjectNotifier notifier );

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java Mon Apr 20 22:02:13 2009
@@ -140,7 +140,7 @@
      * Sets the identifier for the Project to be edited for
      * project notifiers.
      *
-     * @param projectId
+     * @param projectId The project id to set.
      */
     public void setProjectId( int projectId )
     {

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,12 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.model.project.ProjectNotifier;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+
 /**
  * Action that edits a {@link ProjectNotifier} of type 'IRC' from the
  * specified {@link ProjectGroup}.
@@ -55,36 +55,36 @@
 
     private boolean ssl = false;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        host = (String) configuration.get( "host" );
+        host = configuration.get( "host" );
 
         if ( configuration.get( "port" ) != null )
         {
-            port = Integer.parseInt( (String) configuration.get( "port" ) );
+            port = Integer.parseInt( configuration.get( "port" ) );
         }
 
-        channel = (String) configuration.get( "channel" );
+        channel = configuration.get( "channel" );
 
-        nick = (String) configuration.get( "nick" );
+        nick = configuration.get( "nick" );
 
-        alternateNick = (String) configuration.get( "alternateNick" );
+        alternateNick = configuration.get( "alternateNick" );
 
-        username = (String) configuration.get( "username" );
+        username = configuration.get( "username" );
 
-        fullName = (String) configuration.get( "fullName" );
+        fullName = configuration.get( "fullName" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
         if ( configuration.get( "ssl" ) != null )
         {
-            ssl = Boolean.parseBoolean( (String) configuration.get( "ssl" ) );
+            ssl = Boolean.parseBoolean( configuration.get( "ssl" ) );
         }
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
-        HashMap configuration = new HashMap();
+        HashMap<String, String> configuration = new HashMap<String, String>();
 
         configuration.put( "host", host );
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import org.apache.maven.continuum.model.project.ProjectNotifier;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -50,36 +50,36 @@
 
     private boolean ssl = false;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        host = (String) configuration.get( "host" );
+        host = configuration.get( "host" );
 
         if ( configuration.get( "port" ) != null )
         {
-            port = Integer.parseInt( (String) configuration.get( "port" ) );
+            port = Integer.parseInt( configuration.get( "port" ) );
         }
 
-        channel = (String) configuration.get( "channel" );
+        channel = configuration.get( "channel" );
 
-        nick = (String) configuration.get( "nick" );
+        nick = configuration.get( "nick" );
 
-        alternateNick = (String) configuration.get( "alternateNick" );
+        alternateNick = configuration.get( "alternateNick" );
 
-        username = (String) configuration.get( "username" );
+        username = configuration.get( "username" );
 
-        fullName = (String) configuration.get( "fullName" );
+        fullName = configuration.get( "fullName" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
         if ( configuration.get( "ssl" ) != null )
         {
-            ssl = Boolean.parseBoolean( (String) configuration.get( "ssl" ) );
+            ssl = Boolean.parseBoolean( configuration.get( "ssl" ) );
         }
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
-        HashMap configuration = new HashMap();
+        HashMap<String, String> configuration = new HashMap<String, String>();
 
         configuration.put( "host", host );
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -54,26 +54,26 @@
 
     private boolean group;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        host = (String) configuration.get( "host" );
+        host = configuration.get( "host" );
 
         if ( configuration.get( "port" ) != null )
         {
-            port = Integer.parseInt( (String) configuration.get( "port" ) );
+            port = Integer.parseInt( configuration.get( "port" ) );
         }
 
-        login = (String) configuration.get( "login" );
+        login = configuration.get( "login" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
-        domainName = (String) configuration.get( "domainName" );
+        domainName = configuration.get( "domainName" );
 
-        address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+        address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
 
-        sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) );
+        sslConnection = Boolean.valueOf( configuration.get( "sslConnection" ) );
 
-        group = Boolean.valueOf( (String) configuration.get( "isGroup" ) );
+        group = Boolean.valueOf( configuration.get( "isGroup" ) );
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -53,26 +53,26 @@
 
     private boolean group;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        host = (String) configuration.get( "host" );
+        host = configuration.get( "host" );
 
         if ( configuration.get( "port" ) != null )
         {
-            port = Integer.parseInt( (String) configuration.get( "port" ) );
+            port = Integer.parseInt( configuration.get( "port" ) );
         }
 
-        login = (String) configuration.get( "login" );
+        login = configuration.get( "login" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
-        domainName = (String) configuration.get( "domainName" );
+        domainName = configuration.get( "domainName" );
 
-        address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+        address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
 
-        sslConnection = Boolean.valueOf( (String) configuration.get( "sslConnection" ) );
+        sslConnection = Boolean.valueOf( configuration.get( "sslConnection" ) );
 
-        group = Boolean.valueOf( (String) configuration.get( "isGroup" ) );
+        group = Boolean.valueOf( configuration.get( "isGroup" ) );
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,14 +19,14 @@
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Action that edits a {@link ProjectNotifier} of type 'Mail' from the
  * specified {@link ProjectGroup}.
@@ -43,17 +43,16 @@
 
     private boolean committers;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
+        if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
         {
-            address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+            address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
         }
 
-        if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
+        if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
         {
-            committers =
-                Boolean.parseBoolean( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
+            committers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
         }
     }
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,14 +19,14 @@
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Action that edits a {@link ProjectNotifier} of type 'Mail' from the
  * specified {@link Project}.
@@ -43,17 +43,16 @@
 
     private boolean committers;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
+        if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
         {
-            address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+            address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
         }
 
-        if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
+        if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
         {
-            committers =
-                Boolean.parseBoolean( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
+            committers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
         }
     }
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,13 +19,13 @@
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Action that edits a {@link ProjectNotifier} of type 'MSN' from the
  * specified {@link ProjectGroup}.
@@ -43,18 +43,18 @@
 
     private String address;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        login = (String) configuration.get( "login" );
+        login = configuration.get( "login" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
-        address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+        address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
-        HashMap configuration = new HashMap();
+        HashMap<String, String> configuration = new HashMap<String, String>();
 
         configuration.put( "login", login );
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,13 +19,13 @@
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Action that edits a {@link ProjectNotifier} of type 'MSN' from the
  * specified {@link Project}.
@@ -44,18 +44,18 @@
 
     private String address;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        login = (String) configuration.get( "login" );
+        login = configuration.get( "login" );
 
-        password = (String) configuration.get( "password" );
+        password = configuration.get( "password" );
 
-        address = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+        address = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
-        HashMap configuration = new HashMap();
+        HashMap<String, String> configuration = new HashMap<String, String>();
 
         configuration.put( "login", login );
 

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,12 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.model.project.ProjectNotifier;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+
 /**
  * Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
  * specified {@link ProjectGroup}.
@@ -40,15 +40,15 @@
 
     private String id;
 
-    protected void initConfiguration( Map configuration )
+    protected void initConfiguration( Map<String, String> configuration )
     {
-        url = (String) configuration.get( "url" );
-        id = (String) configuration.get( "id" );
+        url = configuration.get( "url" );
+        id = configuration.get( "id" );
     }
 
     protected void setNotifierConfiguration( ProjectNotifier notifier )
     {
-        HashMap configuration = new HashMap();
+        HashMap<String, String> configuration = new HashMap<String, String>();
 
         configuration.put( "url", url );
 



Mime
View raw message