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 [24/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/continuum/web/action/ReleaseResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.continuum.web.action;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.model.release.ContinuumReleaseResult;
import org.apache.maven.continuum.ContinuumException;
@@ -35,6 +31,10 @@ import org.codehaus.plexus.util.FileUtil
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseResult"
@@ -61,7 +61,7 @@ public class ReleaseResultAction
private String projectName;
private String releaseGoal;
-
+
private String username;
public String list()
@@ -150,8 +150,7 @@ public class ReleaseResultAction
{
File releaseOutputFile = getContinuum().getConfiguration().getReleaseOutputFile( projectGroupId,
"releases-" +
- releaseResult.getStartTime() )
- ;
+ releaseResult.getStartTime() );
if ( releaseOutputFile.exists() )
{
@@ -285,12 +284,12 @@ public class ReleaseResultAction
{
this.releaseGoal = releaseGoal;
}
-
+
public void setUsername( String username )
{
this.username = username;
}
-
+
public String getUsername()
{
return username;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java Mon Aug 13 04:29:09 2012
@@ -5,7 +5,6 @@ import org.apache.maven.continuum.Contin
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.continuum.web.util.StateGenerator;
-
import org.apache.struts2.ServletActionContext;
/**
@@ -15,85 +14,86 @@ import org.apache.struts2.ServletActionC
public class ScmResultAction
extends ContinuumActionSupport
{
- private int projectGroupId;
+ private int projectGroupId;
+
+ private int projectScmRootId;
+
+ private String projectGroupName;
+
+ private String state;
+
+ private ProjectScmRoot projectScmRoot;
+
+ public String execute()
+ throws Exception
+ {
+ try
+ {
+ checkViewProjectGroupAuthorization( getProjectGroupName() );
+ }
+ catch ( AuthorizationRequiredException e )
+ {
+ return REQUIRES_AUTHORIZATION;
+ }
+
+ projectScmRoot = getContinuum().getProjectScmRoot( projectScmRootId );
+
+ state = StateGenerator.generate( projectScmRoot.getState(),
+ ServletActionContext.getRequest().getContextPath() );
+
+ return SUCCESS;
+ }
+
+ public int getProjectGroupId()
+ {
+ return projectGroupId;
+ }
+
+ public void setProjectGroupId( int projectGroupId )
+ {
+ this.projectGroupId = projectGroupId;
+ }
+
+ public int getProjectScmRootId()
+ {
+ return projectScmRootId;
+ }
- private int projectScmRootId;
+ public void setProjectScmRootId( int projectScmRootId )
+ {
+ this.projectScmRootId = projectScmRootId;
+ }
+
+ public ProjectScmRoot getProjectScmRoot()
+ {
+ return projectScmRoot;
+ }
- private String projectGroupName;
+ public void setProjectScmRoot( ProjectScmRoot projectScmRoot )
+ {
+ this.projectScmRoot = projectScmRoot;
+ }
- private String state;
+ public String getProjectGroupName()
+ throws ContinuumException
+ {
+ projectGroupName = getContinuum().getProjectGroup( getProjectGroupId() ).getName();
- private ProjectScmRoot projectScmRoot;
-
- public String execute()
- throws Exception
- {
- try
- {
- checkViewProjectGroupAuthorization( getProjectGroupName() );
- }
- catch ( AuthorizationRequiredException e )
- {
- return REQUIRES_AUTHORIZATION;
- }
-
- projectScmRoot = getContinuum().getProjectScmRoot( projectScmRootId );
-
- state = StateGenerator.generate( projectScmRoot.getState(), ServletActionContext.getRequest().getContextPath() );
-
- return SUCCESS;
- }
-
- public int getProjectGroupId()
- {
- return projectGroupId;
- }
-
- public void setProjectGroupId( int projectGroupId )
- {
- this.projectGroupId = projectGroupId;
- }
-
- public int getProjectScmRootId()
- {
- return projectScmRootId;
- }
-
- public void setProjectScmRootId( int projectScmRootId )
- {
- this.projectScmRootId = projectScmRootId;
- }
-
- public ProjectScmRoot getProjectScmRoot()
- {
- return projectScmRoot;
- }
-
- public void setProjectScmRoot( ProjectScmRoot projectScmRoot )
- {
- this.projectScmRoot = projectScmRoot;
- }
-
- public String getProjectGroupName()
- throws ContinuumException
- {
- projectGroupName = getContinuum().getProjectGroup( getProjectGroupId() ).getName();
-
- return projectGroupName;
- }
-
- public void setProjectGroupName( String projectGroupName )
- {
- this.projectGroupName = projectGroupName;
- }
-
- public String getState()
- {
- return state;
- }
-
- public void setState( String state )
- {
- this.state = state;
- }
+ return projectGroupName;
+ }
+
+ public void setProjectGroupName( String projectGroupName )
+ {
+ this.projectGroupName = projectGroupName;
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+
+ public void setState( String state )
+ {
+ this.state = state;
+ }
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,17 @@ package org.apache.continuum.web.action;
* under the License.
*/
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.apache.maven.continuum.web.model.ProjectBuildsSummary;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -31,17 +42,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.maven.continuum.model.project.BuildResult;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.apache.maven.continuum.web.model.ProjectBuildsSummary;
-
/**
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectBuildsReport"
*/
@@ -55,7 +55,7 @@ public class ViewBuildsReportAction
private String startDate = "";
private String endDate = "";
-
+
private int projectGroupId;
private int rowCount = 30;
@@ -65,13 +65,13 @@ public class ViewBuildsReportAction
private int numPages;
private Map<Integer, String> buildStatuses;
-
+
private Map<Integer, String> projectGroups;
private List<ProjectBuildsSummary> projectBuilds;
private InputStream inputStream;
-
+
public static final String SEND_FILE = "send-file";
private static final String[] datePatterns =
@@ -82,22 +82,22 @@ public class ViewBuildsReportAction
throws Exception
{
super.prepare();
-
+
buildStatuses = new LinkedHashMap<Integer, String>();
buildStatuses.put( 0, "ALL" );
buildStatuses.put( ContinuumProjectState.OK, "Ok" );
buildStatuses.put( ContinuumProjectState.FAILED, "Failed" );
buildStatuses.put( ContinuumProjectState.ERROR, "Error" );
-
+
projectGroups = new LinkedHashMap<Integer, String>();
projectGroups.put( 0, "ALL" );
-
+
List<ProjectGroup> groups = getContinuum().getAllProjectGroups();
if ( groups != null )
{
for ( ProjectGroup group : groups )
{
- projectGroups.put( group.getId(), group.getName() );
+ projectGroups.put( group.getId(), group.getName() );
}
}
}
@@ -157,7 +157,8 @@ public class ViewBuildsReportAction
return INPUT;
}
- List<BuildResult> buildResults = getContinuum().getBuildResultsInRange( projectGroupId, fromDate, toDate, buildStatus, triggeredBy );
+ List<BuildResult> buildResults = getContinuum().getBuildResultsInRange( projectGroupId, fromDate, toDate,
+ buildStatus, triggeredBy );
projectBuilds = Collections.emptyList();
if ( buildResults != null && !buildResults.isEmpty() )
@@ -166,17 +167,17 @@ public class ViewBuildsReportAction
int extraPage = ( projectBuilds.size() % rowCount ) != 0 ? 1 : 0;
numPages = ( projectBuilds.size() / rowCount ) + extraPage;
-
+
if ( page > numPages )
{
addActionError(
- "Error encountered while generating project builds report :: The requested page exceeds the total number of pages." );
+ "Error encountered while generating project builds report :: The requested page exceeds the total number of pages." );
return ERROR;
}
-
+
int start = rowCount * ( page - 1 );
int end = ( start + rowCount );
-
+
if ( end > projectBuilds.size() )
{
end = projectBuilds.size();
@@ -187,10 +188,10 @@ public class ViewBuildsReportAction
return SUCCESS;
}
-
+
/*
- * Export Builds Report to .csv
- */
+ * Export Builds Report to .csv
+ */
public String downloadBuildsReport()
{
try
@@ -223,46 +224,54 @@ public class ViewBuildsReportAction
return INPUT;
}
- List<BuildResult> buildResults = getContinuum().getBuildResultsInRange( projectGroupId, fromDate, toDate, buildStatus, triggeredBy );
+ List<BuildResult> buildResults = getContinuum().getBuildResultsInRange( projectGroupId, fromDate, toDate,
+ buildStatus, triggeredBy );
List<ProjectBuildsSummary> builds = Collections.emptyList();
-
+
StringBuffer input = new StringBuffer( "Project Group,Project Name,Build Date,Triggered By,Build Status\n" );
if ( buildResults != null && !buildResults.isEmpty() )
{
builds = mapBuildResultsToProjectBuildsSummaries( buildResults );
-
+
for ( ProjectBuildsSummary build : builds )
{
input.append( build.getProjectGroupName() ).append( "," );
input.append( build.getProjectName() ).append( "," );
-
+
input.append( new Date( build.getBuildDate() ) ).append( "," );
-
+
input.append( build.getBuildTriggeredBy() ).append( "," );
-
+
String status;
switch ( build.getBuildState() )
{
- case 2: status = "Ok";
- break;
- case 3: status = "Failed";
- break;
- case 4: status = "Error";
- break;
- case 6: status = "Building";
- break;
- case 7: status = "Checking Out";
- break;
- case 8: status = "Updating";
- break;
- default: status = "";
+ case 2:
+ status = "Ok";
+ break;
+ case 3:
+ status = "Failed";
+ break;
+ case 4:
+ status = "Error";
+ break;
+ case 6:
+ status = "Building";
+ break;
+ case 7:
+ status = "Checking Out";
+ break;
+ case 8:
+ status = "Updating";
+ break;
+ default:
+ status = "";
}
input.append( status );
input.append( "\n" );
}
}
-
+
StringReader reader = new StringReader( input.toString() );
try
@@ -282,7 +291,7 @@ public class ViewBuildsReportAction
{
List<ProjectBuildsSummary> buildsSummary = new ArrayList<ProjectBuildsSummary>();
- for( BuildResult buildResult : buildResults )
+ for ( BuildResult buildResult : buildResults )
{
Project project = buildResult.getProject();
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java Mon Aug 13 04:29:09 2012
@@ -142,16 +142,17 @@ public class BuildAgentAction
if ( agent.getUrl().equals( escapedBuildAgentUrl ) )
{
buildAgent = agent;
-
+
try
{
- installations = getContinuum().getDistributedBuildManager().getAvailableInstallations( escapedBuildAgentUrl );
+ installations = getContinuum().getDistributedBuildManager().getAvailableInstallations(
+ escapedBuildAgentUrl );
}
catch ( ContinuumException e )
{
logger.error( "Unable to retrieve installations of build agent '" + agent.getUrl() + "'", e );
}
-
+
break;
}
}
@@ -168,7 +169,8 @@ public class BuildAgentAction
ConfigurationService configuration = getContinuum().getConfiguration();
// escape xml to prevent xss attacks
- buildAgent.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( buildAgent.getDescription() ) ) );
+ buildAgent.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml(
+ buildAgent.getDescription() ) ) );
if ( configuration.getBuildAgents() != null )
{
@@ -208,7 +210,7 @@ public class BuildAgentAction
{
getContinuum().getDistributedBuildManager().update( buildAgent );
}
- catch( ContinuumException e )
+ catch ( ContinuumException e )
{
addActionError( e.getMessage() );
return INPUT;
@@ -237,7 +239,7 @@ public class BuildAgentAction
ConfigurationService configuration = getContinuum().getConfiguration();
if ( configuration.getBuildAgentGroups() != null )
- {
+ {
for ( BuildAgentGroupConfiguration buildAgentGroup : configuration.getBuildAgentGroups() )
{
if ( configuration.containsBuildAgentUrl( buildAgent.getUrl(), buildAgentGroup ) )
@@ -254,11 +256,13 @@ public class BuildAgentAction
{
if ( buildAgent.getUrl().equals( agent.getUrl() ) )
{
- getContinuum().getDistributedBuildManager().removeDistributedBuildQueueOfAgent( buildAgent.getUrl() );
+ getContinuum().getDistributedBuildManager().removeDistributedBuildQueueOfAgent(
+ buildAgent.getUrl() );
configuration.removeBuildAgent( agent );
configuration.store();
- AuditLog event = new AuditLog( "Build Agent URL=" + agent.getUrl(), AuditLogConstants.REMOVE_BUILD_AGENT );
+ AuditLog event = new AuditLog( "Build Agent URL=" + agent.getUrl(),
+ AuditLogConstants.REMOVE_BUILD_AGENT );
event.setCategory( AuditLogConstants.BUILD_AGENT );
event.setCurrentUser( getPrincipal() );
event.log();
@@ -302,7 +306,8 @@ public class BuildAgentAction
{
configuration.removeBuildAgentGroup( group );
- AuditLog event = new AuditLog( "Build Agent Group=" + group.getName(), AuditLogConstants.REMOVE_BUILD_AGENT_GROUP );
+ AuditLog event = new AuditLog( "Build Agent Group=" + group.getName(),
+ AuditLogConstants.REMOVE_BUILD_AGENT_GROUP );
event.setCategory( AuditLogConstants.BUILD_AGENT );
event.setCurrentUser( getPrincipal() );
event.log();
@@ -351,7 +356,8 @@ public class BuildAgentAction
}
}
- AuditLog event = new AuditLog( "Build Agent Group=" + buildAgentGroup.getName(), AuditLogConstants.MODIFY_BUILD_AGENT_GROUP );
+ AuditLog event = new AuditLog( "Build Agent Group=" + buildAgentGroup.getName(),
+ AuditLogConstants.MODIFY_BUILD_AGENT_GROUP );
event.setCategory( AuditLogConstants.BUILD_AGENT );
event.setCurrentUser( getPrincipal() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,7 @@ package org.apache.continuum.web.action.
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.configuration.BuildAgentConfiguration;
import org.apache.continuum.model.repository.AbstractPurgeConfiguration;
@@ -43,13 +37,17 @@ 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.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedPurgeConfiguration"
- * @since
*/
public class DistributedPurgeConfigurationAction
extends ContinuumConfirmAction
@@ -60,7 +58,7 @@ public class DistributedPurgeConfigurati
private static final String PURGE_TYPE_DIRECTORY = "directory";
private static final String PURGE_DIRECTORY_RELEASES = "releases";
-
+
private static final String PURGE_DIRECTORY_WORKING = "working";
private static final int DEFAULT_RETENTION_COUNT = 2;
@@ -92,7 +90,7 @@ public class DistributedPurgeConfigurati
private int scheduleId;
private int purgeConfigId;
-
+
private String buildAgentUrl;
private AbstractPurgeConfiguration purgeConfig;
@@ -100,20 +98,20 @@ public class DistributedPurgeConfigurati
private Map<Integer, String> schedules;
private List<String> directoryTypes;
-
+
private List<String> buildAgentUrls;
/**
* @plexus.requirement
*/
private PurgeConfigurationService purgeConfigService;
-
+
@Override
public void prepare()
throws Exception
{
super.prepare();
-
+
// build schedules
if ( schedules == null )
{
@@ -184,7 +182,7 @@ public class DistributedPurgeConfigurati
throws Exception
{
if ( purgeConfigId == 0 )
- {
+ {
purgeConfig = new DistributedDirectoryPurgeConfiguration();
purgeConfig = setupPurgeConfiguration( purgeConfig );
@@ -198,7 +196,7 @@ public class DistributedPurgeConfigurati
purgeConfigService.updatePurgeConfiguration( purgeConfig );
}
-
+
/*if ( purgeConfig.isDefaultPurge() )
{
updateDefaultPurgeConfiguration();
@@ -215,7 +213,7 @@ public class DistributedPurgeConfigurati
public String remove()
throws Exception
{
-
+
if ( confirmed )
{
purgeConfigService.removePurgeConfiguration( purgeConfigId );
@@ -231,14 +229,14 @@ public class DistributedPurgeConfigurati
public String purge()
throws Exception
{
-
+
ContinuumPurgeManager purgeManager = getContinuum().getPurgeManager();
if ( purgeConfigId > 0 )
{
purgeConfig = purgeConfigService.getPurgeConfiguration( purgeConfigId );
- DistributedDirectoryPurgeConfiguration dirPurge = ( DistributedDirectoryPurgeConfiguration ) purgeConfig;
+ DistributedDirectoryPurgeConfiguration dirPurge = (DistributedDirectoryPurgeConfiguration) purgeConfig;
purgeManager.purgeDistributedDirectory( dirPurge );
}
@@ -444,7 +442,7 @@ public class DistributedPurgeConfigurati
dirPurge.setDirectoryType( this.directoryType );
dirPurge.setDefaultPurge( this.defaultPurgeConfiguration );
dirPurge.setBuildAgentUrl( buildAgentUrl );
-
+
// escape xml to prevent xss attacks
dirPurge.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( this.description ) ) );
@@ -453,15 +451,15 @@ public class DistributedPurgeConfigurati
Schedule schedule = getContinuum().getSchedule( scheduleId );
dirPurge.setSchedule( schedule );
}
-
+
return dirPurge;
}
private void updateDefaultPurgeConfiguration()
throws Exception
{
- DirectoryPurgeConfiguration dirPurge =
- purgeConfigService.getDefaultPurgeConfigurationForDirectoryType( directoryType );
+ DirectoryPurgeConfiguration dirPurge = purgeConfigService.getDefaultPurgeConfigurationForDirectoryType(
+ directoryType );
if ( dirPurge != null && dirPurge.getId() != purgeConfig.getId() )
{
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,7 @@ package org.apache.continuum.web.action.
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.opensymphony.xwork2.Preparable;
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
import org.apache.continuum.purge.ContinuumPurgeManager;
@@ -40,105 +36,109 @@ 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.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author Maria Catherine Tan
* @version $Id$
- * @since 25 jul 07
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="localRepository"
+ * @since 25 jul 07
*/
public class LocalRepositoryAction
extends ContinuumConfirmAction
implements Preparable, SecureAction
{
private static final String LAYOUT_DEFAULT = "default";
-
+
private static final String LAYOUT_LEGACY = "legacy";
-
+
private boolean confirmed;
private boolean defaultRepo;
-
+
private LocalRepository repository;
-
+
private List<LocalRepository> repositories;
-
+
private List<ProjectGroup> groups;
-
+
private List<String> layouts;
-
+
private Map<String, Boolean> defaultPurgeMap;
/**
* @plexus.requirement
*/
private RepositoryService repositoryService;
-
+
/**
* @plexus.requirement
*/
private PurgeConfigurationService purgeConfigService;
-
+
public void prepare()
throws Exception
{
super.prepare();
-
+
layouts = new ArrayList<String>();
layouts.add( LAYOUT_DEFAULT );
layouts.add( LAYOUT_LEGACY );
}
-
+
public String input()
throws Exception
{
defaultRepo = false;
-
+
if ( repository != null && repository.getId() > 0 )
{
repository = repositoryService.getLocalRepository( repository.getId() );
-
+
if ( repository.getName().equals( "DEFAULT" ) )
{
defaultRepo = true;
}
}
-
+
return INPUT;
}
-
+
public String list()
throws Exception
{
repositories = repositoryService.getAllLocalRepositories();
-
+
defaultPurgeMap = new HashMap<String, Boolean>();
-
+
for ( LocalRepository repo : repositories )
{
// get default purge config of repository
- RepositoryPurgeConfiguration purgeConfig = purgeConfigService.getDefaultPurgeConfigurationForRepository( repo.getId() );
-
+ RepositoryPurgeConfiguration purgeConfig = purgeConfigService.getDefaultPurgeConfigurationForRepository(
+ repo.getId() );
+
if ( purgeConfig == null )
{
- defaultPurgeMap.put( repo.getName(), Boolean.FALSE );
+ defaultPurgeMap.put( repo.getName(), Boolean.FALSE );
}
else
{
- defaultPurgeMap.put( repo.getName(), Boolean.TRUE );
+ defaultPurgeMap.put( repo.getName(), Boolean.TRUE );
}
}
-
+
return SUCCESS;
}
-
+
public String save()
throws Exception
{
List<LocalRepository> allRepositories = repositoryService.getAllLocalRepositories();
-
- for( LocalRepository repo : allRepositories )
+
+ for ( LocalRepository repo : allRepositories )
{
if ( repository.getId() != repo.getId() )
{
@@ -146,37 +146,37 @@ public class LocalRepositoryAction
{
addActionError( getText( "repository.error.name.unique" ) );
}
-
+
if ( repository.getLocation().trim().equals( repo.getLocation() ) )
{
addActionError( getText( "repository.error.location.unique" ) );
}
}
}
-
+
if ( repository.getName().trim().equals( "" ) )
{
addActionError( getText( "repository.error.name.cannot.be.spaces" ) );
}
-
+
if ( repository.getLocation().trim().equals( "" ) )
{
addActionError( getText( "repository.error.location.cannot.be.spaces" ) );
}
-
+
if ( hasActionErrors() )
{
return INPUT;
}
-
+
// trim repository name and location before saving
repository.setName( repository.getName().trim() );
repository.setLocation( repository.getLocation().trim() );
-
+
if ( repository.getId() == 0 )
{
repository = repositoryService.addLocalRepository( repository );
-
+
createDefaultPurgeConfiguration();
}
else
@@ -188,19 +188,19 @@ public class LocalRepositoryAction
addActionError( getText( "repository.error.save.in.use" ) );
return ERROR;
}
-
+
LocalRepository retrievedRepo = repositoryService.getLocalRepository( repository.getId() );
-
+
retrievedRepo.setName( repository.getName() );
retrievedRepo.setLocation( repository.getLocation() );
retrievedRepo.setLayout( repository.getLayout() );
-
+
repositoryService.updateLocalRepository( retrievedRepo );
}
-
+
return SUCCESS;
}
-
+
public String remove()
throws Exception
{
@@ -210,7 +210,8 @@ public class LocalRepositoryAction
if ( taskQueueManager.isRepositoryInUse( repository.getId() ) )
{
- addActionError( getText( "repository.error.remove.in.use", "Unable to remove local repository because it is in use" ) );
+ addActionError( getText( "repository.error.remove.in.use",
+ "Unable to remove local repository because it is in use" ) );
}
if ( repository.getName().equals( "DEFAULT" ) )
@@ -232,7 +233,7 @@ public class LocalRepositoryAction
return SUCCESS;
}
-
+
public String doPurge()
throws Exception
{
@@ -242,19 +243,22 @@ public class LocalRepositoryAction
// check if repository is in use
if ( taskQueueManager.isRepositoryInUse( repository.getId() ) )
{
- addActionError( getText( "repository.error.purge.in.use", "Unable to purge repository because it is in use" ) );
+ addActionError( getText( "repository.error.purge.in.use",
+ "Unable to purge repository because it is in use" ) );
}
-
+
if ( !hasActionErrors() )
{
// get default purge configuration for repository
- RepositoryPurgeConfiguration purgeConfig = purgeConfigService.getDefaultPurgeConfigurationForRepository( repository.getId() );
-
+ RepositoryPurgeConfiguration purgeConfig = purgeConfigService.getDefaultPurgeConfigurationForRepository(
+ repository.getId() );
+
if ( purgeConfig != null )
{
purgeManager.purgeRepository( purgeConfig );
- AuditLog event = new AuditLog( "Repository id=" + repository.getId(), AuditLogConstants.PURGE_LOCAL_REPOSITORY );
+ AuditLog event = new AuditLog( "Repository id=" + repository.getId(),
+ AuditLogConstants.PURGE_LOCAL_REPOSITORY );
event.setCategory( AuditLogConstants.LOCAL_REPOSITORY );
event.setCurrentUser( getPrincipal() );
event.log();
@@ -262,67 +266,67 @@ public class LocalRepositoryAction
}
return SUCCESS;
}
-
+
public LocalRepository getRepository()
{
return this.repository;
}
-
+
public void setRepository( LocalRepository repository )
{
this.repository = repository;
}
-
+
public List<LocalRepository> getRepositories()
{
return this.repositories;
}
-
+
public void setRepositories( List<LocalRepository> repositories )
{
this.repositories = repositories;
}
-
+
public List<ProjectGroup> getGroups()
{
return this.groups;
}
-
+
public void setGroups( List<ProjectGroup> groups )
{
this.groups = groups;
}
-
+
public boolean isConfirmed()
{
return this.confirmed;
}
-
+
public void setConfirmed( boolean confirmed )
{
this.confirmed = confirmed;
}
-
+
public boolean isDefaultRepo()
{
return this.defaultRepo;
}
-
+
public void setDefaultRepo( boolean defaultRepo )
{
this.defaultRepo = defaultRepo;
}
-
+
public List<String> getLayouts()
{
return this.layouts;
}
-
+
public Map<String, Boolean> getDefaultPurgeMap()
{
return this.defaultPurgeMap;
}
-
+
public void setDefaultPurgeMap( Map<String, Boolean> defaultPurgeMap )
{
this.defaultPurgeMap = defaultPurgeMap;
@@ -332,10 +336,10 @@ public class LocalRepositoryAction
throws Exception
{
RepositoryPurgeConfiguration repoPurge = new RepositoryPurgeConfiguration();
-
+
repoPurge.setRepository( repository );
repoPurge.setDefaultPurge( true );
-
+
purgeConfigService.addRepositoryPurgeConfiguration( repoPurge );
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java Mon Aug 13 04:29:09 2012
@@ -20,24 +20,11 @@ package org.apache.continuum.web.action.
*/
import com.opensymphony.xwork2.Preparable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.continuum.model.repository.AbstractPurgeConfiguration;
import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration;
-import org.apache.continuum.model.repository.LocalRepository;
import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
-import org.apache.continuum.purge.ContinuumPurgeManager;
import org.apache.continuum.purge.PurgeConfigurationService;
import org.apache.continuum.repository.RepositoryService;
-import org.apache.continuum.taskqueue.manager.TaskQueueManager;
-import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.model.project.Schedule;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
@@ -49,11 +36,15 @@ import org.codehaus.redback.integration.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author
* @version $Id$
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="purge"
- * @since
*/
public class PurgeAction
extends ContinuumConfirmAction
@@ -70,7 +61,7 @@ public class PurgeAction
private static final String PURGE_DIRECTORY_RELEASES = "releases";
private static final String PURGE_DIRECTORY_BUILDOUTPUT = "buildOutput";
-
+
private static final String PURGE_DIRECTORY_WORKING = "working";
private Map<Integer, String> repositories;
@@ -80,7 +71,7 @@ public class PurgeAction
private List<RepositoryPurgeConfiguration> repoPurgeConfigs;
private List<DirectoryPurgeConfiguration> dirPurgeConfigs;
-
+
private List<DistributedDirectoryPurgeConfiguration> distributedDirPurgeConfigs;
private List<String> directoryTypes;
@@ -94,7 +85,7 @@ public class PurgeAction
* @plexus.requirement
*/
private RepositoryService repositoryService;
-
+
private Schedule sched = null;
public String display()
@@ -120,7 +111,7 @@ public class PurgeAction
addActionError( getText( errorMessage ) );
}
distributedDirPurgeConfigs = purgeConfigService.getAllDistributedDirectoryPurgeConfigurations();
-
+
return DISTRIBUTED_BUILD_SUCCESS;
}
else
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Mon Aug 13 04:29:09 2012
@@ -20,13 +20,6 @@ package org.apache.continuum.web.action.
*/
import com.opensymphony.xwork2.Preparable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.model.repository.AbstractPurgeConfiguration;
import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
@@ -50,6 +43,12 @@ import org.codehaus.redback.integration.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Maria Catherine Tan
* @version $Id$
@@ -301,7 +300,7 @@ public class PurgeConfigurationAction
purgeConfig = purgeConfigService.getPurgeConfiguration( purgeConfigId );
AuditLog event;
-
+
if ( purgeConfig instanceof RepositoryPurgeConfiguration )
{
RepositoryPurgeConfiguration repoPurge = (RepositoryPurgeConfiguration) purgeConfig;
@@ -627,8 +626,8 @@ public class PurgeConfigurationAction
{
if ( purgeConfig instanceof RepositoryPurgeConfiguration )
{
- RepositoryPurgeConfiguration repoPurge =
- purgeConfigService.getDefaultPurgeConfigurationForRepository( repositoryId );
+ RepositoryPurgeConfiguration repoPurge = purgeConfigService.getDefaultPurgeConfigurationForRepository(
+ repositoryId );
if ( repoPurge != null && repoPurge.getId() != purgeConfig.getId() )
{
@@ -638,8 +637,8 @@ public class PurgeConfigurationAction
}
else if ( purgeConfig instanceof DirectoryPurgeConfiguration )
{
- DirectoryPurgeConfiguration dirPurge =
- purgeConfigService.getDefaultPurgeConfigurationForDirectoryType( directoryType );
+ DirectoryPurgeConfiguration dirPurge = purgeConfigService.getDefaultPurgeConfigurationForDirectoryType(
+ directoryType );
if ( dirPurge != null && dirPurge.getId() != purgeConfig.getId() )
{
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,8 @@ package org.apache.continuum.web.startup
* under the License.
*/
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
+import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.maven.continuum.Continuum;
import org.codehaus.plexus.spring.PlexusToSpringUtils;
import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
@@ -32,18 +29,21 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 15 mars 2008
* @version $Id$
+ * @since 15 mars 2008
*/
public class ContinuumStartup
implements ServletContextListener
{
private Logger log = LoggerFactory.getLogger( getClass() );
-
- /**
+
+ /**
* @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
*/
public void contextDestroyed( ServletContextEvent sce )
@@ -52,35 +52,36 @@ public class ContinuumStartup
}
- /**
+ /**
* @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
*/
public void contextInitialized( ServletContextEvent sce )
{
- WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext( sce
- .getServletContext() );
+ WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(
+ sce.getServletContext() );
// to simulate Plexus load on start with Spring
Continuum continuum = (Continuum) wac.getBean( PlexusToSpringUtils.buildSpringId( Continuum.class ) );
- BuildsManager buildsManager = (BuildsManager) wac.getBean( PlexusToSpringUtils.buildSpringId( BuildsManager.class, "parallel" ) );
+ BuildsManager buildsManager = (BuildsManager) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ BuildsManager.class, "parallel" ) );
+
+ TaskQueueExecutor prepareRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ TaskQueueExecutor.class, "prepare-release" ) );
- TaskQueueExecutor prepareRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
- .buildSpringId( TaskQueueExecutor.class, "prepare-release" ) );
+ TaskQueueExecutor performRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ TaskQueueExecutor.class, "perform-release" ) );
- TaskQueueExecutor performRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
- .buildSpringId( TaskQueueExecutor.class, "perform-release" ) );
+ TaskQueueExecutor rollbackRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ TaskQueueExecutor.class, "rollback-release" ) );
- TaskQueueExecutor rollbackRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
- .buildSpringId( TaskQueueExecutor.class, "rollback-release" ) );
-
- TaskQueueExecutor purge = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
- .buildSpringId( TaskQueueExecutor.class, "purge" ) );
+ TaskQueueExecutor purge = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ TaskQueueExecutor.class, "purge" ) );
- TaskQueueExecutor prepareBuildProject = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
- .buildSpringId( TaskQueueExecutor.class, "prepare-build-project" ) );
+ TaskQueueExecutor prepareBuildProject = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils.buildSpringId(
+ TaskQueueExecutor.class, "prepare-build-project" ) );
- DistributedBuildManager distributedBuildManager = (DistributedBuildManager) wac.getBean( PlexusToSpringUtils
- .buildSpringId( DistributedBuildManager.class ) );
+ DistributedBuildManager distributedBuildManager = (DistributedBuildManager) wac.getBean(
+ PlexusToSpringUtils.buildSpringId( DistributedBuildManager.class ) );
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/AuditLog.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/AuditLog.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/AuditLog.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/AuditLog.java Mon Aug 13 04:29:09 2012
@@ -35,7 +35,7 @@ public class AuditLog
private String action;
private String category;
-
+
private String resource;
private String currentUser;
@@ -97,7 +97,7 @@ public class AuditLog
{
MDC.put( "security.currentUser", currentUser );
}
-
+
if ( resource != null )
{
if ( category != null )
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java Mon Aug 13 04:29:09 2012
@@ -1,12 +1,12 @@
package org.apache.continuum.web.util;
-import java.util.Map;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
import org.codehaus.plexus.util.StringUtils;
+import java.util.Map;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -37,7 +37,7 @@ public final class GenerateRecipentNotif
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public static String generate( ProjectNotifier notifier )
{
Map<String, String> configuration = notifier.getConfiguration();
@@ -63,11 +63,16 @@ public final class GenerateRecipentNotif
}
}
}
- if (StringUtils.isNotEmpty(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD))) {
- if (Boolean.parseBoolean(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD))) {
- if ("unknown".equals(recipent)) {
+ if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) ) )
+ {
+ if ( Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) ) )
+ {
+ if ( "unknown".equals( recipent ) )
+ {
recipent = "project developers";
- } else {
+ }
+ else
+ {
recipent += ", " + "project developers";
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildAction.java Mon Aug 13 04:29:09 2012
@@ -18,15 +18,15 @@
*/
package org.apache.maven.continuum.web.action;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.project.ContinuumProjectState;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.File;
-
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.project.builder.ContinuumProjectBuildingResult;
+import java.io.File;
+
/**
* Add a Maven 1 project to Continuum.
*
@@ -42,8 +42,9 @@ public class AddMavenOneProjectAction
boolean scmUseCache )
throws ContinuumException
{
- ContinuumProjectBuildingResult result = getContinuum().addMavenOneProject( pomUrl, selectedProjectGroup, checkProtocol, scmUseCache,
- this.getBuildDefinitionTemplateId() );
+ ContinuumProjectBuildingResult result = getContinuum().addMavenOneProject( pomUrl, selectedProjectGroup,
+ checkProtocol, scmUseCache,
+ this.getBuildDefinitionTemplateId() );
AuditLog event = new AuditLog( hidePasswordInUrl( pomUrl ), AuditLogConstants.ADD_M1_PROJECT );
event.setCategory( AuditLogConstants.PROJECT );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,18 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import org.apache.commons.io.FileUtils;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
@@ -41,12 +35,16 @@ import org.apache.maven.continuum.web.ex
import org.apache.struts2.interceptor.ServletRequestAware;
import org.codehaus.plexus.util.StringUtils;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
/**
* Action to add a Maven project to Continuum, either Maven 1 or Maven 2.
@@ -123,7 +121,7 @@ public abstract class AddMavenProjectAct
configurationManager.addContainerProvider( new XWorkConfigurationProvider() );
com.opensymphony.xwork2.config.Configuration config = configurationManager.getConfiguration();
Container container = config.getContainer();
-
+
ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack();
stack.getContext().put( ActionContext.CONTAINER, container );
ActionContext.setContext( new ActionContext( stack.getContext() ) );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
import org.apache.maven.continuum.ContinuumException;
@@ -34,6 +29,11 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
/**
* Add a Maven 2 project to Continuum.
*
@@ -51,7 +51,7 @@ public class AddMavenTwoProjectAction
public static final String ERROR_READING_POM_EXCEPTION_MESSAGE = "Error reading POM";
public static final String FILE_SCHEME = "file:/";
-
+
private String checkoutOption;
protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol,
@@ -59,7 +59,7 @@ public class AddMavenTwoProjectAction
throws ContinuumException
{
ContinuumProjectBuildingResult result = null;
-
+
// TODO: remove this part once uploading of an m2 project with modules is supported ( CONTINUUM-1098 )
if ( !checkProtocol )
{
@@ -103,16 +103,16 @@ public class AddMavenTwoProjectAction
throw new ContinuumException( ERROR_READING_POM_EXCEPTION_MESSAGE, e );
}
}
-
+
boolean nonRecursiveProject;
boolean checkoutInSingleDirectory;
-
- if( "checkoutInSingleDirectory".equals( checkoutOption ) )
+
+ if ( "checkoutInSingleDirectory".equals( checkoutOption ) )
{
checkoutInSingleDirectory = true;
nonRecursiveProject = false;
}
- else if( "nonRecursiveProject".equals( checkoutOption ) )
+ else if ( "nonRecursiveProject".equals( checkoutOption ) )
{
checkoutInSingleDirectory = false;
nonRecursiveProject = true;
@@ -126,8 +126,7 @@ public class AddMavenTwoProjectAction
if ( result == null )
{
result = getContinuum().addMavenTwoProject( pomUrl, selectedProjectGroup, checkProtocol, scmUseCache,
- !nonRecursiveProject,
- this.getBuildDefinitionTemplateId(),
+ !nonRecursiveProject, this.getBuildDefinitionTemplateId(),
checkoutInSingleDirectory );
}
@@ -143,7 +142,7 @@ public class AddMavenTwoProjectAction
event.log();
return result;
}
-
+
/**
* @deprecated Use {@link #getPomFile()} instead
*/
@@ -175,7 +174,7 @@ public class AddMavenTwoProjectAction
{
setPomUrl( pomUrl );
}
-
+
public String getCheckoutOption()
{
return checkoutOption;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
@@ -39,12 +41,9 @@ import org.codehaus.plexus.util.StringUt
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
/**
* @author Nick Gonzalez
@@ -102,7 +101,7 @@ public class AddProjectAction
{
initializeProjectGroupName();
initializeActionContext();
-
+
try
{
if ( StringUtils.isEmpty( getProjectGroupName() ) )
@@ -152,7 +151,8 @@ public class AddProjectAction
if ( projectDescription != null )
{
- project.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml( projectDescription.trim() ) ) );
+ project.setDescription( StringEscapeUtils.escapeXml( StringEscapeUtils.unescapeXml(
+ projectDescription.trim() ) ) );
}
project.setVersion( versionTrim );
@@ -248,7 +248,7 @@ public class AddProjectAction
configurationManager.addContainerProvider( new XWorkConfigurationProvider() );
com.opensymphony.xwork2.config.Configuration config = configurationManager.getConfiguration();
Container container = config.getContainer();
-
+
ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack();
stack.getContext().put( ActionContext.CONTAINER, container );
ActionContext.setContext( new ActionContext( stack.getContext() ) );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.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.List;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.continuum.repository.RepositoryServiceException;
@@ -32,6 +30,8 @@ import org.apache.maven.continuum.web.ex
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
/**
* @author Henry Isidro <hi...@exist.com>
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProjectGroup"
@@ -131,8 +131,9 @@ public class AddProjectGroupAction
return ERROR;
}
-
- AuditLog event = new AuditLog( "Project Group id=" + projectGroup.getId(), AuditLogConstants.ADD_PROJECT_GROUP );
+
+ AuditLog event = new AuditLog( "Project Group id=" + projectGroup.getId(),
+ AuditLogConstants.ADD_PROJECT_GROUP );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
event.log();
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,9 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-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;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
@@ -38,11 +35,14 @@ import org.apache.maven.continuum.profil
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.continuum.web.exception.ContinuumActionException;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.continuum.web.util.AuditLog;
-import org.apache.continuum.web.util.AuditLogConstants;
import org.codehaus.plexus.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* BuildDefinitionAction:
*
@@ -94,9 +94,9 @@ public class BuildDefinitionAction
private String buildDefinitionType;
private boolean alwaysBuild;
-
+
private int updatePolicy = BuildDefinitionUpdatePolicyConstants.UPDATE_DESCRIPTION_ALWAYS;
-
+
private Map<Integer, String> buildDefinitionUpdatePolicies;
/**
@@ -133,7 +133,7 @@ public class BuildDefinitionAction
buildDefinitionTypes.add( ContinuumBuildExecutorConstants.MAVEN_ONE_BUILD_EXECUTOR );
buildDefinitionTypes.add( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR );
buildDefinitionTypes.add( ContinuumBuildExecutorConstants.SHELL_BUILD_EXECUTOR );
-
+
buildDefinitionUpdatePolicies = new HashMap<Integer, String>();
String text = getText( "buildDefinition.updatePolicy.always" );
buildDefinitionUpdatePolicies.put( BuildDefinitionUpdatePolicyConstants.UPDATE_DESCRIPTION_ALWAYS, text );
@@ -306,7 +306,7 @@ public class BuildDefinitionAction
{
AuditLog event = null;
- String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
+ String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
try
{
@@ -388,7 +388,7 @@ public class BuildDefinitionAction
if ( projectId != 0 )
{
- String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
+ String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
AuditLog event = null;
if ( buildDefinitionId == 0 )
{
@@ -432,8 +432,8 @@ public class BuildDefinitionAction
if ( confirmed )
{
getContinuum().removeBuildDefinitionFromProject( projectId, buildDefinitionId );
-
- String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
+
+ String resource = "Project id=" + projectId + ":" + goals + " " + arguments;
AuditLog event = new AuditLog( resource, AuditLogConstants.REMOVE_GOAL );
event.setCategory( AuditLogConstants.BUILD_DEFINITION );
event.setCurrentUser( getPrincipal() );
@@ -466,8 +466,8 @@ public class BuildDefinitionAction
if ( confirmed )
{
getContinuum().removeBuildDefinitionFromProjectGroup( projectGroupId, buildDefinitionId );
-
- String resource = "Project Group id=" + projectGroupId + ":" + goals + " " + arguments;
+
+ String resource = "Project Group id=" + projectGroupId + ":" + goals + " " + arguments;
AuditLog event = new AuditLog( resource, AuditLogConstants.REMOVE_GOAL );
event.setCategory( AuditLogConstants.BUILD_DEFINITION );
event.setCurrentUser( getPrincipal() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.continuum.buildagent.NoBuildAgentException;
import org.apache.continuum.buildagent.NoBuildAgentInGroupException;
import org.apache.continuum.utils.build.BuildTrigger;
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.model.project.ProjectGroup;
+import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -61,7 +61,7 @@ public class BuildProjectAction
{
return REQUIRES_AUTHORIZATION;
}
-
+
BuildTrigger buildTrigger = new BuildTrigger( ContinuumProjectState.TRIGGER_FORCED, getPrincipal() );
try
@@ -70,24 +70,25 @@ public class BuildProjectAction
{
if ( buildDefinitionId > 0 )
{
- getContinuum().buildProjectWithBuildDefinition( projectId, buildDefinitionId, buildTrigger );
+ getContinuum().buildProjectWithBuildDefinition( projectId, buildDefinitionId, buildTrigger );
}
else
{
- getContinuum().buildProject( projectId, buildTrigger.getTriggeredBy() );
+ getContinuum().buildProject( projectId, buildTrigger.getTriggeredBy() );
}
}
else
{
if ( buildDefinitionId > 0 )
{
- getContinuum().buildProjectGroupWithBuildDefinition( projectGroupId, buildDefinitionId, buildTrigger );
+ getContinuum().buildProjectGroupWithBuildDefinition( projectGroupId, buildDefinitionId,
+ buildTrigger );
}
else
{
//TODO: Check if this code is called, I don't think
//If it is, it should used the projectId
- getContinuum().buildProjects( buildTrigger.getTriggeredBy() );
+ getContinuum().buildProjects( buildTrigger.getTriggeredBy() );
}
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Mon Aug 13 04:29:09 2012
@@ -19,20 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.builder.utils.ContinuumBuildConstant;
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
-import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.configuration.ConfigurationService;
@@ -46,6 +38,12 @@ import org.apache.struts2.ServletActionC
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -119,8 +117,8 @@ public class BuildResultAction
if ( ServletActionContext.getRequest() != null )
{
- state =
- StateGenerator.generate( buildResult.getState(), ServletActionContext.getRequest().getContextPath() );
+ state = StateGenerator.generate( buildResult.getState(),
+ ServletActionContext.getRequest().getContextPath() );
}
}
changeSet = null;
@@ -134,8 +132,7 @@ public class BuildResultAction
buildResult = getContinuum().getBuildResult( getBuildId() );
// directory contains files ?
- File surefireReportsDirectory =
- configuration.getTestReportsDirectory( buildId, getProjectId() );
+ File surefireReportsDirectory = configuration.getTestReportsDirectory( buildId, getProjectId() );
File[] files = surefireReportsDirectory.listFiles();
hasSurefireResults = files != null && files.length > 0;
changeSet = getContinuum().getChangesSinceLastSuccess( getProjectId(), getBuildId() );
@@ -144,8 +141,8 @@ public class BuildResultAction
if ( ServletActionContext.getRequest() != null )
{
- state =
- StateGenerator.generate( buildResult.getState(), ServletActionContext.getRequest().getContextPath() );
+ state = StateGenerator.generate( buildResult.getState(),
+ ServletActionContext.getRequest().getContextPath() );
}
this.setCanDelete( this.canRemoveBuildResult( buildResult ) );
@@ -180,8 +177,8 @@ public class BuildResultAction
}
catch ( ContinuumException e )
{
- addActionError( getText( "buildResult.delete.error", "Unable to delete build result",
- new Integer( buildId ).toString() ) );
+ addActionError( getText( "buildResult.delete.error", "Unable to delete build result", new Integer(
+ buildId ).toString() ) );
}
catch ( BuildManagerException e )
{
@@ -192,7 +189,7 @@ public class BuildResultAction
event.setCategory( AuditLogConstants.BUILD_RESULT );
event.setCurrentUser( getPrincipal() );
event.log();
-
+
return SUCCESS;
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.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.Collection;
-import java.util.List;
-
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.web.util.AuditLog;
import org.apache.continuum.web.util.AuditLogConstants;
@@ -34,6 +30,10 @@ import org.codehaus.plexus.util.StringUt
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -102,7 +102,8 @@ public class BuildResultsListAction
getContinuum().removeBuildResult( buildId );
- AuditLog event = new AuditLog( "Build Result id=" + buildId, AuditLogConstants.REMOVE_BUILD_RESULT );
+ AuditLog event = new AuditLog( "Build Result id=" + buildId,
+ AuditLogConstants.REMOVE_BUILD_RESULT );
event.setCategory( AuditLogConstants.BUILD_RESULT );
event.setCurrentUser( getPrincipal() );
event.log();
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.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.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.continuum.buildmanager.BuildManagerException;
import org.apache.continuum.buildmanager.BuildsManager;
@@ -39,6 +33,12 @@ import org.codehaus.plexus.util.StringUt
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -122,7 +122,7 @@ public class CancelBuildAction
{
BuildsManager parallelBuildsManager = getContinuum().getBuildsManager();
parallelBuildsManager.removeProjectsFromBuildQueue( projectsId );
-
+
try
{
// now we must check if the current build is one of this
@@ -131,13 +131,13 @@ public class CancelBuildAction
{
int projId = projectsId[index];
getContinuum().getBuildsManager().cancelBuild( projId );
-
+
AuditLog event = new AuditLog( "Project id=" + projId, AuditLogConstants.CANCEL_BUILD );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
event.log();
}
-
+
}
catch ( BuildManagerException e )
{
@@ -195,16 +195,16 @@ public class CancelBuildAction
}
}
Collection<Project> projects = getContinuum().getProjectsInGroup( projectGroupId );
-
+
List<String> projectIds = new ArrayList<String>();
-
+
for ( Project project : projects )
{
projectIds.add( Integer.toString( project.getId() ) );
}
-
+
setSelectedProjects( projectIds );
-
+
return cancelBuilds();
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Mon Aug 13 04:29:09 2012
@@ -21,10 +21,6 @@ package org.apache.maven.continuum.web.a
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.Preparable;
-
-import java.text.SimpleDateFormat;
-import java.util.ResourceBundle;
-
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
@@ -37,6 +33,9 @@ import org.codehaus.plexus.redback.users
import org.codehaus.plexus.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils;
+import java.text.SimpleDateFormat;
+import java.util.ResourceBundle;
+
/**
* ContinuumActionSupport
*
@@ -68,7 +67,7 @@ public class ContinuumActionSupport
* @plexus.requirement
*/
private Continuum continuum;
-
+
protected final SimpleDateFormat dateFormatter = new SimpleDateFormat( "MMM dd, yyyy hh:mm:ss aaa z" );
public void prepare()
@@ -76,8 +75,8 @@ public class ContinuumActionSupport
{
if ( securitySession == null )
{
- securitySession =
- (SecuritySession) getContext().getSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY );
+ securitySession = (SecuritySession) getContext().getSession().get(
+ SecuritySystemConstants.SECURITY_SESSION_KEY );
}
}
@@ -492,7 +491,7 @@ public class ContinuumActionSupport
{
checkAuthorization( ContinuumRoleConstants.CONTINUUM_VIEW_REPORT );
}
-
+
/**
* Get the security session
*
@@ -552,11 +551,11 @@ public class ContinuumActionSupport
{
return getTexts( "localization/Continuum" );
}
-
+
protected String getPrincipal()
{
String principal = "guest";
-
+
if ( getSecuritySession() != null )
{
if ( getSecuritySession().getUser() != null )
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Mon Aug 13 04:29:09 2012
@@ -57,7 +57,7 @@ public class DeleteProjectAction
{
return REQUIRES_AUTHORIZATION;
}
-
+
AuditLog event = new AuditLog( "Project id=" + projectId, AuditLogConstants.REMOVE_PROJECT );
event.setCurrentUser( getPrincipal() );
event.setCategory( AuditLogConstants.PROJECT );
@@ -70,8 +70,8 @@ public class DeleteProjectAction
catch ( ContinuumException e )
{
logger.error( "Error removing project with id " + projectId, e );
- addActionError( getText( "deleteProject.error", "Unable to delete project",
- new Integer( projectId ).toString() ) );
+ addActionError( getText( "deleteProject.error", "Unable to delete project", new Integer(
+ projectId ).toString() ) );
}
return SUCCESS;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.model.project.ProjectGroupSummary;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectGroup;
@@ -32,6 +27,11 @@ 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.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$