Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 72085 invoked from network); 22 Oct 2007 13:11:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Oct 2007 13:11:25 -0000 Received: (qmail 49606 invoked by uid 500); 22 Oct 2007 13:11:13 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 49581 invoked by uid 500); 22 Oct 2007 13:11:12 -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 49568 invoked by uid 99); 22 Oct 2007 13:11:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 06:11:12 -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; Mon, 22 Oct 2007 13:11:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E6E4F1A9832; Mon, 22 Oct 2007 06:09:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587080 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Date: Mon, 22 Oct 2007 13:09:33 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071022130933.E6E4F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Mon Oct 22 06:09:28 2007 New Revision: 587080 URL: http://svn.apache.org/viewvc?rev=587080&view=rev Log: format Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=587080&r1=587079&r2=587080&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Mon Oct 22 06:09:28 2007 @@ -19,15 +19,6 @@ * under the License. */ -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.ConnectException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.apache.maven.continuum.builddefinition.BuildDefinitionService; import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException; import org.apache.maven.continuum.configuration.ConfigurationService; @@ -47,6 +38,15 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.StringUtils; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.ConnectException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * @author Trygve Laugstøl * @version $Id$ @@ -69,11 +69,11 @@ * @plexus.requirement role-hint="jdo" */ private ContinuumStore store; - + /** * @plexus.requirement - */ - private BuildDefinitionService buildDefinitionService; + */ + private BuildDefinitionService buildDefinitionService; /** * @plexus.configuration @@ -103,9 +103,10 @@ throw new ContinuumProjectBuilderException( e.getMessage(), e ); } } - + public ContinuumProjectBuildingResult buildProjectsFromMetadata( URL url, String username, String password, - boolean loadRecursiveProjects, BuildDefinitionTemplate buildDefinitionTemplate ) + boolean loadRecursiveProjects, + BuildDefinitionTemplate buildDefinitionTemplate ) throws ContinuumProjectBuilderException { // ---------------------------------------------------------------------- @@ -130,7 +131,8 @@ // ---------------------------------------------------------------------- private void readModules( URL url, ContinuumProjectBuildingResult result, boolean groupPom, String username, - String password, String scmUrl, boolean loadRecursiveProjects, BuildDefinitionTemplate buildDefinitionTemplate ) + String password, String scmUrl, boolean loadRecursiveProjects, + BuildDefinitionTemplate buildDefinitionTemplate ) throws ContinuumProjectBuilderException, BuildDefinitionServiceException { @@ -188,9 +190,9 @@ getLogger().debug( "projectGroup != null" + ( projectGroup != null ) ); if ( projectGroup != null ) { - List buildDefinitions = getBuildDefinitions( buildDefinitionTemplate, - loadRecursiveProjects ); - boolean defaultSetted = false; + List buildDefinitions = + getBuildDefinitions( buildDefinitionTemplate, loadRecursiveProjects ); + boolean defaultSetted = false; for ( BuildDefinition buildDefinition : buildDefinitions ) { if ( !defaultSetted && buildDefinition.isDefaultForProject() ) @@ -198,7 +200,8 @@ buildDefinition.setDefaultForProject( true ); defaultSetted = true; } - buildDefinition = buildDefinitionService.addBuildDefinition( buildDefinitionService.cloneBuildDefinition(buildDefinition) ); + buildDefinition = buildDefinitionService.addBuildDefinition( + buildDefinitionService.cloneBuildDefinition( buildDefinition ) ); //CONTINUUM-1296 String defaultGoal = mavenProject.getBuild().getDefaultGoal(); if ( StringUtils.isNotEmpty( defaultGoal ) ) @@ -321,17 +324,18 @@ continue; } // we are in recursive loading mode - readModules( moduleUrl, result, false, username, password, scmUrl + "/" + module, true, buildDefinitionTemplate ); + readModules( moduleUrl, result, false, username, password, scmUrl + "/" + module, true, + buildDefinitionTemplate ); } } } } - private List getBuildDefinitions(BuildDefinitionTemplate template, boolean loadRecursiveProjects ) + private List getBuildDefinitions( BuildDefinitionTemplate template, boolean loadRecursiveProjects ) throws ContinuumProjectBuilderException, BuildDefinitionServiceException { List buildDefinitions = new ArrayList(); - for (Iterator iterator = template.getBuildDefinitions().iterator();iterator.hasNext();) + for ( Iterator iterator = template.getBuildDefinitions().iterator(); iterator.hasNext(); ) { BuildDefinition buildDefinition = iterator.next(); // due to CONTINUUM-1207 CONTINUUM-1436 user can do what they want with arguments @@ -351,10 +355,10 @@ } } buildDefinition.setTemplate( false ); - buildDefinitions.add( buildDefinition ); + buildDefinitions.add( buildDefinition ); } return buildDefinitions; - + } private ProjectGroup buildProjectGroup( MavenProject mavenProject, ContinuumProjectBuildingResult result ) @@ -395,9 +399,8 @@ return projectGroup; } - - - + + public BuildDefinitionTemplate getDefaultBuildDefinitionTemplate() throws ContinuumProjectBuilderException {