From continuum-commits-return-3491-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Oct 02 10:15:31 2007 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 88842 invoked from network); 2 Oct 2007 10:15:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2007 10:15:30 -0000 Received: (qmail 28686 invoked by uid 500); 2 Oct 2007 10:15:20 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 28651 invoked by uid 500); 2 Oct 2007 10:15:19 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 28633 invoked by uid 99); 2 Oct 2007 10:15:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 03:15:19 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2007 10:15:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8CAE91A9832; Tue, 2 Oct 2007 03:14:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581182 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 02 Oct 2007 10:14:36 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071002101438.8CAE91A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Tue Oct 2 03:14:25 2007 New Revision: 581182 URL: http://svn.apache.org/viewvc?rev=581182&view=rev Log: [CONTINUUM-1502] Trim project group name Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=581182&r1=581181&r2=581182&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Oct 2 03:14:25 2007 @@ -309,6 +309,8 @@ if ( pg == null ) { + //CONTINUUM-1502 + projectGroup.setName( projectGroup.getName().trim() ); try { ProjectGroup new_pg = store.addProjectGroup( projectGroup ); @@ -552,8 +554,8 @@ { buildDefinitionLabel = buildDefinition.getGoals(); } - BuildProjectTask buildProjectTask = new BuildProjectTask( projectId, buildDefinitionId, trigger, projectName, - buildDefinitionLabel ); + BuildProjectTask buildProjectTask = + new BuildProjectTask( projectId, buildDefinitionId, trigger, projectName, buildDefinitionLabel ); return this.buildQueue.remove( buildProjectTask ); } @@ -685,15 +687,13 @@ checkoutQueue.remove( task ); } } - } - + } // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- - public void removeProject( int projectId ) throws ContinuumException { @@ -1149,8 +1149,8 @@ if ( StringUtils.isEmpty( buildDefinitionLabel ) ) { buildDefinitionLabel = buildDefinition.getGoals(); - } - + } + getLogger().info( "Enqueuing '" + project.getName() + "' (Build definition id=" + buildDefinitionId + ")." ); @@ -2139,12 +2139,12 @@ catch ( ContinuumObjectNotFoundException cne ) { throw new ContinuumException( "Project Group (id=" + projectGroupId + - " doens't have a default build definition, this should be impossible, it should always have a default definition set." ); + " doens't have a default build definition, this should be impossible, it should always have a default definition set." ); } catch ( ContinuumStoreException cse ) { throw new ContinuumException( "Project Group (id=" + projectGroupId + - " doens't have a default build definition, this should be impossible, it should always have a default definition set." ); + " doens't have a default build definition, this should be impossible, it should always have a default definition set." ); } } @@ -2908,6 +2908,8 @@ public void updateProjectGroup( ProjectGroup projectGroup ) throws ContinuumException { + //CONTINUUM-1502 + projectGroup.setName( projectGroup.getName().trim() ); try { store.updateProjectGroup( projectGroup );