Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 79096 invoked from network); 21 Sep 2007 10:12:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Sep 2007 10:12:40 -0000 Received: (qmail 44406 invoked by uid 500); 21 Sep 2007 10:12:31 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 44371 invoked by uid 500); 21 Sep 2007 10:12:31 -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 44358 invoked by uid 99); 21 Sep 2007 10:12:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Sep 2007 03:12:31 -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; Fri, 21 Sep 2007 10:12:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88A4B1A983A; Fri, 21 Sep 2007 03:12:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r578046 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/ continuum-test/src/main/java/org/apache/maven/continuum/ mave... Date: Fri, 21 Sep 2007 10:12:18 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070921101219.88A4B1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Fri Sep 21 03:12:17 2007 New Revision: 578046 URL: http://svn.apache.org/viewvc?rev=578046&view=rev Log: Use constants Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AbstractAddProject.java maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddAntProject.java maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddShellProject.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java Fri Sep 21 03:12:17 2007 @@ -107,7 +107,7 @@ if ( buildDefinition.getType() != null && buildDefinition.getType().equals( storedDefinition.getType() ) ) { - //Required to get buil def from store because storedDefinition is readonly + //Required to get build def from store because storedDefinition is readonly BuildDefinition def = store.getBuildDefinition( storedDefinition.getId() ); def.setDefaultForProject( false ); Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java Fri Sep 21 03:12:17 2007 @@ -20,6 +20,7 @@ */ import org.apache.maven.continuum.AbstractContinuumTest; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; @@ -92,7 +93,7 @@ private Project createProject( String artifactId ) { Project project = new Project(); - project.setExecutorId( "maven2" ); + project.setExecutorId( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR ); project.setName( artifactId ); project.setGroupId( "org.apache.maven.testproject" ); project.setArtifactId( artifactId ); Modified: maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original) +++ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Fri Sep 21 03:12:17 2007 @@ -21,6 +21,7 @@ import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectGroup; @@ -233,7 +234,7 @@ Project project = new Project(); makeProject( project, name, "1.0" ); - project.setExecutorId( "shell" ); + project.setExecutorId( ContinuumBuildExecutorConstants.SHELL_BUILD_EXECUTOR ); BuildDefinition def = new BuildDefinition(); def.setBuildFile( script ); @@ -244,7 +245,7 @@ public static Project makeProject( Project project, String name, String version ) { - project.setExecutorId( "maven2" ); + project.setExecutorId( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR ); project.setName( name ); project.setVersion( version ); Modified: maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AbstractAddProject.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AbstractAddProject.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AbstractAddProject.java (original) +++ maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AbstractAddProject.java Fri Sep 21 03:12:17 2007 @@ -20,6 +20,7 @@ */ import org.apache.maven.continuum.ContinuumException; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; import org.apache.maven.continuum.xmlrpc.project.ProjectSummary; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -33,10 +34,6 @@ public abstract class AbstractAddProject extends AbstractContinuumMojo { - public static final String ANT = "ant"; - - public static final String SHELL = "shell"; - /** * The project name. * @@ -112,7 +109,7 @@ { if ( projectGroupId != null && projectGroupId.length() > 0 ) { - if ( ANT.equals( getProjectType() ) ) + if ( ContinuumBuildExecutorConstants.ANT_BUILD_EXECUTOR.equals( getProjectType() ) ) { getClient().addAntProject( project, Integer.parseInt( projectGroupId ) ); } @@ -123,7 +120,7 @@ } else { - if ( ANT.equals( getProjectType() ) ) + if ( ContinuumBuildExecutorConstants.ANT_BUILD_EXECUTOR.equals( getProjectType() ) ) { getClient().addAntProject( project ); } Modified: maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddAntProject.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddAntProject.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddAntProject.java (original) +++ maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddAntProject.java Fri Sep 21 03:12:17 2007 @@ -1,5 +1,7 @@ package org.apache.maven.continuum.plugin; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,6 +33,6 @@ { protected String getProjectType() { - return ANT; + return ContinuumBuildExecutorConstants.ANT_BUILD_EXECUTOR; } } Modified: maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddShellProject.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddShellProject.java?rev=578046&r1=578045&r2=578046&view=diff ============================================================================== --- maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddShellProject.java (original) +++ maven/continuum/trunk/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddShellProject.java Fri Sep 21 03:12:17 2007 @@ -1,5 +1,7 @@ package org.apache.maven.continuum.plugin; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,6 +33,6 @@ { protected String getProjectType() { - return SHELL; + return ContinuumBuildExecutorConstants.SHELL_BUILD_EXECUTOR; } }