You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/06 21:00:35 UTC
svn commit: r1671653 - in
/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin:
PurgeAction.java PurgeConfigurationAction.java
Author: batkinson
Date: Mon Apr 6 19:00:34 2015
New Revision: 1671653
URL: http://svn.apache.org/r1671653
Log:
Cleaned up cruft from purge actions.
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeAction.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
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=1671653&r1=1671652&r2=1671653&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 Apr 6 19:00:34 2015
@@ -25,44 +25,28 @@ import org.apache.continuum.model.reposi
import org.apache.continuum.model.repository.DistributedRepositoryPurgeConfiguration;
import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
import org.apache.continuum.purge.PurgeConfigurationService;
-import org.apache.continuum.repository.RepositoryService;
import org.apache.maven.continuum.model.project.Schedule;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
-import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.redback.rbac.Resource;
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.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-@Component( role = com.opensymphony.xwork2.Action.class, hint = "purge", instantiationStrategy = "per-lookup" )
+@Component( role = com.opensymphony.xwork2.Action.class, hint = "purge", instantiationStrategy = "per-lookup" )
public class PurgeAction
extends ContinuumConfirmAction
implements Preparable, SecureAction
{
- private static final Logger logger = LoggerFactory.getLogger( PurgeConfigurationAction.class );
-
private static final String DISTRIBUTED_BUILD_SUCCESS = "distributed-build-success";
- private static final String PURGE_TYPE_REPOSITORY = "repository";
-
- private static final String PURGE_TYPE_DIRECTORY = "directory";
-
- 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;
private Map<Integer, String> schedules;
@@ -80,51 +64,32 @@ public class PurgeAction
@Requirement
private PurgeConfigurationService purgeConfigService;
- @Requirement
- private RepositoryService repositoryService;
-
- private Schedule sched = null;
-
- public String display()
+ @Override
+ public void prepare()
throws Exception
{
- if ( schedules == null )
+ super.prepare();
+ schedules = new HashMap<Integer, String>();
+ Collection<Schedule> allSchedules = getContinuum().getSchedules();
+ for ( Schedule schedule : allSchedules )
{
- schedules = new HashMap<Integer, String>();
-
- Collection<Schedule> allSchedules = getContinuum().getSchedules();
-
- for ( Schedule schedule : allSchedules )
- {
- schedules.put( schedule.getId(), schedule.getName() );
- }
+ schedules.put( schedule.getId(), schedule.getName() );
}
+ }
+
+ public String display()
+ throws Exception
+ {
if ( getContinuum().getConfiguration().isDistributedBuildEnabled() )
{
- String errorMessage = ServletActionContext.getRequest().getParameter( "errorMessage" );
-
- if ( errorMessage != null )
- {
- addActionError( getText( errorMessage ) );
- }
distributedDirPurgeConfigs = purgeConfigService.getAllDistributedDirectoryPurgeConfigurations();
distributedRepoPurgeConfigs = purgeConfigService.getAllDistributedRepositoryPurgeConfigurations();
-
return DISTRIBUTED_BUILD_SUCCESS;
}
else
{
-
- String errorMessage = ServletActionContext.getRequest().getParameter( "errorMessage" );
-
- if ( errorMessage != null )
- {
- addActionError( getText( errorMessage ) );
- }
-
repoPurgeConfigs = purgeConfigService.getAllRepositoryPurgeConfigurations();
dirPurgeConfigs = purgeConfigService.getAllDirectoryPurgeConfigurations();
-
return SUCCESS;
}
}
@@ -135,7 +100,6 @@ public class PurgeAction
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_PURGING, Resource.GLOBAL );
-
return bundle;
}
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=1671653&r1=1671652&r2=1671653&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 Apr 6 19:00:34 2015
@@ -42,8 +42,6 @@ import org.codehaus.plexus.redback.rbac.
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.Collection;
@@ -60,7 +58,6 @@ public class PurgeConfigurationAction
extends ContinuumConfirmAction
implements Preparable, SecureAction
{
- private static final Logger logger = LoggerFactory.getLogger( PurgeConfigurationAction.class );
private static final String PURGE_TYPE_REPOSITORY = "repository";