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:40 UTC
svn commit: r1671654 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/continuum/web/action/admin/ resources/
resources/localization/ webapp/WEB-INF/jsp/admin/
Author: batkinson
Date: Mon Apr 6 19:00:40 2015
New Revision: 1671654
URL: http://svn.apache.org/r1671654
Log:
Simplified and expanded purge action message handling.
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/resources/struts.xml
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
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=1671654&r1=1671653&r2=1671654&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 Apr 6 19:00:40 2015
@@ -77,8 +77,6 @@ public class DistributedPurgeConfigurati
private String description;
- private String message;
-
private boolean deleteAll;
private boolean deleteReleasedSnapshots;
@@ -257,15 +255,12 @@ public class DistributedPurgeConfigurati
public String remove()
throws Exception
{
- if ( confirmed )
- {
- purgeConfigService.removePurgeConfiguration( purgeConfigId );
- }
- else
+ if ( !confirmed )
{
return CONFIRM;
}
-
+ purgeConfigService.removePurgeConfiguration( purgeConfigId );
+ addActionMessage( getText( "purgeConfig.removeSuccess" ) );
return SUCCESS;
}
@@ -288,6 +283,12 @@ public class DistributedPurgeConfigurati
(DistributedRepositoryPurgeConfiguration) purgeConfig;
purgeManager.purgeDistributedRepository( repoPurge );
}
+ else
+ {
+ addActionError( getText( "purgeConfig.unknownType" ) );
+ return ERROR;
+ }
+ addActionMessage( getText( "purgeConfig.purgeSuccess" ) );
}
return SUCCESS;
@@ -323,16 +324,6 @@ public class DistributedPurgeConfigurati
this.description = description;
}
- public String getMessage()
- {
- return this.message;
- }
-
- public void setMessage( String message )
- {
- this.message = message;
- }
-
public boolean isDeleteAll()
{
return this.deleteAll;
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=1671654&r1=1671653&r2=1671654&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:40 2015
@@ -35,7 +35,6 @@ import org.apache.maven.continuum.config
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;
@@ -77,8 +76,6 @@ public class PurgeConfigurationAction
private String description;
- private String message;
-
private boolean deleteAll;
private boolean deleteReleasedSnapshots;
@@ -216,16 +213,8 @@ public class PurgeConfigurationAction
public String list()
throws Exception
{
- String errorMessage = ServletActionContext.getRequest().getParameter( "errorMessage" );
-
- if ( errorMessage != null )
- {
- addActionError( getText( errorMessage ) );
- }
-
repoPurgeConfigs = purgeConfigService.getAllRepositoryPurgeConfigurations();
dirPurgeConfigs = purgeConfigService.getAllDirectoryPurgeConfigurations();
-
return SUCCESS;
}
@@ -271,15 +260,12 @@ public class PurgeConfigurationAction
public String remove()
throws Exception
{
- if ( confirmed )
- {
- purgeConfigService.removePurgeConfiguration( purgeConfigId );
- }
- else
+ if ( !confirmed )
{
return CONFIRM;
}
-
+ purgeConfigService.removePurgeConfiguration( purgeConfigId );
+ addActionMessage( getText( "purgeConfig.removeSuccess" ) );
return SUCCESS;
}
@@ -302,7 +288,7 @@ public class PurgeConfigurationAction
// check if repository is in use
if ( taskQueueManager.isRepositoryInUse( repoPurge.getRepository().getId() ) )
{
- message = "repository.error.purge.in.use";
+ addActionError( getText( "repository.error.purge.in.use" ) );
return ERROR;
}
@@ -311,7 +297,7 @@ public class PurgeConfigurationAction
event = new AuditLog( repoPurge.getRepository().getName(), AuditLogConstants.PURGE_LOCAL_REPOSITORY );
event.setCategory( AuditLogConstants.LOCAL_REPOSITORY );
}
- else
+ else if ( purgeConfig instanceof DirectoryPurgeConfiguration )
{
DirectoryPurgeConfiguration dirPurge = (DirectoryPurgeConfiguration) purgeConfig;
purgeManager.purgeDirectory( dirPurge );
@@ -327,11 +313,16 @@ public class PurgeConfigurationAction
event.setCategory( AuditLogConstants.DIRECTORY );
}
+ else
+ {
+ addActionError( getText( "purgeConfig.unknownType" ) );
+ return ERROR;
+ }
+ addActionMessage( getText( "purgeConfig.purgeSuccess" ) );
event.setCurrentUser( getPrincipal() );
event.log();
}
-
return SUCCESS;
}
@@ -365,16 +356,6 @@ public class PurgeConfigurationAction
this.description = description;
}
- public String getMessage()
- {
- return this.message;
- }
-
- public void setMessage( String message )
- {
- this.message = message;
- }
-
public boolean isDeleteAll()
{
return this.deleteAll;
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1671654&r1=1671653&r2=1671654&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Mon Apr 6 19:00:40 2015
@@ -1062,6 +1062,10 @@ purgeConfig.enabled.label = Enabled Purg
purgeConfig.no.repositories = No repositories to purge
purgeConfig.buildAgent.label = Build Agent
+purgeConfig.removeSuccess = Successfully removed purge configuration.
+purgeConfig.unknownType = Unknown purge configuration type.
+purgeConfig.purgeSuccess = Purge successfully requested.
+
#-----------------------------------------------------------------------
# Page: Delete Purge Configuration
#-----------------------------------------------------------------------
Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=1671654&r1=1671653&r2=1671654&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Mon Apr 6 19:00:40 2015
@@ -1106,6 +1106,7 @@
* Purge actions
-->
<action name="displayPurge" class="purge" method="display">
+ <interceptor-ref name="retrieveStack" />
<result name="success">/WEB-INF/jsp/admin/purgeConfigurationsList.jsp</result>
<result name="distributed-build-success">/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp</result>
</action>
@@ -1114,6 +1115,7 @@
* Parallel Purge Actions
-->
<action name="purgeConfigList" class="purgeConfiguration" method="list">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/admin/purgeConfigurationsList.jsp</result>
</action>
@@ -1130,9 +1132,9 @@
</action>
<action name="removePurgeConfig" class="purgeConfiguration" method="remove">
+ <interceptor-ref name="storeStack"/>
<result name="error" type="redirectAction">
<param name="actionName">purgeConfigList</param>
- <param name="errorMessage">${message}</param>
</result>
<result name="confirm">/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp</result>
<result name="success" type="redirectAction">
@@ -1144,12 +1146,12 @@
</action>
<action name="doPurge" class="purgeConfiguration" method="purge">
+ <interceptor-ref name="storeStack" />
<result name="success" type="redirectAction">
<param name="actionName">displayPurge</param>
</result>
<result name="error" type="redirectAction">
<param name="actionName">displayPurge</param>
- <param name="errorMessage">${message}</param>
</result>
</action>
@@ -1169,9 +1171,9 @@
</action>
<action name="removeDistributedPurgeConfig" class="distributedPurgeConfiguration" method="remove">
+ <interceptor-ref name="storeStack"/>
<result name="error" type="redirectAction">
<param name="actionName">purgeConfigList</param>
- <param name="errorMessage">${message}</param>
</result>
<result name="confirm">/WEB-INF/jsp/admin/confirmDeleteDistributedPurgeConfiguration.jsp</result>
<result name="success" type="redirectAction">
@@ -1183,12 +1185,12 @@
</action>
<action name="doDistributedPurge" class="distributedPurgeConfiguration" method="purge">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirectAction">
<param name="actionName">displayPurge</param>
</result>
<result name="error" type="redirectAction">
<param name="actionName">displayPurge</param>
- <param name="errorMessage">${message}</param>
</result>
</action>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp?rev=1671654&r1=1671653&r2=1671654&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp Mon Apr 6 19:00:40 2015
@@ -31,9 +31,12 @@
<h3><s:text name="purgeConfigs.repo.section.title"/></h3>
<s:if test="hasActionErrors()">
<div class="errormessage">
- <s:iterator value="actionErrors">
- <p><s:property/></p>
- </s:iterator>
+ <s:actionerror/>
+ </div>
+ </s:if>
+ <s:if test="hasActionMessages()">
+ <div class="warningmessage">
+ <s:actionmessage/>
</div>
</s:if>
<s:set name="repoPurgeConfigs" value="distributedRepoPurgeConfigs" scope="request"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=1671654&r1=1671653&r2=1671654&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Mon Apr 6 19:00:40 2015
@@ -31,9 +31,12 @@
<h3><s:text name="purgeConfigs.repo.section.title"/></h3>
<s:if test="hasActionErrors()">
<div class="errormessage">
- <s:iterator value="actionErrors">
- <p><s:property/></p>
- </s:iterator>
+ <s:actionerror/>
+ </div>
+ </s:if>
+ <s:if test="hasActionMessages()">
+ <div class="warningmessage">
+ <s:actionmessage/>
</div>
</s:if>
<s:set name="repoPurgeConfigs" value="repoPurgeConfigs" scope="request"/>