Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 81831 invoked from network); 14 Feb 2006 13:24:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Feb 2006 13:24:51 -0000 Received: (qmail 7767 invoked by uid 500); 14 Feb 2006 13:24:42 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 7680 invoked by uid 500); 14 Feb 2006 13:24:41 -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 7607 invoked by uid 99); 14 Feb 2006 13:24:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2006 05:24:41 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 14 Feb 2006 05:24:40 -0800 Received: (qmail 81339 invoked by uid 65534); 14 Feb 2006 13:24:18 -0000 Message-ID: <20060214132418.81320.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r377721 - in /maven/continuum/branches/continuum-1.0.x: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-web/src/main/resources/META-INF/plexus/ Date: Tue, 14 Feb 2006 13:24:17 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Tue Feb 14 05:24:14 2006 New Revision: 377721 URL: http://svn.apache.org/viewcvs?rev=377721&view=rev Log: [CONTINUUM-592] Fix NPE. I renamed addBuildDefinition(projectId, configuration) because ognl choose the wrong method Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=377721&r1=377720&r2=377721&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Tue Feb 14 05:24:14 2006 @@ -191,7 +191,7 @@ void addBuildDefinition( int projectId, BuildDefinition buildDefinition ) throws ContinuumException; - void addBuildDefinition( int projectId, Map configuration ) + void addBuildDefinitionFromParams( int projectId, Map configuration ) throws ContinuumException; void removeBuildDefinition( int projectId, int buildDefinitionId ) Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=377721&r1=377720&r2=377721&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Feb 14 05:24:14 2006 @@ -1077,7 +1077,10 @@ buildDefinition.setSchedule( schedule ); - buildDefinition.setDefaultForProject( true ); + if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) ) + { + buildDefinition.setDefaultForProject( true ); + } updateBuildDefinition( buildDefinition, projectId ); } @@ -1117,7 +1120,7 @@ updateProject( project ); } - public void addBuildDefinition( int projectId, Map configuration ) + public void addBuildDefinitionFromParams( int projectId, Map configuration ) throws ContinuumException { BuildDefinition buildDefinition = new BuildDefinition(); Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=377721&r1=377720&r2=377721&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml Tue Feb 14 05:24:14 2006 @@ -562,7 +562,7 @@ --> addBuildDefinition - addBuildDefinition(#id,#parameters) + addBuildDefinitionFromParams(#id,#parameters) deleteBuildDefinition