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/13 07:46:30 UTC
svn commit: r1673110 - in /continuum/trunk:
continuum-core/src/main/java/org/apache/maven/continuum/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/
continuum-webapp/src/main/resources/localization/
Author: batkinson
Date: Mon Apr 13 05:46:30 2015
New Revision: 1673110
URL: http://svn.apache.org/r1673110
Log:
[CONTINUUM-2750] Failing to remove a group should include more detailed info
Modified:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=1673110&r1=1673109&r2=1673110&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Apr 13 05:46:30 2015
@@ -334,30 +334,30 @@ public class DefaultContinuum
if ( parallelBuildsManager.isAnyProjectCurrentlyBeingCheckedOut( projectIds ) )
{
throw new ContinuumException(
- "Unable to delete group. At least one project in group is still being checked out." );
+ "unable to remove group while project is being checked out" );
}
if ( parallelBuildsManager.isAnyProjectCurrentlyPreparingBuild( projectIds ) )
{
throw new ContinuumException(
- "Unable to delete group. The project group is still preparing build." );
+ "unable to remove group while build is being prepared" );
}
if ( parallelBuildsManager.isAnyProjectCurrentlyBuilding( projectIds ) )
{
throw new ContinuumException(
- "Unable to delete group. At least one project in group is still building." );
+ "unable to remove group while project is building" );
}
if ( isAnyProjectsInReleaseStage( projects ) )
{
throw new ContinuumException(
- "Unable to delete group. At least one project in group is in release stage" );
+ "unable to remove group while project is being released" );
}
}
catch ( BuildManagerException e )
{
- throw new ContinuumException( "Unable to delete group.", e );
+ throw new ContinuumException( e.getMessage() );
}
for ( int projectId : projectIds )
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=1673110&r1=1673109&r2=1673110&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Mon Apr 13 05:46:30 2015
@@ -313,8 +313,8 @@ public class ProjectGroupAction
catch ( ContinuumException e )
{
logger.error( "Error while removing project group with id " + projectGroupId, e );
- addActionError( getText( "projectGroup.delete.error", "Unable to remove project group", Integer.toString(
- projectGroupId ) ) );
+ addActionError( getText( "projectGroup.delete.error",
+ new String[] { Integer.toString( projectGroupId ), e.getMessage() } ) );
}
AuditLog event = new AuditLog( "Project Group id=" + projectGroupId, AuditLogConstants.REMOVE_PROJECT_GROUP );
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=1673110&r1=1673109&r2=1673110&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 13 05:46:30 2015
@@ -253,7 +253,7 @@ confirmGroupRemoval.confirmation.message
# ----------------------------------------------------------------------
# Page: Delete Project Group
# ----------------------------------------------------------------------
-projectGroup.delete.error = Unable to remove project group
+projectGroup.delete.error = Unable to remove project group id={0}: {1}
# ----------------------------------------------------------------------
# Page: Configuration