Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 15423 invoked from network); 23 Sep 2007 22:32:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Sep 2007 22:32:39 -0000 Received: (qmail 72291 invoked by uid 500); 23 Sep 2007 22:32:29 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 72256 invoked by uid 500); 23 Sep 2007 22:32:29 -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 72243 invoked by uid 99); 23 Sep 2007 22:32:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Sep 2007 15:32:29 -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; Sun, 23 Sep 2007 22:32:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2FD741A9832; Sun, 23 Sep 2007 15:32:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r578608 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum: DefaultContinuum.java core/action/AbstractContinuumAction.java Date: Sun, 23 Sep 2007 22:32:17 -0000 To: continuum-commits@maven.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070923223218.2FD741A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sun Sep 23 15:32:13 2007 New Revision: 578608 URL: http://svn.apache.org/viewvc?rev=578608&view=rev Log: fix adding a project with a selected build defintion template. Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.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=578608&r1=578607&r2=578608&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 Sun Sep 23 15:32:13 2007 @@ -1666,14 +1666,12 @@ context.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, getWorkingDirectory() ); - context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_TEMPLATE_ID, Integer.valueOf( buildDefintionTemplateId ) ); - // CreateProjectsFromMetadataAction will check null and use default if ( buildDefintionTemplateId > 0 ) { try { - context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_TEMPLATE_ID, buildDefinitionService + context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_TEMPLATE, buildDefinitionService .getBuildDefinitionTemplate( buildDefintionTemplateId ) ); } catch ( BuildDefinitionServiceException e ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=578608&r1=578607&r2=578608&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Sun Sep 23 15:32:13 2007 @@ -46,8 +46,6 @@ public static final String KEY_PROJECT_ID = "project-id"; public static final String KEY_PROJECT = "project"; - - public static final String KEY_BUILD_DEFINITION_TEMPLATE_ID = "build-definition-template-id"; public static final String KEY_BUILD_DEFINITION_TEMPLATE = "build-definition-template"; @@ -110,11 +108,6 @@ public static int getProjectGroupId( Map context ) { return getInteger( context, KEY_PROJECT_GROUP_ID ); - } - - public static int getBuildDefinitionTemplateId( Map context ) - { - return getInteger( context, KEY_BUILD_DEFINITION_TEMPLATE_ID ); } public static BuildDefinitionTemplate getBuildDefinitionTemplate( Map context )