Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CD22DC0F for ; Wed, 15 Aug 2012 06:03:23 +0000 (UTC) Received: (qmail 58751 invoked by uid 500); 15 Aug 2012 06:03:23 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 57374 invoked by uid 500); 15 Aug 2012 06:03:18 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 57331 invoked by uid 99); 15 Aug 2012 06:03:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 06:03:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 06:03:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CFDD323888FD for ; Wed, 15 Aug 2012 06:02:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1373221 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/continuum/web/action/admin/BuildAgentAction.java resources/localization/Continuum.properties Date: Wed, 15 Aug 2012 06:02:31 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120815060231.CFDD323888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Aug 15 06:02:31 2012 New Revision: 1373221 URL: http://svn.apache.org/viewvc?rev=1373221&view=rev Log: improve error message when a build agent group can't be deleted Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties 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=1373221&r1=1373220&r2=1373221&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 Wed Aug 15 06:02:31 2012 @@ -169,8 +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 ) { @@ -261,8 +261,8 @@ public class BuildAgentAction 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(); @@ -293,7 +293,7 @@ public class BuildAgentAction { if ( buildAgentGroup.getName().equals( profile.getBuildAgentGroup() ) ) { - message = getText( "buildAgentGroup.error.remove.in.use" ); + message = getText( "buildAgentGroup.error.remove.in.use", new String[]{ profile.getName() } ); return ERROR; } } @@ -306,8 +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(); 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=1373221&r1=1373220&r2=1373221&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Aug 15 06:02:31 2012 @@ -1229,7 +1229,7 @@ buildAgentGroup.error.name.cannot.be.spa buildAgentGroup.available.buildAgents = --- Available Build Agents --- buildAgentGroup.available.buildAgents.used = --- Used Build Agents --- buildAgentGroup.buildAgents.define = Configure the used Build Agents -buildAgentGroup.error.remove.in.use = Build agent group can't be removed, it is probably used by a build environment. +buildAgentGroup.error.remove.in.use = Build agent group can't be removed, it is used by the build environment '{0}'. # ---------------------------------------------------------------------- # Page: View Distributed Releases