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 23:32:16 UTC
svn commit: r767304 - in /continuum/branches/continuum-1.3.x:
continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/
continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/...
Author: evenisse
Date: Tue Apr 21 21:32:15 2009
New Revision: 767304
URL: http://svn.apache.org/viewvc?rev=767304&view=rev
Log:
More java5 code and clean up lot of warnings found by Idea
Modified:
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java Tue Apr 21 21:32:15 2009
@@ -22,6 +22,8 @@
import java.io.File;
import java.util.List;
+import org.apache.continuum.buildagent.model.Installation;
+
public interface BuildAgentConfigurationService
{
String ROLE = BuildAgentConfigurationService.class.getName();
@@ -42,5 +44,5 @@
File getBuildOutputFile( int projectId )
throws BuildAgentConfigurationException;
- List getAvailableInstallations();
+ List<Installation> getAvailableInstallations();
}
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java Tue Apr 21 21:32:15 2009
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import org.apache.continuum.buildagent.model.Installation;
import org.codehaus.plexus.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,7 +120,7 @@
return generalBuildAgentConfiguration.getContinuumServerUrl();
}
- public List getAvailableInstallations()
+ public List<Installation> getAvailableInstallations()
{
return generalBuildAgentConfiguration.getInstallations();
}
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Tue Apr 21 21:32:15 2009
@@ -418,7 +418,7 @@
}
}
- private List getScmChanges( ScmResult scmResult )
+ private List<Map<String, Object>> getScmChanges( ScmResult scmResult )
{
List<Map<String, Object>> scmChanges = new ArrayList<Map<String, Object>>();
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java Tue Apr 21 21:32:15 2009
@@ -382,7 +382,7 @@
return getInteger( context, KEY_BUILD_NUMBER );
}
- public static List getOldScmChanges( Map context )
+ public static List<Map<String, Object>> getOldScmChanges( Map context )
{
return getList( context, KEY_OLD_SCM_CHANGES );
}
Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Tue Apr 21 21:32:15 2009
@@ -276,10 +276,10 @@
}
}
- private List getOldScmChanges( int projectId, int buildDefinitionId )
+ private List<Map<String, Object>> getOldScmChanges( int projectId, int buildDefinitionId )
throws ContinuumStoreException
{
- List scmChanges = new ArrayList();
+ List<Map<String, Object>> scmChanges = new ArrayList<Map<String, Object>>();
BuildResult oldBuildResult =
buildResultDao.getLatestBuildResultForBuildDefinition( projectId, buildDefinitionId );
Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Tue Apr 21 21:32:15 2009
@@ -474,7 +474,7 @@
return getMap( context, KEY_MAVEN_PROJECT );
}
- public static List getProjectModules( Map context )
+ public static List<String> getProjectModules( Map context )
{
return getList( context, KEY_PROJECT_MODULES );
}
Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java Tue Apr 21 21:32:15 2009
@@ -176,7 +176,7 @@
{
try
{
- List installations = installationDao.getAllInstallations();
+ List<Installation> installations = installationDao.getAllInstallations();
return installations == null ? Collections.EMPTY_LIST : installations;
}
catch ( ContinuumStoreException e )
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Tue Apr 21 21:32:15 2009
@@ -1035,9 +1035,9 @@
if ( dependencyProject != null )
{
- List buildResults = buildResultDao.getBuildResultsInSuccessForProject( dependencyProject.getId(),
- oldBuildResult.getEndTime() )
- ;
+ List<BuildResult> buildResults =
+ buildResultDao.getBuildResultsInSuccessForProject( dependencyProject.getId(),
+ oldBuildResult.getEndTime() );
if ( buildResults != null && !buildResults.isEmpty() )
{
log.debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Apr 21 21:32:15 2009
@@ -635,9 +635,9 @@
if ( dependencyProject != null )
{
- List buildResults = buildResultDao.getBuildResultsInSuccessForProject( dependencyProject.getId(),
- context.getOldBuildResult().getEndTime() )
- ;
+ List<BuildResult> buildResults =
+ buildResultDao.getBuildResultsInSuccessForProject( dependencyProject.getId(),
+ context.getOldBuildResult().getEndTime() );
if ( buildResults != null && !buildResults.isEmpty() )
{
log.debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Tue Apr 21 21:32:15 2009
@@ -35,6 +35,7 @@
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectDependency;
import org.apache.maven.continuum.model.scm.ScmResult;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -88,7 +89,7 @@
ScmResult scmResult = getScmResult( context );
- List updatedDependencies = getUpdatedDependencies( context );
+ List<ProjectDependency> updatedDependencies = getUpdatedDependencies( context );
ContinuumBuildExecutor buildExecutor = buildExecutorManager.getBuildExecutor( project.getExecutorId() );
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Tue Apr 21 21:32:15 2009
@@ -147,13 +147,13 @@
assertNotNull( result );
- List projects = result.getProjects();
+ List<Project> projects = result.getProjects();
assertEquals( 1, projects.size() );
assertEquals( Project.class, projects.get( 0 ).getClass() );
- Project project = (Project) projects.get( 0 );
+ Project project = projects.get( 0 );
// reattach
project = continuum.getProject( project.getId() );
@@ -176,13 +176,13 @@
assertNotNull( result );
- List projects = result.getProjects();
+ List<Project> projects = result.getProjects();
assertEquals( 1, projects.size() );
assertEquals( Project.class, projects.get( 0 ).getClass() );
- Project project = (Project) projects.get( 0 );
+ Project project = projects.get( 0 );
// reattach
project = continuum.getProject( project.getId() );
@@ -191,13 +191,13 @@
projectGroup = getProjectGroupDao().getProjectGroupWithBuildDetailsByProjectGroupId( projectGroup.getId() );
- List buildDefs = projectGroup.getBuildDefinitions();
+ List<BuildDefinition> buildDefs = projectGroup.getBuildDefinitions();
assertTrue( "missing project group build definition", !buildDefs.isEmpty() );
assertTrue( "more then one project group build definition on add project", buildDefs.size() == 1 );
- BuildDefinition pgbd = (BuildDefinition) buildDefs.get( 0 );
+ BuildDefinition pgbd = buildDefs.get( 0 );
pgbd.setGoals( "foo" );
@@ -372,13 +372,13 @@
assertNotNull( result );
- List projects = result.getProjects();
+ List<Project> projects = result.getProjects();
assertEquals( 1, projects.size() );
assertEquals( Project.class, projects.get( 0 ).getClass() );
- Project project = (Project) projects.get( 0 );
+ Project project = projects.get( 0 );
parallelBuildsManager.removeProjectFromCheckoutQueue( project.getId() );
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java Tue Apr 21 21:32:15 2009
@@ -19,17 +19,17 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -94,7 +94,7 @@
notifier.setFrom( ProjectNotifier.FROM_USER );
- List notifiers = new ArrayList();
+ List<ProjectNotifier> notifiers = new ArrayList<ProjectNotifier>();
notifiers.add( notifier );
@@ -214,7 +214,7 @@
notifier.setFrom( ProjectNotifier.FROM_USER );
- List notifiers = new ArrayList();
+ List<ProjectNotifier> notifiers = new ArrayList<ProjectNotifier>();
notifiers.add( notifier );
@@ -296,7 +296,7 @@
notifier.setFrom( ProjectNotifier.FROM_USER );
- List notifiers = new ArrayList();
+ List<ProjectNotifier> notifiers = new ArrayList<ProjectNotifier>();
notifiers.add( notifier );
Modified: continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Tue Apr 21 21:32:15 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
@@ -46,11 +50,6 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author Edwin Punzalan
* @version $Id$
@@ -67,7 +66,7 @@
private ProfileManager profileManager;
private PlexusContainer container;
-
+
private LocalRepository repository;
public void execute( ReleaseProjectTask task )
@@ -81,10 +80,10 @@
descriptor.setUseReleaseProfile( performTask.isUseReleaseProfile() );
descriptor.setPerformGoals( performTask.getGoals() );
descriptor.setCheckoutDirectory( performTask.getBuildDirectory().getAbsolutePath() );
-
+
repository = performTask.getLocalRepository();
-
- List reactorProjects = getReactorProjects( performTask );
+
+ List<MavenProject> reactorProjects = getReactorProjects( performTask );
ReleaseResult result = releaseManager.performWithResult( descriptor, settings, reactorProjects, listener );
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Tue Apr 21 21:32:15 2009
@@ -73,7 +73,7 @@
private Map<Integer, String> schedules;
- private List profiles;
+ private List<Profile> profiles;
private boolean groupBuildDefinition = false;
@@ -146,11 +146,11 @@
}
else
{
- List projects = getContinuum().getProjectGroupWithProjects( projectGroupId ).getProjects();
+ List<Project> projects = getContinuum().getProjectGroupWithProjects( projectGroupId ).getProjects();
if ( projects.size() > 0 )
{
- Project project = (Project) projects.get( 0 );
+ Project project = projects.get( 0 );
executor = project.getExecutorId();
}
}
@@ -199,10 +199,10 @@
else
{
checkAddGroupBuildDefinitionAuthorization( getProjectGroupName() );
- List bds = getContinuum().getBuildDefinitionsForProjectGroup( projectGroupId );
+ List<BuildDefinition> bds = getContinuum().getBuildDefinitionsForProjectGroup( projectGroupId );
if ( bds != null && !bds.isEmpty() )
{
- preDefinedBuildFile = ( (BuildDefinition) bds.get( 0 ) ).getBuildFile();
+ preDefinedBuildFile = bds.get( 0 ).getBuildFile();
}
}
@@ -587,12 +587,12 @@
this.schedules = schedules;
}
- public List getProfiles()
+ public List<Profile> getProfiles()
{
return profiles;
}
- public void setProfiles( final List profiles )
+ public void setProfiles( final List<Profile> profiles )
{
this.profiles = profiles;
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Tue Apr 21 21:32:15 2009
@@ -34,6 +34,7 @@
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.ChangeSet;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.continuum.web.util.StateGenerator;
@@ -61,7 +62,7 @@
private int buildId;
- private List changeSet;
+ private List<ChangeSet> changeSet;
private boolean hasSurefireResults;
@@ -203,7 +204,7 @@
return buildResult;
}
- public List getChangesSinceLastSuccess()
+ public List<ChangeSet> getChangesSinceLastSuccess()
{
return changeSet;
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Apr 21 21:32:15 2009
@@ -190,8 +190,7 @@
Project rootProject = ( getContinuum().getProjectsInBuildOrder(
getContinuum().getProjectsInGroupWithDependencies( projectGroupId ) ) ).get( 0 );
- if ( "maven2".equals( rootProject.getExecutorId() ) ||
- "maven-1".equals( rootProject.getExecutorId() ) )
+ if ( "maven2".equals( rootProject.getExecutorId() ) || "maven-1".equals( rootProject.getExecutorId() ) )
{
url = rootProject.getUrl();
}
@@ -889,7 +888,7 @@
return projectList;
}
- public List getProjectGroupUsers()
+ public List<ProjectGroupUserBean> getProjectGroupUsers()
{
return projectGroupUsers;
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=767304&r1=767303&r2=767304&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Apr 21 21:32:15 2009
@@ -221,7 +221,7 @@
this.projectGroupName = projectGroupName;
}
- public List getProjectBuildDefinitionSummaries()
+ public List<BuildDefinitionSummary> getProjectBuildDefinitionSummaries()
{
return projectBuildDefinitionSummaries;
}