You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2006/08/31 00:07:04 UTC
svn commit: r438668 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ resources/ webapp/
Author: jmcconnell
Date: Wed Aug 30 15:07:04 2006
New Revision: 438668
URL: http://svn.apache.org/viewvc?rev=438668&view=rev
Log:
aline build definition removal with the other two confirmed removal processes and remove a couple of extra actions I didn't really need
Added:
maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp (contents, props changed)
- copied, changed from r438617, maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteBuildDefinition.jsp
Removed:
maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteBuildDefinition.jsp
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=438668&r1=438667&r2=438668&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Wed Aug 30 15:07:04 2006
@@ -38,7 +38,6 @@
public class BuildDefinitionAction
extends ContinuumActionSupport
{
- public static final String CONFIRM = "confirm";
private int buildDefinitionId;
@@ -98,9 +97,8 @@
* @return action result
*/
public String input()
+ throws ContinuumException
{
- try
- {
if ( executor == null )
{
if ( projectId != 0 )
@@ -111,39 +109,23 @@
{
Project project = (Project) getContinuum().getProjectGroup( projectGroupId ).getProjects().get( 0 );
executor = project.getExecutorId();
-
}
-
- }
- }
- catch ( ContinuumException e )
- {
- addActionError( "error determining executor type" );
- return ERROR;
}
if ( buildDefinitionId != 0 )
{
- try
- {
- BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId );
- goals = buildDefinition.getGoals();
- arguments = buildDefinition.getArguments();
- buildFile = buildDefinition.getBuildFile();
- defaultBuildDefinition = buildDefinition.isDefaultForProject();
-
- }
- catch ( ContinuumException ce )
- {
- addActionError( "error getting build id" );
- return ERROR;
- }
+ BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId );
+ goals = buildDefinition.getGoals();
+ arguments = buildDefinition.getArguments();
+ buildFile = buildDefinition.getBuildFile();
+ defaultBuildDefinition = buildDefinition.isDefaultForProject();
}
return INPUT;
}
public String saveToProject()
+ throws ContinuumException
{
try
@@ -162,17 +144,12 @@
addActionError( cae.getMessage() );
return INPUT;
}
- catch ( ContinuumException ce )
- {
- getLogger().info("error saving project build definition", ce);
- addActionError( "error saving project build definition" );
- return ERROR;
- }
return SUCCESS;
}
public String saveToGroup()
+ throws ContinuumException
{
try
{
@@ -190,55 +167,33 @@
addActionError( cae.getMessage() );
return INPUT;
}
- catch ( ContinuumException ce )
- {
- getLogger().info("error saving group build definition", ce);
- addActionError( "error saving group build definition" );
- return ERROR;
- }
return SUCCESS;
}
public String removeFromProject()
+ throws ContinuumException
{
if ( confirmed )
{
- try
- {
- getContinuum().removeBuildDefinitionFromProject( projectId, buildDefinitionId );
+ getContinuum().removeBuildDefinitionFromProject( projectId, buildDefinitionId );
- return SUCCESS;
- }
- catch ( ContinuumException ce )
- {
- getLogger().info("error removing build definition from project", ce);
- addActionError( "error removing build definition from project" );
- return ERROR;
- }
+ return SUCCESS;
}
else
- {
+ {
return CONFIRM;
}
}
public String removeFromProjectGroup()
+ throws ContinuumException
{
if ( confirmed )
{
- try
- {
- getContinuum().removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
+ getContinuum().removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
- return SUCCESS;
- }
- catch ( ContinuumException ce )
- {
- getLogger().info("error removing build definition from project group", ce);
- addActionError( "error removing build definition from project group" );
- return ERROR;
- }
+ return SUCCESS;
}
else
{
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=438668&r1=438667&r2=438668&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Wed Aug 30 15:07:04 2006
@@ -64,12 +64,6 @@
return summary();
}
- public String confirm()
- throws ContinuumException
- {
- return summary();
- }
-
public String remove()
throws ContinuumException
{
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=438668&r1=438667&r2=438668&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Wed Aug 30 15:07:04 2006
@@ -142,6 +142,7 @@
}
else
{
+ schedule = getContinuum().getSchedule( id );
return CONFIRM;
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=438668&r1=438667&r2=438668&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Aug 30 15:07:04 2006
@@ -173,8 +173,8 @@
</action>
<action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromGroup">
- <result name="confirm">deleteBuildDefinition.jsp</result>
- <result name="success" type="chain">projectGroupView</result>
+ <result name="confirm">confirmBuildDefinitionRemoval.jsp</result>
+ <result name="success" type="chain">projectGroupBuildDefinition</result>
</action>
@@ -202,14 +202,10 @@
</action>
<action name="removeProjectGroup" class="projectGroup" method="remove">
- <result name="confirm" type="chain">confirmGroupRemoval</result>
+ <result name="confirm">confirmGroupRemoval.jsp</result>
<result name="success" type="chain">groupSummary</result>
</action>
- <action name="confirmGroupRemoval" class="projectGroup" method="confirm">
- <result name="success">confirmGroupRemoval.jsp</result>
- </action>
-
<!--
* notifier actions
-->
@@ -298,13 +294,10 @@
</action>
<action name="removeSchedule" class="schedule" method="remove">
- <result name="confirm" type="chain">confirmScheduleRemoval</result>
+ <result name="confirm">confirmScheduleRemoval.jsp</result>
<result name="success" type="chain">schedules</result>
</action>
- <action name="confirmScheduleRemoval" class="schedule" method="confirm">
- <result name="success">confirmScheduleRemoval.jsp</result>
- </action>
</package>
Copied: maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp (from r438617, maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteBuildDefinition.jsp)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp?p2=maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp&p1=maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteBuildDefinition.jsp&r1=438617&r2=438668&rev=438668&view=diff
==============================================================================
(empty)
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"