From commits-return-5305-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Mon May 04 05:14:39 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 96227 invoked from network); 4 May 2009 05:14:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 May 2009 05:14:39 -0000 Received: (qmail 38143 invoked by uid 500); 4 May 2009 05:14:39 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 38097 invoked by uid 500); 4 May 2009 05:14:39 -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 38075 invoked by uid 99); 4 May 2009 05:14:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 May 2009 05:14:39 +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; Mon, 04 May 2009 05:14:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 37843238896D; Mon, 4 May 2009 05:14:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771178 [2/2] - in /continuum/trunk/continuum-core/src: main/java/org/apache/maven/continuum/ main/java/org/apache/maven/continuum/buildcontroller/ main/java/org/apache/maven/continuum/core/action/ main/java/org/apache/maven/continuum/scm/q... Date: Mon, 04 May 2009 05:14:10 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090504051411.37843238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=771178&r1=771177&r2=771178&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java (original) +++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java Mon May 4 05:14:08 2009 @@ -34,6 +34,9 @@ import org.apache.continuum.utils.ContinuumUtils; import org.apache.continuum.utils.ProjectSorter; import org.apache.maven.continuum.core.action.AbstractContinuumAction; +import org.apache.maven.continuum.core.action.CheckWorkingDirectoryAction; +import org.apache.maven.continuum.core.action.CheckoutProjectContinuumAction; +import org.apache.maven.continuum.core.action.UpdateWorkingDirectoryFromScmContinuumAction; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; @@ -50,7 +53,6 @@ import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; import org.codehaus.plexus.taskqueue.execution.TaskExecutor; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.dag.CycleDetectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -192,31 +194,31 @@ { if ( projectScmUrl.contains( projectScmRoot.getScmRootAddress() ) ) { - context.put( AbstractContinuumAction.KEY_PROJECT_SCM_ROOT, projectScmRoot ); + AbstractContinuumAction.setProjectScmRoot( context, projectScmRoot ); break; } } - context.put( AbstractContinuumAction.KEY_PROJECT_GROUP_ID, projectGroup.getId() ); - context.put( AbstractContinuumAction.KEY_PROJECT_ID, projectId ); - context.put( AbstractContinuumAction.KEY_PROJECT, project ); - - context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_ID, buildDefinitionId ); - context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION, - buildDefinitionDao.getBuildDefinition( buildDefinitionId ) ); + AbstractContinuumAction.setProjectGroupId( context, projectGroup.getId() ); + AbstractContinuumAction.setProjectId( context, projectId ); + AbstractContinuumAction.setProject( context, project ); + + AbstractContinuumAction.setBuildDefinitionId( context, buildDefinitionId ); + AbstractContinuumAction.setBuildDefinition( context, + buildDefinitionDao.getBuildDefinition( buildDefinitionId ) ); BuildResult oldBuildResult = buildResultDao.getLatestBuildResultForBuildDefinition( projectId, buildDefinitionId ); if ( oldBuildResult != null ) { - context.put( AbstractContinuumAction.KEY_OLD_SCM_RESULT, - getOldScmResults( projectId, oldBuildResult.getBuildNumber(), - oldBuildResult.getEndTime() ) ); + AbstractContinuumAction.setOldScmResult( context, + getOldScmResults( projectId, oldBuildResult.getBuildNumber(), + oldBuildResult.getEndTime() ) ); } else { - context.put( AbstractContinuumAction.KEY_OLD_SCM_RESULT, null ); + AbstractContinuumAction.setOldScmResult( context, null ); } } catch ( ContinuumStoreException e ) @@ -238,8 +240,7 @@ { performAction( "check-working-directory", context ); - boolean workingDirectoryExists = - AbstractContinuumAction.getBoolean( context, AbstractContinuumAction.KEY_WORKING_DIRECTORY_EXISTS ); + boolean workingDirectoryExists = CheckWorkingDirectoryAction.isWorkingDirectoryExist( context ); ScmResult scmResult; @@ -247,21 +248,21 @@ { performAction( "update-working-directory-from-scm", context ); - scmResult = AbstractContinuumAction.getUpdateScmResult( context ); + scmResult = UpdateWorkingDirectoryFromScmContinuumAction.getUpdateScmResult( context ); } else { Project project = AbstractContinuumAction.getProject( context ); - context.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, - workingDirectoryService.getWorkingDirectory( project ).getAbsolutePath() ); + AbstractContinuumAction.setWorkingDirectory( context, workingDirectoryService.getWorkingDirectory( + project ).getAbsolutePath() ); performAction( "checkout-project", context ); - scmResult = AbstractContinuumAction.getCheckoutResult( context, null ); + scmResult = CheckoutProjectContinuumAction.getCheckoutResult( context, null ); } - context.put( AbstractContinuumAction.KEY_SCM_RESULT, scmResult ); + AbstractContinuumAction.setScmResult( context, scmResult ); } private boolean checkProjectScmRoot( Map context ) @@ -385,7 +386,7 @@ { if ( newScmResult == null ) { - context.put( AbstractContinuumAction.KEY_SCM_RESULT, oldScmResult ); + AbstractContinuumAction.setScmResult( context, oldScmResult ); } else { @@ -432,7 +433,7 @@ result.setException( ContinuumUtils.throwableToString( exception ) ); - context.put( AbstractContinuumAction.KEY_SCM_RESULT, result ); + AbstractContinuumAction.setScmResult( context, result ); throw exception; } @@ -491,7 +492,7 @@ projectScmRootDao.updateProjectScmRoot( projectScmRoot ); - context.put( AbstractContinuumAction.KEY_PROJECT_SCM_ROOT, projectScmRoot ); + AbstractContinuumAction.setProjectScmRoot( context, projectScmRoot ); } catch ( ContinuumStoreException e ) { @@ -557,10 +558,10 @@ try { Map context = new HashMap(); - context.put( AbstractContinuumAction.KEY_PROJECTS, projectsToBeBuilt ); - context.put( AbstractContinuumAction.KEY_PROJECTS_BUILD_DEFINITIONS_MAP, projectsBuildDefinitionsMap ); - context.put( AbstractContinuumAction.KEY_TRIGGER, trigger ); - context.put( AbstractContinuumAction.KEY_SCM_RESULT_MAP, scmResultMap ); + AbstractContinuumAction.setListOfProjects( context, projectsToBeBuilt ); + AbstractContinuumAction.setProjectsBuildDefinitionsMap( context, projectsBuildDefinitionsMap ); + AbstractContinuumAction.setTrigger( context, trigger ); + AbstractContinuumAction.setScmResultMap( context, scmResultMap ); log.info( "Performing action create-build-project-task" ); actionManager.lookup( "create-build-project-task" ).execute( context ); Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java?rev=771178&r1=771177&r2=771178&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java (original) +++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java Mon May 4 05:14:08 2009 @@ -227,9 +227,9 @@ Map pgContext = new HashMap(); - pgContext.put( AbstractContinuumAction.KEY_WORKING_DIRECTORY, project.getWorkingDirectory() ); + AbstractContinuumAction.setWorkingDirectory( pgContext, project.getWorkingDirectory() ); - pgContext.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT_GROUP, projectGroup ); + AbstractContinuumAction.setUnvalidatedProjectGroup( pgContext, projectGroup ); actionManager.lookup( "validate-project-group" ).execute( pgContext ); Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java?rev=771178&r1=771177&r2=771178&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java (original) +++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java Mon May 4 05:14:08 2009 @@ -91,16 +91,14 @@ throws Exception { Map context = new HashMap(); - context.put( CreateProjectsFromMetadataAction.KEY_URL, - "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" ); - context.put( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDER_ID, "id" ); - context.put( CreateProjectsFromMetadataAction.KEY_LOAD_RECURSIVE_PROJECTS, true ); + CreateProjectsFromMetadataAction.setUrl( context, + "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" ); + CreateProjectsFromMetadataAction.setProjectBuilderId( context, "id" ); + CreateProjectsFromMetadataAction.setLoadRecursiveProject( context, true ); action.execute( context ); - ContinuumProjectBuildingResult result = - (ContinuumProjectBuildingResult) context.get( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDING_RESULT ) - ; + ContinuumProjectBuildingResult result = CreateProjectsFromMetadataAction.getProjectBuildingResult( context ); assertFalse( "Should not have errors but had " + result.getErrorsAsString() + " (this test requires internet access)", @@ -111,16 +109,14 @@ throws Exception { Map context = new HashMap(); - context.put( CreateProjectsFromMetadataAction.KEY_URL, - "http://svn.apache.org/repos/asf/maven/archiva/trunk/pom.xml" ); - context.put( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDER_ID, "id" ); - context.put( CreateProjectsFromMetadataAction.KEY_LOAD_RECURSIVE_PROJECTS, false ); + CreateProjectsFromMetadataAction.setUrl( context, + "http://svn.apache.org/repos/asf/maven/archiva/trunk/pom.xml" ); + CreateProjectsFromMetadataAction.setProjectBuilderId( context, "id" ); + CreateProjectsFromMetadataAction.setLoadRecursiveProject( context, false ); action.execute( context ); - ContinuumProjectBuildingResult result = - (ContinuumProjectBuildingResult) context.get( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDING_RESULT ) - ; + ContinuumProjectBuildingResult result = CreateProjectsFromMetadataAction.getProjectBuildingResult( context ); assertFalse( "Should not have errors but had " + result.getErrorsAsString() + " (this test requires internet access)",