Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 70947 invoked from network); 24 Feb 2010 00:35:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Feb 2010 00:35:00 -0000 Received: (qmail 34902 invoked by uid 500); 24 Feb 2010 00:35:00 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 34849 invoked by uid 500); 24 Feb 2010 00:35:00 -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 34839 invoked by uid 99); 24 Feb 2010 00:35:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2010 00:35:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 24 Feb 2010 00:34:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CF6E2388847; Wed, 24 Feb 2010 00:34:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r915617 - in /continuum/branches/continuum-1.3.x: continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/bui... Date: Wed, 24 Feb 2010 00:34:37 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100224003438.1CF6E2388847@eris.apache.org> Author: ctan Date: Wed Feb 24 00:34:37 2010 New Revision: 915617 URL: http://svn.apache.org/viewvc?rev=915617&view=rev Log: [CONTINUUM-2437] propagate scm tag of project to build agent Submitted By: Alftheo Potgieter Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/buildcontext/BuildContext.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=915617&r1=915616&r2=915617&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Wed Feb 24 00:34:37 2010 @@ -930,6 +930,7 @@ context.setBuildAgentUrl( ContinuumBuildAgentUtil.getBuildAgentUrl( map ) ); context.setMaxExecutionTime( ContinuumBuildAgentUtil.getMaxExecutionTime( map ) ); context.setBuildDefinitionLabel( ContinuumBuildAgentUtil.getBuildDefinitionLabel( map ) ); + context.setScmTag( ContinuumBuildAgentUtil.getScmTag( map ) ); buildContext.add( context ); } Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/buildcontext/BuildContext.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/buildcontext/BuildContext.java?rev=915617&r1=915616&r2=915617&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/buildcontext/BuildContext.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/buildcontext/BuildContext.java Wed Feb 24 00:34:37 2010 @@ -55,6 +55,8 @@ private String scmPassword; + private String scmTag; + private int trigger; private boolean buildFresh; @@ -215,6 +217,16 @@ this.scmPassword = scmPassword; } + public String getScmTag() + { + return scmTag; + } + + public void setScmTag( String scmTag ) + { + this.scmTag = scmTag; + } + public int getTrigger() { return trigger; Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java?rev=915617&r1=915616&r2=915617&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/BuildContextToProject.java Wed Feb 24 00:34:37 2010 @@ -43,6 +43,8 @@ project.setScmPassword( buildContext.getScmPassword() ); + project.setScmTag( buildContext.getScmTag() ); + project.setExecutorId( buildContext.getExecutorId() ); project.setState( buildContext.getProjectState() ); Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=915617&r1=915616&r2=915617&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Wed Feb 24 00:34:37 2010 @@ -198,6 +198,15 @@ context.put( ContinuumBuildConstant.KEY_SCM_PASSWORD, project.getScmPassword() ); } + if ( project.getScmTag() != null ) + { + context.put( ContinuumBuildConstant.KEY_SCM_TAG, project.getScmTag() ); + } + else + { + context.put( ContinuumBuildConstant.KEY_SCM_TAG, "" ); + } + context.put( ContinuumBuildConstant.KEY_BUILD_DEFINITION_ID, buildDefinitionId ); String buildDefinitionLabel = buildDef.getDescription(); if ( StringUtils.isEmpty( buildDefinitionLabel ) )