You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [25/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/a...
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java Mon Aug 13 04:29:09 2012
@@ -21,8 +21,6 @@ package org.apache.maven.continuum.web.a
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.interceptor.SessionAware;
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.Logger;
import java.util.Map;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
import org.apache.commons.collections.ComparatorUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
@@ -62,6 +51,16 @@ import org.codehaus.plexus.redback.users
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* ProjectGroupAction:
*
@@ -151,10 +150,10 @@ public class ProjectGroupAction
throws Exception
{
super.prepare();
-
+
repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
}
-
+
public String summary()
throws ContinuumException
{
@@ -176,8 +175,8 @@ public class ProjectGroupAction
projectGroup = getContinuum().getProjectGroupWithProjects( projectGroupId );
- List<BuildDefinition> projectGroupBuildDefs =
- getContinuum().getBuildDefinitionsForProjectGroup( projectGroupId );
+ List<BuildDefinition> projectGroupBuildDefs = getContinuum().getBuildDefinitionsForProjectGroup(
+ projectGroupId );
if ( projectGroupBuildDefs != null )
{
@@ -187,7 +186,8 @@ public class ProjectGroupAction
if ( !buildDefinition.isDefaultForProject() )
{
- String key = StringUtils.isEmpty( buildDefinition.getDescription() ) ? buildDefinition.getGoals()
+ String key = StringUtils.isEmpty( buildDefinition.getDescription() )
+ ? buildDefinition.getGoals()
: buildDefinition.getDescription();
buildDefinitions.put( key, buildDefinition.getId() );
}
@@ -199,7 +199,7 @@ public class ProjectGroupAction
}
if ( projectGroup != null )
- {
+ {
if ( projectGroup.getProjects() != null && projectGroup.getProjects().size() > 0 )
{
int nbMaven2Projects = 0;
@@ -318,8 +318,8 @@ public class ProjectGroupAction
catch ( ContinuumException e )
{
logger.error( "Error while removing project group with id " + projectGroupId, e );
- addActionError( getText( "projectGroup.delete.error", "Unable to remove project group",
- Integer.toString( projectGroupId ) ) );
+ addActionError( getText( "projectGroup.delete.error", "Unable to remove project group", Integer.toString(
+ projectGroupId ) ) );
}
AuditLog event = new AuditLog( "Project Group id=" + projectGroupId, AuditLogConstants.REMOVE_PROJECT_GROUP );
@@ -565,18 +565,18 @@ public class ProjectGroupAction
addActionError( authzE.getMessage() );
return REQUIRES_AUTHORIZATION;
}
-
+
BuildTrigger buildTrigger = new BuildTrigger( ContinuumProjectState.TRIGGER_FORCED, getPrincipal() );
try
{
if ( this.getBuildDefinitionId() == -1 )
{
- getContinuum().buildProjectGroup( projectGroupId, buildTrigger );
+ getContinuum().buildProjectGroup( projectGroupId, buildTrigger );
}
else
{
- getContinuum().buildProjectGroupWithBuildDefinition( projectGroupId, buildDefinitionId, buildTrigger );
+ getContinuum().buildProjectGroupWithBuildDefinition( projectGroupId, buildDefinitionId, buildTrigger );
}
}
catch ( NoBuildAgentException e )
@@ -648,7 +648,7 @@ public class ProjectGroupAction
else
{
logger.info( "Attempt to release group '" + projectGroup.getName() + "' failed as project '" +
- p.getName() + "' and project '" + parent.getName() + "' are both parents" );
+ p.getName() + "' and project '" + parent.getName() + "' are both parents" );
// currently, we have no provisions for releasing 2 or more parents
// at the same time, this will be implemented in the future
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.Date;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
@@ -29,6 +27,8 @@ import org.apache.maven.continuum.web.ex
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Date;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.continuum.buildagent.NoBuildAgentException;
import org.apache.continuum.buildagent.NoBuildAgentInGroupException;
import org.apache.continuum.web.util.AuditLog;
@@ -30,13 +27,13 @@ import org.apache.maven.continuum.Contin
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.apache.continuum.web.util.AuditLog;
-import org.apache.continuum.web.util.AuditLogConstants;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -113,8 +110,8 @@ public class ProjectsListAction
catch ( ContinuumException e )
{
logger.error( "Error removing Project with id=" + projectId );
- addActionError( getText( "deleteProject.error", "Unable to delete project",
- new Integer( projectId ).toString() ) );
+ addActionError( getText( "deleteProject.error", "Unable to delete project", new Integer(
+ projectId ).toString() ) );
}
}
}
@@ -170,8 +167,8 @@ public class ProjectsListAction
{
if ( this.getBuildDefinitionId() <= 0 )
{
- List<BuildDefinition> groupDefaultBDs =
- getContinuum().getDefaultBuildDefinitionsForProjectGroup( projectGroupId );
+ List<BuildDefinition> groupDefaultBDs = getContinuum().getDefaultBuildDefinitionsForProjectGroup(
+ projectGroupId );
getContinuum().buildProjectsWithBuildDefinition( sortedProjects, groupDefaultBDs );
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.continuum.configuration.BuildAgentConfigurationException;
import org.apache.continuum.release.distributed.manager.DistributedReleaseManager;
import org.apache.maven.continuum.ContinuumException;
@@ -30,11 +27,13 @@ import org.apache.maven.continuum.releas
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.codehaus.plexus.util.StringUtils;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Edwin Punzalan
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseCleanup"
- *
*/
public class ReleaseCleanupAction
extends ContinuumActionSupport
@@ -64,7 +63,7 @@ public class ReleaseCleanupAction
try
{
String goal = releaseManager.releaseCleanup( releaseId );
-
+
if ( StringUtils.isNotBlank( goal ) )
{
return goal;
@@ -86,16 +85,16 @@ public class ReleaseCleanupAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
releaseManager.getReleaseResults().remove( releaseId );
-
+
ContinuumReleaseManagerListener listener =
(ContinuumReleaseManagerListener) releaseManager.getListeners().remove( releaseId );
-
+
if ( listener != null )
{
String goal = listener.getGoalName();
-
+
return goal + "Finished";
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.configuration.BuildAgentConfigurationException;
import org.apache.continuum.model.release.ReleaseListenerSummary;
import org.apache.continuum.release.distributed.DistributedReleaseUtil;
@@ -33,6 +29,10 @@ import org.apache.maven.continuum.releas
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.shared.release.ReleaseResult;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Edwin Punzalan
* @version $Id$
@@ -54,7 +54,7 @@ public class ReleaseInProgressAction
private String projectGroupName = "";
private ReleaseListenerSummary listenerSummary;
-
+
private String username = "";
public String execute()
@@ -77,7 +77,7 @@ public class ReleaseInProgressAction
{
DistributedReleaseManager releaseManager = getContinuum().getDistributedReleaseManager();
- Map map;
+ Map map;
try
{
@@ -95,7 +95,7 @@ public class ReleaseInProgressAction
if ( map != null && !map.isEmpty() )
{
int state = DistributedReleaseUtil.getReleaseState( map );
-
+
username = DistributedReleaseUtil.getUsername( map );
if ( state == ContinuumReleaseManagerListener.LISTENING )
@@ -110,7 +110,7 @@ public class ReleaseInProgressAction
{
status = "initialized";
}
-
+
if ( status.equals( SUCCESS ) )
{
getContinuum().addContinuumReleaseResult( projectId, releaseId, releaseGoal );
@@ -129,13 +129,13 @@ public class ReleaseInProgressAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
listenerSummary = releaseManager.getListener( releaseId );
if ( listenerSummary != null )
{
- username = listenerSummary.getUsername();
-
+ username = listenerSummary.getUsername();
+
if ( listenerSummary.getState() == ContinuumReleaseManagerListener.LISTENING )
{
status = "inProgress";
@@ -184,22 +184,22 @@ public class ReleaseInProgressAction
try
{
Map map = releaseManager.getListener( releaseId );
-
+
if ( map != null && !map.isEmpty() )
{
int state = DistributedReleaseUtil.getReleaseState( map );
-
+
listenerSummary.setPhases( DistributedReleaseUtil.getReleasePhases( map ) );
listenerSummary.setCompletedPhases( DistributedReleaseUtil.getCompletedReleasePhases( map ) );
listenerSummary.setInProgress( DistributedReleaseUtil.getReleaseInProgress( map ) );
listenerSummary.setError( DistributedReleaseUtil.getReleaseError( map ) );
-
+
username = DistributedReleaseUtil.getUsername( map );
-
+
if ( state == ContinuumReleaseManagerListener.FINISHED )
{
result = releaseManager.getReleaseResult( releaseId );
-
+
return SUCCESS;
}
else
@@ -216,7 +216,7 @@ public class ReleaseInProgressAction
{
List<Object> args = new ArrayList<Object>();
args.add( e.getMessage() );
-
+
addActionError( getText( "releaseViewResult.error", args ) );
return ERROR;
}
@@ -224,17 +224,17 @@ public class ReleaseInProgressAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
listenerSummary = releaseManager.getListener( releaseId );
-
+
if ( listenerSummary != null )
- {
+ {
username = listenerSummary.getUsername();
if ( listenerSummary.getState() == ContinuumReleaseManagerListener.FINISHED )
{
result = (ReleaseResult) releaseManager.getReleaseResults().get( releaseId );
-
+
return SUCCESS;
}
else
@@ -325,7 +325,7 @@ public class ReleaseInProgressAction
{
return getProjectGroupName();
}
-
+
public String getUsername()
{
return this.username;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Mon Aug 13 04:29:09 2012
@@ -35,14 +35,9 @@ import org.apache.maven.continuum.releas
import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.shared.release.ReleaseResult;
-import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
import java.util.ArrayList;
@@ -100,9 +95,9 @@ public class ReleasePerformAction
else
{
Project project = getContinuum().getProject( projectId );
-
+
String workingDirectory = getContinuum().getWorkingDirectory( project.getId() ).getPath();
-
+
getReleasePluginParameters( workingDirectory, "pom.xml" );
}
}
@@ -128,7 +123,7 @@ public class ReleasePerformAction
List<Object> args = new ArrayList<Object>();
args.add( e.getMessage() );
- addActionError( getText( "distributedBuild.releasePerform.input.error", args ) ) ;
+ addActionError( getText( "distributedBuild.releasePerform.input.error", args ) );
return ERROR;
}
@@ -162,17 +157,16 @@ public class ReleasePerformAction
List<Object> args = new ArrayList<Object>();
args.add( e.getMessage() );
- addActionError( getText( "distributedBuild.releasePerform.input.error", args ) ) ;
+ addActionError( getText( "distributedBuild.releasePerform.input.error", args ) );
return ERROR;
}
-
return SUCCESS;
}
/**
* FIXME olamy is it really the good place to do that ? should be moved to continuum-release
- * TODO handle remoteTagging
+ * TODO handle remoteTagging
*/
private void getReleasePluginParameters( String workingDirectory, String pomFilename )
throws Exception
@@ -210,7 +204,7 @@ public class ReleasePerformAction
Project project = getContinuum().getProject( projectId );
LocalRepository repository = project.getProjectGroup().getLocalRepository();
-
+
String username = getPrincipal();
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
@@ -219,7 +213,8 @@ public class ReleasePerformAction
try
{
- releaseManager.releasePerform( projectId, releaseId, goals, arguments, useReleaseProfile, repository, username );
+ releaseManager.releasePerform( projectId, releaseId, goals, arguments, useReleaseProfile, repository,
+ username );
}
catch ( BuildAgentConfigurationException e )
{
@@ -233,9 +228,9 @@ public class ReleasePerformAction
else
{
listener = new DefaultReleaseManagerListener();
-
+
listener.setUsername( username );
-
+
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
//todo should be configurable
@@ -266,7 +261,7 @@ public class ReleasePerformAction
DistributedReleaseManager releaseManager = getContinuum().getDistributedReleaseManager();
Map<String, String> environments = new HashMap<String, String>();
-
+
if ( profileId != -1 )
{
Profile profile = getContinuum().getProfileService().getProfile( profileId );
@@ -275,8 +270,9 @@ public class ReleasePerformAction
try
{
- releaseId = releaseManager.releasePerformFromScm( projectId, goals, arguments, useReleaseProfile, repository, scmUrl,
- scmUsername, scmPassword, scmTag, scmTagBase, environments, getPrincipal() );
+ releaseId = releaseManager.releasePerformFromScm( projectId, goals, arguments, useReleaseProfile,
+ repository, scmUrl, scmUsername, scmPassword, scmTag,
+ scmTagBase, environments, getPrincipal() );
}
catch ( BuildAgentConfigurationException e )
{
@@ -292,28 +288,28 @@ public class ReleasePerformAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor();
descriptor.setScmSourceUrl( scmUrl );
descriptor.setScmUsername( scmUsername );
descriptor.setScmPassword( scmPassword );
descriptor.setScmReleaseLabel( scmTag );
descriptor.setScmTagBase( scmTagBase );
-
+
if ( profileId != -1 )
{
Profile profile = getContinuum().getProfileService().getProfile( profileId );
descriptor.setEnvironments( getEnvironments( profile, null ) );
}
-
+
do
{
releaseId = String.valueOf( System.currentTimeMillis() );
}
while ( releaseManager.getPreparedReleases().containsKey( releaseId ) );
-
+
releaseManager.getPreparedReleases().put( releaseId, descriptor );
-
+
return execute();
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Mon Aug 13 04:29:09 2012
@@ -35,21 +35,13 @@ import org.apache.maven.continuum.releas
import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.versions.DefaultVersionInfo;
-import org.apache.maven.shared.release.versions.VersionInfo;
-import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -170,7 +162,8 @@ public class ReleasePrepareAction
try
{
- getReleasePluginParameters( distributedReleaseManager.getReleasePluginParameters( projectId, "pom.xml" ) );
+ getReleasePluginParameters( distributedReleaseManager.getReleasePluginParameters( projectId,
+ "pom.xml" ) );
projects = distributedReleaseManager.processProject( projectId, "pom.xml", autoVersionSubmodules );
}
@@ -188,13 +181,13 @@ public class ReleasePrepareAction
try
{
String workingDirectory = getContinuum().getWorkingDirectory( project.getId() ).getPath();
-
+
getReleasePluginParameters( workingDirectory, "pom.xml" );
-
+
ReleaseUtil.processProject( workingDirectory, "pom.xml", autoVersionSubmodules, projects );
}
catch ( Exception e )
- {
+ {
List<Object> args = new ArrayList<Object>();
args.add( e.getMessage() );
@@ -263,7 +256,7 @@ public class ReleasePrepareAction
}
Project project = getContinuum().getProject( projectId );
-
+
name = project.getName();
if ( name == null )
{
@@ -276,7 +269,7 @@ public class ReleasePrepareAction
{
profile = getContinuum().getProfileService().getProfile( profileId );
}
-
+
String username = getPrincipal();
Map<String, String> environments = new HashMap<String, String>();
@@ -284,12 +277,13 @@ public class ReleasePrepareAction
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
{
DistributedReleaseManager distributedReleaseManager = getContinuum().getDistributedReleaseManager();
-
+
environments = getEnvironments( profile, distributedReleaseManager.getDefaultBuildagent( projectId ) );
try
{
- releaseId = distributedReleaseManager.releasePrepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(),
+ releaseId = distributedReleaseManager.releasePrepare( project, getReleaseProperties(),
+ getRelVersionMap(), getDevVersionMap(),
environments, username );
if ( releaseId == null )
@@ -310,32 +304,32 @@ public class ReleasePrepareAction
else
{
environments = getEnvironments( profile, null );
-
+
listener = new DefaultReleaseManagerListener();
-
+
listener.setUsername( username );
String workingDirectory = getContinuum().getWorkingDirectory( projectId ).getPath();
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
- String executable = getContinuum().getInstallationService()
- .getExecutorConfigurator( InstallationService.MAVEN2_TYPE ).getExecutable();
+ String executable = getContinuum().getInstallationService().getExecutorConfigurator(
+ InstallationService.MAVEN2_TYPE ).getExecutable();
if ( environments != null )
{
- String m2Home = environments.get( getContinuum().getInstallationService().getEnvVar( InstallationService.MAVEN2_TYPE ) );
+ String m2Home = environments.get( getContinuum().getInstallationService().getEnvVar(
+ InstallationService.MAVEN2_TYPE ) );
if ( StringUtils.isNotEmpty( m2Home ) )
{
executable = m2Home + File.separator + "bin" + File.separator + executable;
}
}
- releaseId =
- releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(), listener,
- workingDirectory, environments, executable );
+ releaseId = releaseManager.prepare( project, getReleaseProperties(), getRelVersionMap(), getDevVersionMap(),
+ listener, workingDirectory, environments, executable );
}
-
+
AuditLog event = new AuditLog( "Release id=" + releaseId, AuditLogConstants.PREPARE_RELEASE );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( username );
@@ -400,14 +394,14 @@ public class ReleasePrepareAction
Map listenerMap;
try
{
- listenerMap = distributedReleaseManager.getListener( releaseId );
+ listenerMap = distributedReleaseManager.getListener( releaseId );
}
catch ( BuildAgentConfigurationException e )
{
addActionError( "Failed to retrieve listener for release: " + releaseId );
return "";
}
-
+
if ( listenerMap != null && !listenerMap.isEmpty() )
{
int state = DistributedReleaseUtil.getReleaseState( listenerMap );
@@ -415,9 +409,9 @@ public class ReleasePrepareAction
if ( state == ContinuumReleaseManagerListener.FINISHED )
{
distributedReleaseManager.removeListener( releaseId );
-
+
result = distributedReleaseManager.getReleaseResult( releaseId );
-
+
status = "finished";
}
else
@@ -438,17 +432,17 @@ public class ReleasePrepareAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
listenerSummary = releaseManager.getListener( releaseId );
-
+
if ( listenerSummary != null )
{
if ( listenerSummary.getState() == ContinuumReleaseManagerListener.FINISHED )
{
releaseManager.getListeners().remove( releaseId );
-
+
result = (ReleaseResult) releaseManager.getReleaseResults().get( releaseId );
-
+
status = "finished";
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,7 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import org.apache.continuum.configuration.BuildAgentConfigurationException;
import org.apache.continuum.release.distributed.manager.DistributedReleaseManager;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.continuum.ContinuumException;
@@ -29,7 +28,6 @@ import org.apache.maven.continuum.web.ex
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -78,7 +76,7 @@ public class ReleaseProjectAction
{
return REQUIRES_CONFIGURATION;
}
-
+
project = getContinuum().getProjectWithAllDetails( projectId );
String releaseId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
@@ -101,14 +99,14 @@ public class ReleaseProjectAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
Map preparedReleases = releaseManager.getPreparedReleases();
if ( preparedReleases.containsKey( releaseId ) )
{
ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId );
-
+
preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
-
+
preparedReleaseId = releaseId;
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java Mon Aug 13 04:29:09 2012
@@ -84,14 +84,14 @@ public class ReleaseProjectGoalAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
Map preparedReleases = releaseManager.getPreparedReleases();
if ( preparedReleases.containsKey( releaseId ) )
{
ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId );
-
+
preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
-
+
preparedReleaseId = releaseId;
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java Mon Aug 13 04:29:09 2012
@@ -19,19 +19,15 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.continuum.configuration.BuildAgentConfigurationException;
import org.apache.continuum.release.distributed.manager.DistributedReleaseManager;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.utils.WorkingDirectoryService;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.release.ContinuumReleaseManager;
import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
+import org.apache.maven.continuum.utils.WorkingDirectoryService;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.codehaus.plexus.util.StringUtils;
@@ -85,15 +81,16 @@ public class ReleaseRollbackAction
else
{
ContinuumReleaseManager releaseManager = getContinuum().getReleaseManager();
-
+
ContinuumReleaseManagerListener listener = new DefaultReleaseManagerListener();
-
+
listener.setUsername( getPrincipal() );
-
+
Project project = getContinuum().getProject( projectId );
-
- releaseManager.rollback( releaseId, workingDirectoryService.getWorkingDirectory( project ).getPath(), listener );
-
+
+ releaseManager.rollback( releaseId, workingDirectoryService.getWorkingDirectory( project ).getPath(),
+ listener );
+
//recurse until rollback is finished
while ( listener.getState() != ContinuumReleaseManagerListener.FINISHED )
{
@@ -106,12 +103,12 @@ public class ReleaseRollbackAction
//do nothing
}
}
-
+
AuditLog event = new AuditLog( "Release id=" + releaseId, AuditLogConstants.ROLLBACK_RELEASE );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
event.log();
-
+
releaseManager.getPreparedReleases().remove( releaseId );
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Mon Aug 13 04:29:09 2012
@@ -20,12 +20,6 @@ package org.apache.maven.continuum.web.a
*/
import com.opensymphony.xwork2.Preparable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.continuum.web.util.AuditLog;
@@ -38,6 +32,10 @@ import org.apache.maven.continuum.web.ex
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* @author Nik Gonzalez
* @version $Id$
@@ -84,7 +82,7 @@ public class ScheduleAction
private List<BuildQueue> availableBuildQueues;
private List<BuildQueue> selectedBuildQueues = new ArrayList<BuildQueue>();
-
+
private List<String> selectedBuildQueuesIds = new ArrayList<String>();
public void prepare()
@@ -219,8 +217,8 @@ public class ScheduleAction
logger.error( "Can't create schedule. No schedule name was supplied." );
addActionError( getText( "buildDefinition.noname.save.error.message" ) );
}
- if ( !getContinuum().getConfiguration().isDistributedBuildEnabled()
- && ( selectedBuildQueuesIds == null || selectedBuildQueuesIds.isEmpty() ) )
+ if ( !getContinuum().getConfiguration().isDistributedBuildEnabled() &&
+ ( selectedBuildQueuesIds == null || selectedBuildQueuesIds.isEmpty() ) )
{
addActionError( getText( "schedule.buildqueues.empty.error" ) );
}
@@ -242,11 +240,11 @@ public class ScheduleAction
{
logger.debug( "Unexpected error getting schedule" );
}
-
+
AuditLog event = new AuditLog( getName(), AuditLogConstants.ADD_SCHEDULE );
event.setCategory( AuditLogConstants.SCHEDULE );
event.setCurrentUser( getPrincipal() );
-
+
if ( id == 0 )
{
try
@@ -286,13 +284,15 @@ public class ScheduleAction
schedule.setDelay( delay );
schedule.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( description ) ) );
schedule.setName( name );
- schedule.setMaxJobExecutionTime(maxJobExecutionTime);
- if (!getContinuum().getConfiguration().isDistributedBuildEnabled()) {
+ schedule.setMaxJobExecutionTime( maxJobExecutionTime );
+ if ( !getContinuum().getConfiguration().isDistributedBuildEnabled() )
+ {
// if distributed build don't update schedules
- schedule.setBuildQueues(null);
- for (String id : selectedBuildQueuesIds) {
- BuildQueue buildQueue = getContinuum().getBuildQueue(Integer.parseInt(id));
- schedule.addBuildQueue(buildQueue);
+ schedule.setBuildQueues( null );
+ for ( String id : selectedBuildQueuesIds )
+ {
+ BuildQueue buildQueue = getContinuum().getBuildQueue( Integer.parseInt( id ) );
+ schedule.addBuildQueue( buildQueue );
}
}
@@ -339,7 +339,7 @@ public class ScheduleAction
addActionError( e.getMessage() );
return REQUIRES_AUTHENTICATION;
}
-
+
if ( confirmed )
{
try
@@ -360,7 +360,7 @@ public class ScheduleAction
return CONFIRM;
}
-
+
AuditLog event = new AuditLog( name, AuditLogConstants.REMOVE_SCHEDULE );
event.setCategory( AuditLogConstants.SCHEDULE );
event.setCurrentUser( getPrincipal() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.maven.continuum.ContinuumException;
@@ -39,6 +32,13 @@ import org.apache.maven.continuum.web.mo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
/**
* Used to render the list of projects in the project group page.
*
@@ -113,7 +113,8 @@ public class SummaryAction
try
{
- if ( parallelBuildsManager.isInAnyBuildQueue( project.getId() ) || parallelBuildsManager.isInPrepareBuildQueue( project.getId() ) )
+ if ( parallelBuildsManager.isInAnyBuildQueue( project.getId() ) ||
+ parallelBuildsManager.isInPrepareBuildQueue( project.getId() ) )
{
model.setInBuildingQueue( true );
}
@@ -160,8 +161,7 @@ public class SummaryAction
ConfigurationService configuration = getContinuum().getConfiguration();
- if ( configuration.isDistributedBuildEnabled() &&
- project.getState() == ContinuumProjectState.BUILDING )
+ if ( configuration.isDistributedBuildEnabled() && project.getState() == ContinuumProjectState.BUILDING )
{
model.setLatestBuildId( 0 );
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.model.project.Project;
@@ -34,6 +28,12 @@ import org.apache.maven.continuum.report
import org.apache.maven.continuum.reports.surefire.ReportTestSuiteGeneratorException;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Edwin Punzalan
* @version $Id$
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,15 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
+import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.util.UrlHelper;
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -27,18 +36,8 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.activation.MimetypesFileTypeMap;
-import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.util.UrlHelper;
-import org.codehaus.plexus.util.StringUtils;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -115,20 +114,20 @@ public class WorkingCopyAction
String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(),
ServletActionContext.getResponse(), params );
- String imagesBaseUrl =
- UrlHelper.buildUrl( "/images/", ServletActionContext.getRequest(), ServletActionContext.getResponse(),
- params );
+ String imagesBaseUrl = UrlHelper.buildUrl( "/images/", ServletActionContext.getRequest(),
+ ServletActionContext.getResponse(), params );
imagesBaseUrl = imagesBaseUrl.substring( 0, imagesBaseUrl.indexOf( "/images/" ) + "/images/".length() );
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
{
- output =
- distributedBuildManager.generateWorkingCopyContent( projectId, userDirectory, baseUrl, imagesBaseUrl );
+ output = distributedBuildManager.generateWorkingCopyContent( projectId, userDirectory, baseUrl,
+ imagesBaseUrl );
if ( currentFile != null && !currentFile.equals( "" ) )
{
- Map<String, Object> projectFile = distributedBuildManager.getFileContent( projectId, userDirectory, currentFile );
+ Map<String, Object> projectFile = distributedBuildManager.getFileContent( projectId, userDirectory,
+ currentFile );
if ( projectFile == null )
{
@@ -136,13 +135,13 @@ public class WorkingCopyAction
}
else
{
- downloadFileInputStream = new ByteArrayInputStream( (byte[]) projectFile.get( "downloadFile" ) );
+ downloadFileInputStream = new ByteArrayInputStream( (byte[]) projectFile.get( "downloadFile" ) );
downloadFileLength = (String) projectFile.get( "downloadFileLength" );
downloadFileName = (String) projectFile.get( "downloadFileName" );
currentFileContent = (String) projectFile.get( "fileContent" );
mimeType = (String) projectFile.get( "mimeType" );
- if ( (Boolean) projectFile.get( "isStream" ) )
+ if ( (Boolean) projectFile.get( "isStream" ) )
{
return "stream";
}
@@ -157,8 +156,8 @@ public class WorkingCopyAction
{
List<File> files = getContinuum().getFiles( projectId, userDirectory );
- output =
- generator.generate( files, baseUrl, imagesBaseUrl, getContinuum().getWorkingDirectory( projectId ) );
+ output = generator.generate( files, baseUrl, imagesBaseUrl, getContinuum().getWorkingDirectory(
+ projectId ) );
if ( currentFile != null && !currentFile.equals( "" ) )
{
@@ -265,7 +264,7 @@ public class WorkingCopyAction
{
throw new ContinuumException( "Error accessing file.", fne );
}
-
+
return fis;
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Mon Aug 13 04:29:09 2012
@@ -20,15 +20,6 @@ package org.apache.maven.continuum.web.a
*/
import com.opensymphony.xwork2.Preparable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
@@ -48,6 +39,14 @@ import org.codehaus.redback.integration.
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
@@ -150,28 +149,29 @@ public class BuildDefinitionTemplateActi
throws Exception
{
List<BuildDefinition> selectedBuildDefinitions = getBuildDefinitionsFromSelectedBuildDefinitions();
-
+
BuildDefinitionTemplate result;
-
+
AuditLog event = new AuditLog( buildDefinitionTemplate.getName(), AuditLogConstants.ADD_TEMPLATE );
event.setCategory( AuditLogConstants.TEMPLATE );
event.setCurrentUser( getPrincipal() );
-
+
if ( this.buildDefinitionTemplate.getId() > 0 )
{
buildDefinitionTemplate.setBuildDefinitions( selectedBuildDefinitions );
- result = this.getContinuum().getBuildDefinitionService().updateBuildDefinitionTemplate( buildDefinitionTemplate );
+ result = this.getContinuum().getBuildDefinitionService().updateBuildDefinitionTemplate(
+ buildDefinitionTemplate );
event.setAction( AuditLogConstants.MODIFY_TEMPLATE );
}
else
{
buildDefinitionTemplate.setBuildDefinitions( selectedBuildDefinitions );
- this.buildDefinitionTemplate =
- this.getContinuum().getBuildDefinitionService().addBuildDefinitionTemplate( buildDefinitionTemplate );
+ this.buildDefinitionTemplate = this.getContinuum().getBuildDefinitionService().addBuildDefinitionTemplate(
+ buildDefinitionTemplate );
result = this.buildDefinitionTemplate;
}
-
- if ( result == null )
+
+ if ( result == null )
{
addActionError( getText( "buildDefintionTemplate.name.exists" ) );
return INPUT;
@@ -191,12 +191,12 @@ public class BuildDefinitionTemplateActi
{
buildDefinitionTemplate = getContinuum().getBuildDefinitionService().getBuildDefinitionTemplate(
this.buildDefinitionTemplate.getId() );
-
+
AuditLog event = new AuditLog( buildDefinitionTemplate.getName(), AuditLogConstants.REMOVE_TEMPLATE );
event.setCategory( AuditLogConstants.TEMPLATE );
event.setCurrentUser( getPrincipal() );
event.log();
-
+
this.getContinuum().getBuildDefinitionService().removeBuildDefinitionTemplate( buildDefinitionTemplate );
}
else
@@ -216,8 +216,8 @@ public class BuildDefinitionTemplateActi
List<BuildDefinition> selectedBuildDefinitions = new ArrayList<BuildDefinition>();
for ( String selectedBuildDefinitionId : selectedBuildDefinitionIds )
{
- BuildDefinition buildDefinition =
- getContinuum().getBuildDefinition( Integer.parseInt( selectedBuildDefinitionId ) );
+ BuildDefinition buildDefinition = getContinuum().getBuildDefinition( Integer.parseInt(
+ selectedBuildDefinitionId ) );
selectedBuildDefinitions.add( buildDefinition );
}
return selectedBuildDefinitions;
@@ -235,8 +235,8 @@ public class BuildDefinitionTemplateActi
public String editBuildDefinition()
throws Exception
{
- this.buildDefinition =
- getContinuum().getBuildDefinitionService().getBuildDefinition( this.buildDefinition.getId() );
+ this.buildDefinition = getContinuum().getBuildDefinitionService().getBuildDefinition(
+ this.buildDefinition.getId() );
return SUCCESS;
}
@@ -246,7 +246,8 @@ public class BuildDefinitionTemplateActi
Schedule schedule = null;
// need to escape xml to prevent xss attacks
- buildDefinition.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( buildDefinition.getDescription() ) ) );
+ buildDefinition.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml(
+ buildDefinition.getDescription() ) ) );
if ( buildDefinition.getProfile() != null )
{
@@ -275,10 +276,10 @@ public class BuildDefinitionTemplateActi
}
else
{
- this.buildDefinition =
- this.getContinuum().getBuildDefinitionService().addBuildDefinition( buildDefinition );
+ this.buildDefinition = this.getContinuum().getBuildDefinitionService().addBuildDefinition(
+ buildDefinition );
}
-
+
if ( schedule != null )
{
getContinuum().activeBuildDefinitionSchedule( schedule );
@@ -292,8 +293,8 @@ public class BuildDefinitionTemplateActi
{
if ( confirmed )
{
- buildDefinition =
- getContinuum().getBuildDefinitionService().getBuildDefinition( this.buildDefinition.getId() );
+ buildDefinition = getContinuum().getBuildDefinitionService().getBuildDefinition(
+ this.buildDefinition.getId() );
this.getContinuum().getBuildDefinitionService().removeBuildDefinition( buildDefinition );
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildQueueAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildQueueAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildQueueAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildQueueAction.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,7 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.List;
-
+import com.opensymphony.xwork2.Preparable;
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
@@ -33,7 +32,7 @@ import org.codehaus.redback.integration.
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
-import com.opensymphony.xwork2.Preparable;
+import java.util.List;
/**
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildQueueAction"
@@ -49,9 +48,9 @@ public class BuildQueueAction
private List<BuildQueue> buildQueueList;
private BuildQueue buildQueue;
-
+
private String message;
-
+
private boolean confirmed;
public void prepare()
@@ -98,10 +97,11 @@ public class BuildQueueAction
BuildQueue buildQueue = new BuildQueue();
buildQueue.setName( name );
BuildQueue addedBuildQueue = getContinuum().addBuildQueue( buildQueue );
-
+
getContinuum().getBuildsManager().addOverallBuildQueue( addedBuildQueue );
- AuditLog event = new AuditLog( "Build Queue id=" + addedBuildQueue.getId(), AuditLogConstants.ADD_BUILD_QUEUE );
+ AuditLog event = new AuditLog( "Build Queue id=" + addedBuildQueue.getId(),
+ AuditLogConstants.ADD_BUILD_QUEUE );
event.setCategory( AuditLogConstants.BUILD_QUEUE );
event.setCurrentUser( getPrincipal() );
event.log();
@@ -144,7 +144,7 @@ public class BuildQueueAction
public String delete()
throws Exception
- {
+ {
if ( confirmed )
{
BuildQueue buildQueueToBeDeleted = getContinuum().getBuildQueue( this.buildQueue.getId() );
@@ -153,7 +153,8 @@ public class BuildQueueAction
this.buildQueueList = getContinuum().getAllBuildQueues();
- AuditLog event = new AuditLog( "Build Queue id=" + buildQueue.getId(), AuditLogConstants.REMOVE_BUILD_QUEUE );
+ AuditLog event = new AuditLog( "Build Queue id=" + buildQueue.getId(),
+ AuditLogConstants.REMOVE_BUILD_QUEUE );
event.setCategory( AuditLogConstants.BUILD_QUEUE );
event.setCurrentUser( getPrincipal() );
event.log();
@@ -162,7 +163,7 @@ public class BuildQueueAction
{
return CONFIRM;
}
-
+
return SUCCESS;
}
@@ -172,7 +173,7 @@ public class BuildQueueAction
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_PARALLEL_BUILDS, Resource.GLOBAL );
-
+
return bundle;
}
@@ -225,14 +226,14 @@ public class BuildQueueAction
{
this.message = message;
}
-
+
private boolean isDuplicate( String queueName )
throws ContinuumException
{
boolean isExisting = false;
-
+
List<BuildQueue> buildQueues = getContinuum().getAllBuildQueues();
-
+
for ( BuildQueue bq : buildQueues )
{
if ( queueName.equals( bq.getName() ) )
@@ -241,7 +242,7 @@ public class BuildQueueAction
break;
}
}
-
+
return isExisting;
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Mon Aug 13 04:29:09 2012
@@ -20,11 +20,6 @@ package org.apache.maven.continuum.web.a
*/
import com.opensymphony.xwork2.Preparable;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.continuum.configuration.ContinuumConfigurationException;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.configuration.ConfigurationStoringException;
@@ -40,6 +35,9 @@ import org.codehaus.redback.integration.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import javax.servlet.http.HttpServletRequest;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,7 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.opensymphony.xwork2.ModelDriven;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -49,7 +45,10 @@ import org.codehaus.redback.integration.
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
-import com.opensymphony.xwork2.ModelDriven;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -145,9 +144,10 @@ public class ConfigureAppearanceAction
{
for ( Repository repo : repos )
{
- remoteRepositories.add(
- artifactRepositoryFactory.createArtifactRepository( repo.getId(), repo
- .getUrl(), layout, null, null ) );
+ remoteRepositories.add( artifactRepositoryFactory.createArtifactRepository( repo.getId(),
+ repo.getUrl(),
+ layout, null,
+ null ) );
}
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java Mon Aug 13 04:29:09 2012
@@ -18,16 +18,16 @@
*/
package org.apache.maven.continuum.web.action.admin;
-import java.io.IOException;
-
import org.apache.maven.continuum.web.action.component.AbstractFooterAction;
import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
+import java.io.IOException;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 9 nov. 07
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureFooter"
+ * @since 9 nov. 07
*/
public class ConfigureFooterAction
extends AbstractFooterAction
@@ -35,7 +35,7 @@ public class ConfigureFooterAction
/**
* @plexus.requirement
- */
+ */
private AppareanceConfiguration appareanceConfiguration;
public String saveFooter()
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,7 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.IOException;
-
+import com.opensymphony.xwork2.ModelDriven;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper;
@@ -38,7 +37,7 @@ import org.codehaus.redback.integration.
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
-import com.opensymphony.xwork2.ModelDriven;
+import java.io.IOException;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java Mon Aug 13 04:29:09 2012
@@ -1,11 +1,6 @@
package org.apache.maven.continuum.web.action.admin;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-
+import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.continuum.installation.AlreadyExistsInstallationException;
import org.apache.maven.continuum.installation.InstallationService;
@@ -18,7 +13,11 @@ import org.codehaus.redback.integration.
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
-import com.opensymphony.xwork2.Preparable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,6 +37,7 @@ import com.opensymphony.xwork2.Preparabl
* specific language governing permissions and limitations
* under the License.
*/
+
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @version $Id$
@@ -131,7 +131,8 @@ public class InstallationAction
this.installation.setType( InstallationService.ENVVAR_TYPE );
if ( StringUtils.isEmpty( installation.getVarName() ) )
{
- addFieldError( "installation.varName", getResourceBundle().getString( "installation.varName.required" ) );
+ addFieldError( "installation.varName", getResourceBundle().getString(
+ "installation.varName.required" ) );
return INPUT;
}
@@ -156,7 +157,8 @@ public class InstallationAction
else
{
this.configureUiFlags();
- try{
+ try
+ {
installationService.update( installation );
}
catch ( AlreadyExistsInstallationException e )
@@ -189,7 +191,8 @@ public class InstallationAction
this.installationTypes = new LinkedHashMap<String, String>();
ResourceBundle resourceBundle = getResourceBundle();
this.installationTypes.put( TOOL_TYPE_KEY, resourceBundle.getString( "installationTypeChoice.tool.label" ) );
- this.installationTypes.put( InstallationService.ENVVAR_TYPE, resourceBundle.getString( "installationTypeChoice.envar.label" ) );
+ this.installationTypes.put( InstallationService.ENVVAR_TYPE, resourceBundle.getString(
+ "installationTypeChoice.envar.label" ) );
return SUCCESS;
}
@@ -228,7 +231,6 @@ public class InstallationAction
this.setInstallationType( this.getInstallation().getType() );
}
-
// -----------------------------------------------------
// getter/setters
// -----------------------------------------------------
@@ -259,14 +261,14 @@ public class InstallationAction
{
this.typesLabels = new LinkedHashMap<String, String>();
ResourceBundle resourceBundle = getResourceBundle();
- this.typesLabels.put( InstallationService.JDK_TYPE, resourceBundle
- .getString( "installation.jdk.type.label" ) );
- this.typesLabels.put( InstallationService.MAVEN2_TYPE, resourceBundle
- .getString( "installation.maven2.type.label" ) );
- this.typesLabels.put( InstallationService.MAVEN1_TYPE, resourceBundle
- .getString( "installation.maven1.type.label" ) );
- this.typesLabels.put( InstallationService.ANT_TYPE, resourceBundle
- .getString( "installation.ant.type.label" ) );
+ this.typesLabels.put( InstallationService.JDK_TYPE, resourceBundle.getString(
+ "installation.jdk.type.label" ) );
+ this.typesLabels.put( InstallationService.MAVEN2_TYPE, resourceBundle.getString(
+ "installation.maven2.type.label" ) );
+ this.typesLabels.put( InstallationService.MAVEN1_TYPE, resourceBundle.getString(
+ "installation.maven1.type.label" ) );
+ this.typesLabels.put( InstallationService.ANT_TYPE, resourceBundle.getString(
+ "installation.ant.type.label" ) );
// CONTINUUM-1430
//this.typesLabels.put( InstallationService.ENVVAR_TYPE, resourceBundle
// .getString( "installation.envvar.type.label" ) );
@@ -293,7 +295,7 @@ public class InstallationAction
{
if ( this.types == null )
{
- this.types = new ArrayList<String>(5);
+ this.types = new ArrayList<String>( 5 );
this.types.add( InstallationService.JDK_TYPE );
this.types.add( InstallationService.MAVEN2_TYPE );
this.types.add( InstallationService.MAVEN1_TYPE );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,7 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
import org.apache.maven.continuum.installation.InstallationService;
@@ -33,7 +30,6 @@ import org.apache.maven.continuum.profil
import org.apache.maven.continuum.profile.ProfileService;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -41,7 +37,9 @@ import org.codehaus.redback.integration.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensymphony.xwork2.Preparable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
@@ -154,8 +152,8 @@ public class ProfileAction
profile = profileService.getProfile( profile.getId() );
// CONTINUUM-1746 we update the profile only if the name has changed
// jancajas: added build agent group. updated profile if agent group is changed also.
- if ( !StringUtils.equals( name, profile.getName() ) ||
- !StringUtils.equals( buildAgentGroup, profile.getBuildAgentGroup() ) )
+ if ( !StringUtils.equals( name, profile.getName() ) || !StringUtils.equals( buildAgentGroup,
+ profile.getBuildAgentGroup() ) )
{
profile.setName( name );
profile.setBuildAgentGroup( buildAgentGroup );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Mon Aug 13 04:29:09 2012
@@ -19,16 +19,8 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.commons.lang.ArrayUtils;
-import org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor;
-import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.buildmanager.BuildManagerException;
-import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.continuum.taskqueue.CheckOutTask;
import org.apache.continuum.taskqueue.PrepareBuildProjectsTask;
@@ -44,13 +36,17 @@ import org.apache.maven.continuum.web.ex
import org.apache.maven.continuum.web.model.DistributedBuildSummary;
import org.apache.maven.continuum.web.model.PrepareBuildSummary;
import org.codehaus.plexus.redback.rbac.Resource;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
@@ -206,8 +202,9 @@ public class QueuesAction
{
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
{
- // current prepare build task
- Map<String, PrepareBuildProjectsTask> currentPrepareBuildMap = getContinuum().getDistributedBuildManager().getProjectsCurrentlyPreparingBuild();
+ // current prepare build task
+ Map<String, PrepareBuildProjectsTask> currentPrepareBuildMap =
+ getContinuum().getDistributedBuildManager().getProjectsCurrentlyPreparingBuild();
for ( String url : currentPrepareBuildMap.keySet() )
{
@@ -226,7 +223,8 @@ public class QueuesAction
}
// current builds
- Map<String, BuildProjectTask> currentBuildMap = getContinuum().getDistributedBuildManager().getProjectsCurrentlyBuilding();
+ Map<String, BuildProjectTask> currentBuildMap =
+ getContinuum().getDistributedBuildManager().getProjectsCurrentlyBuilding();
for ( String url : currentBuildMap.keySet() )
{
@@ -245,9 +243,10 @@ public class QueuesAction
currentDistributedBuilds.add( summary );
}
-
+
// prepare build queues
- Map<String, List<PrepareBuildProjectsTask>> prepareBuildMap = getContinuum().getDistributedBuildManager().getProjectsInPrepareBuildQueue();
+ Map<String, List<PrepareBuildProjectsTask>> prepareBuildMap =
+ getContinuum().getDistributedBuildManager().getProjectsInPrepareBuildQueue();
for ( String url : prepareBuildMap.keySet() )
{
@@ -268,7 +267,8 @@ public class QueuesAction
}
// build queues
- Map<String, List<BuildProjectTask>> buildMap = getContinuum().getDistributedBuildManager().getProjectsInBuildQueue();
+ Map<String, List<BuildProjectTask>> buildMap =
+ getContinuum().getDistributedBuildManager().getProjectsInBuildQueue();
for ( String url : buildMap.keySet() )
{
@@ -297,7 +297,8 @@ public class QueuesAction
try
{
// current prepare builds
- Map<String, PrepareBuildProjectsTask> currentPrepareBuildTasks = getContinuum().getBuildsManager().getCurrentProjectInPrepareBuild();
+ Map<String, PrepareBuildProjectsTask> currentPrepareBuildTasks =
+ getContinuum().getBuildsManager().getCurrentProjectInPrepareBuild();
Set<String> keySet = currentPrepareBuildTasks.keySet();
for ( String key : keySet )
@@ -342,7 +343,7 @@ public class QueuesAction
try
{
// queued prepare builds
- Map<String, List<PrepareBuildProjectsTask>> prepareBuilds =
+ Map<String, List<PrepareBuildProjectsTask>> prepareBuilds =
getContinuum().getBuildsManager().getProjectsInPrepareBuildQueue();
Set<String> keySet = prepareBuilds.keySet();
@@ -456,8 +457,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getBuildsManager().removeProjectFromBuildQueue( projectId, buildDefinitionId,
- new BuildTrigger( trigger, "" ), projectName, projectGroupId );
+ getContinuum().getBuildsManager().removeProjectFromBuildQueue( projectId, buildDefinitionId, new BuildTrigger(
+ trigger, "" ), projectName, projectGroupId );
Project project = getContinuum().getProject( projectId );
project.setState( project.getOldState() );
getContinuum().updateProject( project );
@@ -483,8 +484,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getBuildsManager().removeProjectsFromBuildQueueWithHashcodes(
- listToIntArray( this.getSelectedBuildTaskHashCodes() ) );
+ getContinuum().getBuildsManager().removeProjectsFromBuildQueueWithHashcodes( listToIntArray(
+ this.getSelectedBuildTaskHashCodes() ) );
return SUCCESS;
}
@@ -506,8 +507,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getBuildsManager().removeProjectsFromCheckoutQueueWithHashcodes(
- listToIntArray( this.getSelectedCheckOutTaskHashCodes() ) );
+ getContinuum().getBuildsManager().removeProjectsFromCheckoutQueueWithHashcodes( listToIntArray(
+ this.getSelectedCheckOutTaskHashCodes() ) );
return SUCCESS;
}
@@ -551,8 +552,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getBuildsManager().removeProjectsFromPrepareBuildQueueWithHashCodes(
- listToIntArray( this.selectedPrepareBuildTaskHashCodes ) );
+ getContinuum().getBuildsManager().removeProjectsFromPrepareBuildQueueWithHashCodes( listToIntArray(
+ this.selectedPrepareBuildTaskHashCodes ) );
return SUCCESS;
}
@@ -597,7 +598,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getDistributedBuildManager().removeFromPrepareBuildQueue( buildAgentUrl, projectGroupId, scmRootId );
+ getContinuum().getDistributedBuildManager().removeFromPrepareBuildQueue( buildAgentUrl, projectGroupId,
+ scmRootId );
return SUCCESS;
}
@@ -620,7 +622,8 @@ public class QueuesAction
return REQUIRES_AUTHENTICATION;
}
- getContinuum().getDistributedBuildManager().removeFromPrepareBuildQueue( this.getSelectedPrepareBuildTaskHashCodes() );
+ getContinuum().getDistributedBuildManager().removeFromPrepareBuildQueue(
+ this.getSelectedPrepareBuildTaskHashCodes() );
return SUCCESS;
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/AbstractFooterAction.java Mon Aug 13 04:29:09 2012
@@ -18,24 +18,23 @@
*/
package org.apache.maven.continuum.web.action.component;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
import org.apache.maven.continuum.web.appareance.AppareanceConfiguration;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 8 nov. 07
* @version $Id$
+ * @since 8 nov. 07
*/
public abstract class AbstractFooterAction
extends ContinuumActionSupport
{
-
+
private String footer;
-
+
/**
* @plexus.requirement
- */
+ */
private AppareanceConfiguration appareanceConfiguration;
public String getContinuumFooter()
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java Mon Aug 13 04:29:09 2012
@@ -21,17 +21,17 @@ package org.apache.maven.continuum.web.a
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 8 nov. 07
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="bottom"
+ * @since 8 nov. 07
*/
public class BottomAction
extends AbstractFooterAction
{
-
+
public String execute()
{
return SUCCESS;
}
-
+
}