You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2009/04/21 00:02:14 UTC
svn commit: r766895 [2/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...
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.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/WagonProjectNotifierEditAction.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/WagonProjectNotifierEditAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java Mon Apr 20 22:02:13 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectNotifier;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
* specified {@link Project}.
@@ -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 );
Modified: continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=766895&r1=766894&r2=766895&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Mon Apr 20 22:02:13 2009
@@ -66,7 +66,6 @@
import org.codehaus.plexus.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
-import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.util.StringUtils;
import net.sf.dozer.util.mapping.DozerBeanMapperSingletonWrapper;
@@ -1029,17 +1028,18 @@
{
try
{
- Map<String, List<Task>> buildTasks = parallelBuildsManager.getProjectsInBuildQueues();
+ Map<String, List<org.apache.continuum.taskqueue.BuildProjectTask>> buildTasks =
+ parallelBuildsManager.getProjectsInBuildQueues();
Set<String> keys = buildTasks.keySet();
List<org.apache.continuum.taskqueue.BuildProjectTask> convertedTasks =
new ArrayList<org.apache.continuum.taskqueue.BuildProjectTask>();
for ( String key : keys )
{
- List<Task> tasks = buildTasks.get( key );
- for ( Task task : tasks )
+ List<org.apache.continuum.taskqueue.BuildProjectTask> tasks = buildTasks.get( key );
+ for ( org.apache.continuum.taskqueue.BuildProjectTask task : tasks )
{
- convertedTasks.add( (org.apache.continuum.taskqueue.BuildProjectTask) task );
+ convertedTasks.add( task );
}
}