Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 24084 invoked from network); 12 May 2005 09:34:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 May 2005 09:34:57 -0000 Received: (qmail 74483 invoked by uid 500); 12 May 2005 09:38:54 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 74457 invoked by uid 500); 12 May 2005 09:38:53 -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 74431 invoked by uid 99); 12 May 2005 09:38:53 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 12 May 2005 02:38:51 -0700 Received: (qmail 24054 invoked by uid 65534); 12 May 2005 09:34:52 -0000 Message-ID: <20050512093452.24052.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r169796 - in /maven/continuum/trunk/continuum-core/src: main/java/org/apache/maven/continuum/ main/java/org/apache/maven/continuum/buildcontroller/ main/java/org/apache/maven/continuum/execution/ main/java/org/apache/maven/continuum/execution/ant/ main/java/org/apache/maven/continuum/execution/maven/m1/ main/java/org/apache/maven/continuum/execution/maven/m2/ main/java/org/apache/maven/continuum/execution/shell/ main/java/org/apache/maven/continuum/project/builder/ main/java/org/apache/maven/continuum/project/builder/maven/ test/java/org/apache/maven/continuum/project/builder/maven/ test/resources/projects/continuum/ test/resources/projects/continuum/continuum-core/ test/resources/projects/continuum/continuum-model/ test/resources/projects/continuum/continuum-plexus-application/ test/resources/projects/continuum/continuum-web/ test/resources/projects/continuum/continuum-xmlrpc/ Date: Thu, 12 May 2005 09:34:48 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Thu May 12 02:34:46 2005 New Revision: 169796 URL: http://svn.apache.org/viewcvs?rev=3D169796&view=3Drev Log: Fixing CONTINUUM-65: "read modules from POM and add as project" o Adding more exceptions to keep everything from throwing ContinuumException all over the place. Added: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutorException.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelperException.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelperException.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/AbstractContinuumProjectBuilder.java maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-core/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-core/pom.xml maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-model/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-model/pom.xml maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-plexus-application/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-plexus-application/pom.xml maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-web/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-web/pom.xml maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-xmlrpc/ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-xmlrpc/pom.xml maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/pom.xml Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/buildcontroller/DefaultBuildController.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/AbstractBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ant/AntBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenTwoBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/shell/ShellBuildExecutor.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/ContinuumProjectBuildingResult.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenOneContinuumProjectBuilder.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=3D169796&r1= =3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java Thu May 12 02:34:46 2005 @@ -29,6 +29,13 @@ import java.util.Properties; =20 import org.apache.maven.continuum.buildqueue.BuildProjectTask; +import org.apache.maven.continuum.execution.ContinuumBuildExecutor; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorExceptio= n; +import org.apache.maven.continuum.execution.ant.AntBuildExecutor; +import org.apache.maven.continuum.execution.manager.BuildExecutorManager; +import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor; +import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor; +import org.apache.maven.continuum.execution.shell.ShellBuildExecutor; import org.apache.maven.continuum.project.AntProject; import org.apache.maven.continuum.project.ContinuumBuild; import org.apache.maven.continuum.project.ContinuumBuildResult; @@ -47,12 +54,6 @@ import org.apache.maven.continuum.scm.queue.CheckOutTask; import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.store.ContinuumStoreException; -import org.apache.maven.continuum.execution.manager.BuildExecutorManager; -import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor; -import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor; -import org.apache.maven.continuum.execution.ant.AntBuildExecutor; -import org.apache.maven.continuum.execution.shell.ShellBuildExecutor; -import org.apache.maven.continuum.execution.ContinuumBuildExecutor; =20 import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializabl= e; @@ -153,7 +154,7 @@ } catch ( MalformedURLException e ) { - throw new ContinuumException( "Invalid URL", e ); + throw new ContinuumException( "Invalid URL.", e ); } =20 return addProjectsFromUrl( u, executorId ); @@ -170,9 +171,9 @@ =20 pomFile =3D File.createTempFile( "continuum-", "-pom-download"= ); =20 - FileUtils.fileWrite( pomFile.getAbsolutePath(), pom ); + pomFile.deleteOnExit(); =20 - getLogger().info( "wrote pom to " + pomFile ); + FileUtils.fileWrite( pomFile.getAbsolutePath(), pom ); } catch ( IOException ex ) { @@ -802,7 +803,14 @@ =20 ContinuumBuildExecutor builder =3D buildExecutorManager.getBuilder= ( project.getExecutorId() ); =20 - builder.updateProjectFromCheckOut( new File( project.getWorkingDir= ectory() ), project ); + try + { + builder.updateProjectFromCheckOut( new File( project.getWorkin= gDirectory() ), project ); + } + catch ( ContinuumBuildExecutorException e ) + { + throw new ContinuumException( "Error while updating project fr= om check out.", e); + } =20 // ---------------------------------------------------------------= ------- // Store the new descriptor Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/buildcontroller/DefaultBuildController.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControlle= r=2Ejava?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/buildcontroller/DefaultBuildController.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/buildcontroller/DefaultBuildController.java Thu May 12 02:34:46 2005 @@ -20,8 +20,8 @@ =20 import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.apache.maven.continuum.execution.manager.BuildExecutorManager; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; +import org.apache.maven.continuum.execution.manager.BuildExecutorManager; import org.apache.maven.continuum.notification.ContinuumNotificationDispat= cher; import org.apache.maven.continuum.project.ContinuumBuild; import org.apache.maven.continuum.project.ContinuumBuildResult; Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/AbstractBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?= rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/AbstractBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/AbstractBuildExecutor.java Thu May 12 02:34:46 2005 @@ -16,16 +16,9 @@ * limitations under the License. */ =20 -import java.io.File; -import java.io.FileWriter; -import java.io.InputStream; -import java.net.URL; import java.util.Properties; =20 -import org.apache.maven.continuum.ContinuumException; - import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; =20 /** @@ -37,20 +30,20 @@ implements ContinuumBuildExecutor { protected String getConfigurationString( Properties configuration, Str= ing property ) - throws ContinuumException + throws ContinuumBuildExecutorException { String string =3D configuration.getProperty( property ); =20 if ( StringUtils.isEmpty( string ) ) { - throw new ContinuumException( "Missing configuration: '" + pro= perty + "'." ); + throw new ContinuumBuildExecutorException( "Missing configurat= ion: '" + property + "'." ); } =20 return string; } =20 protected String getConfigurationString( Properties configuration, Str= ing property, String defaultValue ) - throws ContinuumException + throws ContinuumBuildExecutorException { String string =3D configuration.getProperty( property ); =20 @@ -63,7 +56,7 @@ } =20 protected String[] getConfigurationStringArray( Properties configurati= on, String property, String separator ) - throws ContinuumException + throws ContinuumBuildExecutorException { String value =3D getConfigurationString( configuration, property ); =20 @@ -71,7 +64,7 @@ } =20 protected String[] getConfigurationStringArray( Properties configurati= on, String property, String separator, String[] defaultValue ) - throws ContinuumException + throws ContinuumBuildExecutorException { String value =3D getConfigurationString( configuration, property, = null ); =20 @@ -93,30 +86,5 @@ } =20 return array; - } - - public static File createMetadataFile( URL metadata ) - throws ContinuumException - { - try - { - InputStream is =3D metadata.openStream(); - - File file =3D File.createTempFile( "continuum", "tmp" ); - - FileWriter writer =3D new FileWriter( file ); - - IOUtil.copy( is, writer ); - - is.close(); - - writer.close(); - - return file; - } - catch ( Exception e ) - { - throw new ContinuumException( "Cannot create metadata file:", = e ); - } } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/ContinuumBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java= ?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutor.java Thu May 12 02:34:46 2005 @@ -18,7 +18,6 @@ =20 import java.io.File; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumBuildResult; import org.apache.maven.continuum.project.ContinuumProject; =20 @@ -31,11 +30,8 @@ String ROLE =3D ContinuumBuildExecutor.class.getName(); =20 ContinuumBuildResult build( ContinuumProject project ) - throws ContinuumException; - -// ContinuumProject createProjectFromMetadata( URL metadata ) -// throws ContinuumException; + throws ContinuumBuildExecutorException; =20 void updateProjectFromCheckOut( File workingDirectory, ContinuumProjec= t project ) - throws ContinuumException; + throws ContinuumBuildExecutorException; } Added: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/= continuum/execution/ContinuumBuildExecutorException.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorExcep= tion.java?rev=3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutorException.java (added) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ContinuumBuildExecutorException.java Thu May 12 02:34:46 2= 005 @@ -0,0 +1,35 @@ +package org.apache.maven.continuum.execution; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Trygve Laugstøl + * @version $Id:$ + */ +public class ContinuumBuildExecutorException + extends Exception +{ + public ContinuumBuildExecutorException( String message ) + { + super( message ); + } + + public ContinuumBuildExecutorException( String message, Throwable caus= e ) + { + super( message, cause ); + } +} Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/ant/AntBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?r= ev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ant/AntBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/ant/AntBuildExecutor.java Thu May 12 02:34:46 2005 @@ -19,11 +19,11 @@ import java.io.File; import java.util.Properties; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.execution.AbstractBuildExecutor; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; -import org.apache.maven.continuum.execution.shell.ShellCommandHelper; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorExceptio= n; import org.apache.maven.continuum.execution.shell.ExecutionResult; +import org.apache.maven.continuum.execution.shell.ShellCommandHelper; import org.apache.maven.continuum.project.ContinuumBuildResult; import org.apache.maven.continuum.project.ContinuumProject; =20 @@ -49,7 +49,7 @@ // -------------------------------------------------------------------= --- =20 public ContinuumBuildResult build( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { File workingDirectory =3D new File( project.getWorkingDirectory() = ); =20 @@ -67,7 +67,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while executing shell com= mand.", e ); + throw new ContinuumBuildExecutorException( "Error while execut= ing shell command.", e ); } =20 boolean success =3D executionResult.getExitCode() =3D=3D 0; @@ -86,7 +86,7 @@ } =20 public void updateProjectFromCheckOut( File workingDirectory, Continuu= mProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { Properties configuration =3D new Properties(); =20 Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMet= adataHelper.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Thu May 12 02:= 34:46 2005 @@ -20,7 +20,6 @@ import java.io.FileReader; import java.util.Properties; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumProject; =20 import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -41,7 +40,7 @@ // -------------------------------------------------------------------= --- =20 public void mapMetadata( File metadata, ContinuumProject project ) - throws ContinuumException + throws MavenOneMetadataHelperException { Xpp3Dom mavenProject; =20 @@ -51,7 +50,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while reading maven POM."= , e ); + throw new MavenOneMetadataHelperException( "Error while readin= g maven POM.", e ); } =20 // ---------------------------------------------------------------= ------- @@ -63,7 +62,7 @@ =20 if ( StringUtils.isEmpty( name ) ) { - throw new ContinuumException( "Missing from the project= descriptor." ); + throw new MavenOneMetadataHelperException( "Missing fro= m the project descriptor." ); } =20 // Scm @@ -79,7 +78,7 @@ } else { - throw new ContinuumException( "The project descriptor is m= issing the SCM information." ); + throw new MavenOneMetadataHelperException( "The project de= scriptor is missing the SCM information." ); } } else @@ -90,7 +89,7 @@ =20 if ( StringUtils.isEmpty( scmConnection ) ) { - throw new ContinuumException( "Missing both anonymous and = developer scm connection urls." ); + throw new MavenOneMetadataHelperException( "Missing both a= nonymous and developer scm connection urls." ); } } =20 @@ -107,7 +106,7 @@ } else { - throw new ContinuumException( "Missing build section." ); + throw new MavenOneMetadataHelperException( "Missing build = section." ); } } else @@ -117,7 +116,7 @@ =20 if ( StringUtils.isEmpty( nagEmailAddress ) ) { - throw new ContinuumException( "Missing nag email address from = the project descriptor." ); + throw new MavenOneMetadataHelperException( "Missing nag email = address from the project descriptor." ); } =20 // Version @@ -125,7 +124,7 @@ =20 if ( StringUtils.isEmpty( version ) ) { - throw new ContinuumException( "Missing version from the projec= t descriptor." ); + throw new MavenOneMetadataHelperException( "Missing version fr= om the project descriptor." ); } =20 // Goals Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m1/MavenOneBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecu= tor.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneBuildExecutor.java Thu May 12 02:34:46 20= 05 @@ -19,11 +19,11 @@ import java.io.File; import java.util.Properties; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.execution.AbstractBuildExecutor; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; -import org.apache.maven.continuum.execution.shell.ShellCommandHelper; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorExceptio= n; import org.apache.maven.continuum.execution.shell.ExecutionResult; +import org.apache.maven.continuum.execution.shell.ShellCommandHelper; import org.apache.maven.continuum.project.ContinuumBuildResult; import org.apache.maven.continuum.project.ContinuumProject; =20 @@ -53,7 +53,7 @@ // -------------------------------------------------------------------= --- =20 public ContinuumBuildResult build( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { Properties configuration =3D project.getConfiguration(); =20 @@ -69,7 +69,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while executing shell com= mand.", e ); + throw new ContinuumBuildExecutorException( "Error while execut= ing shell command.", e ); } =20 boolean success =3D executionResult.getExitCode() =3D=3D 0; @@ -87,28 +87,23 @@ return result; } =20 -// public ContinuumProject createProjectFromMetadata( URL metadata ) -// throws ContinuumException -// { -// File pomFile =3D createMetadataFile( metadata ); -// -// ContinuumProject project =3D new ContinuumProject(); -// -// mapMetadata( pomFile, project ); -// -// return project; -// } - public void updateProjectFromCheckOut( File workingDirectory, Continuu= mProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { File projectXmlFile =3D new File( workingDirectory, "project.xml" = ); =20 if ( !projectXmlFile.isFile() ) { - throw new ContinuumException( "Could not find Maven project de= scriptor." ); + throw new ContinuumBuildExecutorException( "Could not find Mav= en project descriptor." ); } =20 - metadataHelper.mapMetadata( projectXmlFile, project ); + try + { + metadataHelper.mapMetadata( projectXmlFile, project ); + } + catch ( MavenOneMetadataHelperException e ) + { + throw new ContinuumBuildExecutorException( "Error while mappin= g metadata.", e ); + } } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m1/MavenOneMetadataHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHe= lper.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelper.java Thu May 12 02:34:46 2= 005 @@ -18,7 +18,6 @@ =20 import java.io.File; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumProject; =20 /** @@ -30,5 +29,5 @@ String ROLE =3D MavenOneMetadataHelper.class.getName(); =20 void mapMetadata( File metadata, ContinuumProject project ) - throws ContinuumException; + throws MavenOneMetadataHelperException; } Added: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/= continuum/execution/maven/m1/MavenOneMetadataHelperException.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHe= lperException.java?rev=3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelperException.java (added) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m1/MavenOneMetadataHelperException.java Thu May 12 0= 2:34:46 2005 @@ -0,0 +1,35 @@ +package org.apache.maven.continuum.execution.maven.m1; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Trygve Laugstøl + * @version $Id:$ + */ +public class MavenOneMetadataHelperException + extends Exception +{ + public MavenOneMetadataHelperException( String message ) + { + super( message ); + } + + public MavenOneMetadataHelperException( String message, Throwable caus= e ) + { + super( message, cause ); + } +} Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilde= rHelper.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java Thu May 12 02:34:4= 6 2005 @@ -17,16 +17,12 @@ */ =20 import java.io.File; -import java.io.FileWriter; -import java.io.InputStream; -import java.net.URL; import java.util.Iterator; import java.util.Properties; =20 import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayou= t; -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumProject; import org.apache.maven.model.CiManagement; import org.apache.maven.model.Notifier; @@ -38,7 +34,7 @@ import org.apache.maven.settings.MavenSettings; import org.apache.maven.settings.MavenSettingsBuilder; =20 -import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; =20 /** @@ -46,6 +42,7 @@ * @version $Id: DefaultMavenBuilderHelper.java,v 1.1.1.1 2005/03/29 20:42= :00 trygvis Exp $ */ public class DefaultMavenBuilderHelper + extends AbstractLogEnabled implements MavenBuilderHelper { /** @requirement */ @@ -67,130 +64,32 @@ // MavenBuilderHelper Implementation // -------------------------------------------------------------------= --- =20 -// public ContinuumProject createProjectFromMetadata( URL metadata ) -// throws ContinuumException -// { -// // -------------------------------------------------------------= --------- -// // We need to roll the project data into a file so that we can u= se it -// // -------------------------------------------------------------= --------- -// -// MavenTwoProject project =3D new MavenTwoProject(); -// -// try -// { -// File file =3D createMetadataFile( metadata ); -// -// mapMetadataToProject( file, project ); -// } -// catch ( Exception e ) -// { -// throw new ContinuumException( "Cannot create continuum proje= ct:", e ); -// } -// -// return project; -// } -// -// public void updateProjectFromMetadata( File workingDirectory, Contin= uumProject project ) -// throws ContinuumException -// { -// File f =3D new File( workingDirectory, "pom.xml" ); -// -// mapMetadataToProject( f, project ); -// } - - public void mapMetadataToProject( File metadata, ContinuumProject proj= ect ) - throws ContinuumException - { - MavenProject mavenProject =3D getProject( metadata ); - - project.setNagEmailAddress( getNagEmailAddress( mavenProject ) ); - - project.setName( getProjectName( mavenProject ) ); - - project.setScmUrl( getScmUrl( mavenProject ) ); - - project.setVersion( getVersion( mavenProject ) ); - - Properties configuration =3D project.getConfiguration(); - - if ( !configuration.containsKey( MavenTwoBuildExecutor.CONFIGURATI= ON_GOALS ) ) - { - configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION= _GOALS, "clean:clean, install" ); - } - } - - // -------------------------------------------------------------------= --- - // - // -------------------------------------------------------------------= --- - - public String getProjectName( MavenProject project ) - { - String name =3D project.getName(); - - if ( StringUtils.isEmpty( name ) ) - { - name =3D project.getGroupId() + ":" + project.getArtifactId(); - } - - return name; - } - - public String getScmUrl( MavenProject project ) + public void mapMetadataToProject( File metadata, ContinuumProject cont= inuumProject ) + throws MavenBuilderHelperException { - return project.getScm().getConnection(); + mapMavenProjectToContinuumProject( getMavenProject( metadata ), co= ntinuumProject ); } =20 - public String getNagEmailAddress( MavenProject project ) - { - for ( Iterator it =3D project.getCiManagement().getNotifiers().ite= rator(); it.hasNext(); ) - { - Notifier notifier =3D (Notifier) it.next(); - - if ( notifier.getType().equals( "mail" ) ) - { - return notifier.getAddress(); - } - } - - return null; - } - - public String getVersion( MavenProject project ) - { - return project.getVersion(); - } - - // -------------------------------------------------------------------= --- - // - // -------------------------------------------------------------------= --- - - protected File createMetadataFile( URL metadata ) - throws ContinuumException + public void mapMavenProjectToContinuumProject( MavenProject mavenProje= ct, ContinuumProject continuumProject ) { - try - { - InputStream is =3D metadata.openStream(); - - File f =3D File.createTempFile( "continuum", "tmp" ); + continuumProject.setNagEmailAddress( getNagEmailAddress( mavenProj= ect ) ); =20 - FileWriter writer =3D new FileWriter( f ); + continuumProject.setName( getProjectName( mavenProject ) ); =20 - IOUtil.copy( is, writer ); + continuumProject.setScmUrl( getScmUrl( mavenProject ) ); =20 - is.close(); + continuumProject.setVersion( getVersion( mavenProject ) ); =20 - writer.close(); + Properties configuration =3D continuumProject.getConfiguration(); =20 - return f; - } - catch ( Exception e ) + if ( !configuration.containsKey( MavenTwoBuildExecutor.CONFIGURATI= ON_GOALS ) ) { - throw new ContinuumException( "Cannot create metadata file:", = e ); + configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION= _GOALS, "clean:clean, install" ); } } =20 - protected MavenProject getProject( File file ) - throws ContinuumException + public MavenProject getMavenProject( File file ) + throws MavenBuilderHelperException { MavenProject project =3D null; =20 @@ -200,7 +99,7 @@ } catch ( ProjectBuildingException e ) { - throw new ContinuumException( "Cannot build maven project from= " + file, e ); + throw new MavenBuilderHelperException( "Cannot build maven pro= ject from " + file, e ); } =20 // ---------------------------------------------------------------= ------- @@ -212,12 +111,12 @@ =20 if ( ciManagement =3D=3D null ) { - throw new ContinuumException( "Missing CiManagement from the p= roject descriptor." ); + throw new MavenBuilderHelperException( "Missing CiManagement f= rom the project descriptor." ); } =20 if ( StringUtils.isEmpty( getNagEmailAddress( project ) ) ) { - throw new ContinuumException( "Missing nag email address from = the continuous integration info." ); + throw new MavenBuilderHelperException( "Missing nag email addr= ess from the continuous integration info." ); } =20 // SCM connection @@ -225,27 +124,67 @@ =20 if ( scm =3D=3D null ) { - throw new ContinuumException( "Missing Scm from the project de= scriptor." ); + throw new MavenBuilderHelperException( "Missing Scm from the p= roject descriptor." ); } =20 String url =3D scm.getConnection(); =20 if ( StringUtils.isEmpty( url ) ) { - throw new ContinuumException( "Missing anonymous scm connectio= n url." ); + throw new MavenBuilderHelperException( "Missing anonymous scm = connection url." ); } =20 // Version if ( StringUtils.isEmpty( project.getVersion() ) ) { - throw new ContinuumException( "Missing version from the projec= t descriptor." ); + throw new MavenBuilderHelperException( "Missing version from t= he project descriptor." ); } =20 return project; } =20 + // -------------------------------------------------------------------= --- + // + // -------------------------------------------------------------------= --- + + public String getProjectName( MavenProject project ) + { + String name =3D project.getName(); + + return name; + } + + private String getScmUrl( MavenProject project ) + { + return project.getScm().getConnection(); + } + + private String getNagEmailAddress( MavenProject project ) + { + for ( Iterator it =3D project.getCiManagement().getNotifiers().ite= rator(); it.hasNext(); ) + { + Notifier notifier =3D (Notifier) it.next(); + + if ( notifier.getType().equals( "mail" ) ) + { + return notifier.getAddress(); + } + } + + return null; + } + + private String getVersion( MavenProject project ) + { + return project.getVersion(); + } + + // -------------------------------------------------------------------= --- + // + // -------------------------------------------------------------------= --- + private ArtifactRepository getRepository() - throws ContinuumException + throws MavenBuilderHelperException { MavenSettings settings; =20 @@ -255,7 +194,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while building settings."= , e ); + throw new MavenBuilderHelperException( "Error while building s= ettings.", e ); } =20 Repository repository =3D new Repository(); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m2/MavenBuilderHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper= .java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelper.java Thu May 12 02:34:46 2005 @@ -18,8 +18,8 @@ =20 import java.io.File; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.project.ContinuumProject; +import org.apache.maven.project.MavenProject; =20 /** * @author Jason van Zyl @@ -29,12 +29,11 @@ { String ROLE =3D MavenBuilderHelper.class.getName(); =20 -// public ContinuumProject createProjectFromMetadata( URL metadata ) -// throws ContinuumException; + void mapMetadataToProject( File metadata, ContinuumProject project ) + throws MavenBuilderHelperException; =20 -// public void updateProjectFromMetadata( File workingDirectory, Contin= uumProject project ) -// throws ContinuumException; + MavenProject getMavenProject( File file ) + throws MavenBuilderHelperException; =20 - void mapMetadataToProject( File metadata, ContinuumProject project ) - throws ContinuumException; + void mapMavenProjectToContinuumProject( MavenProject mavenProject, Con= tinuumProject continuumProject ); } Added: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/= continuum/execution/maven/m2/MavenBuilderHelperException.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper= Exception.java?rev=3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelperException.java (added) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenBuilderHelperException.java Thu May 12 02:34= :46 2005 @@ -0,0 +1,35 @@ +package org.apache.maven.continuum.execution.maven.m2; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Trygve Laugstøl + * @version $Id:$ + */ +public class MavenBuilderHelperException + extends Exception +{ + public MavenBuilderHelperException( String message ) + { + super( message ); + } + + public MavenBuilderHelperException( String message, Throwable cause ) + { + super( message, cause ); + } +} Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/maven/m2/MavenTwoBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecu= tor.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenTwoBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/MavenTwoBuildExecutor.java Thu May 12 02:34:46 20= 05 @@ -18,11 +18,11 @@ =20 import java.io.File; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.execution.AbstractBuildExecutor; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; -import org.apache.maven.continuum.execution.shell.ShellCommandHelper; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorExceptio= n; import org.apache.maven.continuum.execution.shell.ExecutionResult; +import org.apache.maven.continuum.execution.shell.ShellCommandHelper; import org.apache.maven.continuum.project.ContinuumBuildResult; import org.apache.maven.continuum.project.ContinuumProject; =20 @@ -55,7 +55,7 @@ // -------------------------------------------------------------------= --- =20 public ContinuumBuildResult build( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { File workingDirectory =3D new File( project.getWorkingDirectory() = ); =20 @@ -71,7 +71,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while executing shell com= mand.", e ); + throw new ContinuumBuildExecutorException( "Error while execut= ing shell command.", e ); } =20 boolean success =3D executionResult.getExitCode() =3D=3D 0; @@ -89,18 +89,19 @@ return result; } =20 -// public ContinuumProject createProjectFromMetadata( URL metadata ) -// throws ContinuumException -// { -// return builderHelper.createProjectFromMetadata( metadata ); -// } -// public void updateProjectFromCheckOut( File workingDirectory, Continuu= mProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { File f =3D new File( workingDirectory, "pom.xml" ); =20 - builderHelper.mapMetadataToProject( f, project ); + try + { + builderHelper.mapMetadataToProject( f, project ); + } + catch ( MavenBuilderHelperException e ) + { + throw new ContinuumBuildExecutorException( "Error while mappin= g metadata" ); + } } =20 // -------------------------------------------------------------------= --- @@ -108,7 +109,7 @@ // -------------------------------------------------------------------= --- =20 private String[] getArguments( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { String[] a =3D splitAndTrimString( this.arguments, " " ); =20 Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/execution/shell/ShellBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.ja= va?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/shell/ShellBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/shell/ShellBuildExecutor.java Thu May 12 02:34:46 2005 @@ -18,9 +18,9 @@ =20 import java.io.File; =20 -import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.execution.AbstractBuildExecutor; import org.apache.maven.continuum.execution.ContinuumBuildExecutor; +import org.apache.maven.continuum.execution.ContinuumBuildExecutorExceptio= n; import org.apache.maven.continuum.project.ContinuumBuildResult; import org.apache.maven.continuum.project.ContinuumProject; =20 @@ -53,13 +53,13 @@ } =20 protected String getExecutable( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { return getConfigurationString( project.getConfiguration(), CONFIGU= RATION_EXECUTABLE ); } =20 protected String[] getArguments( ContinuumProject project ) - throws ContinuumException + throws ContinuumBuildExecutorException { return getConfigurationStringArray( project.getConfiguration(), CO= NFIGURATION_ARGUMENTS, " ", new String[ 0 ] ); } @@ -69,7 +69,7 @@ // -------------------------------------------------------------------= --- =20 public synchronized ContinuumBuildResult build( ContinuumProject proje= ct ) - throws ContinuumException + throws ContinuumBuildExecutorException { File workingDirectory =3D new File( project.getWorkingDirectory() = ); =20 @@ -94,7 +94,7 @@ } catch ( Exception e ) { - throw new ContinuumException( "Error while executing shell com= mand.", e ); + throw new ContinuumBuildExecutorException( "Error while execut= ing shell command.", e ); } =20 boolean success =3D executionResult.getExitCode() =3D=3D 0; @@ -113,7 +113,6 @@ } =20 public void updateProjectFromCheckOut( File workingDirectory, Continuu= mProject project ) - throws ContinuumException { // Not much to do. } Added: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/= continuum/project/builder/AbstractContinuumProjectBuilder.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProj= ectBuilder.java?rev=3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/AbstractContinuumProjectBuilder.java (added) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/AbstractContinuumProjectBuilder.java Thu May 12 02:3= 4:46 2005 @@ -0,0 +1,57 @@ +package org.apache.maven.continuum.project.builder; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.util.IOUtil; + +/** + * @author Trygve Laugstøl + * @version $Id:$ + */ +public abstract class AbstractContinuumProjectBuilder + extends AbstractLogEnabled + implements ContinuumProjectBuilder +{ + protected File createMetadataFile( URL metadata ) + throws IOException + { + getLogger().info( "Downloading " + metadata.toExternalForm() ); + + InputStream is =3D metadata.openStream(); + + File file =3D File.createTempFile( "continuum-", ".tmp" ); + + file.deleteOnExit(); + + FileWriter writer =3D new FileWriter( file ); + + IOUtil.copy( is, writer ); + + is.close(); + + writer.close(); + + return file; + } +} Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/project/builder/ContinuumProjectBuildingResult.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuild= ingResult.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/ContinuumProjectBuildingResult.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/ContinuumProjectBuildingResult.java Thu May 12 02:34= :46 2005 @@ -34,8 +34,10 @@ projects =3D new ArrayList(); } =20 - public void addProject( ContinuumProject project ) + public void addProject( ContinuumProject project, String executorId ) { + project.setExecutorId( executorId ); + projects.add( project ); } =20 Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinu= umProjectBuilder.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Thu May 1= 2 02:34:46 2005 @@ -19,22 +19,20 @@ import java.io.File; import java.net.URL; =20 +import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor; +import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelpe= r; import org.apache.maven.continuum.project.MavenOneProject; +import org.apache.maven.continuum.project.builder.AbstractContinuumProject= Builder; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderE= xception; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilding= Result; -import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelpe= r; -import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor; -import org.apache.maven.continuum.execution.AbstractBuildExecutor; - -import org.codehaus.plexus.logging.AbstractLogEnabled; =20 /** * @author Trygve Laugstøl * @version $Id:$ */ public class MavenOneContinuumProjectBuilder - extends AbstractLogEnabled + extends AbstractContinuumProjectBuilder implements ContinuumProjectBuilder { public static final String ID =3D "maven-one-builder"; @@ -53,15 +51,15 @@ =20 try { - File pomFile =3D AbstractBuildExecutor.createMetadataFile( url= ); + getLogger().info( "Downloading " + url.toExternalForm() ); + + File pomFile =3D createMetadataFile( url ); =20 MavenOneProject project =3D new MavenOneProject(); =20 metadataHelper.mapMetadata( pomFile, project ); =20 - project.setExecutorId( MavenOneBuildExecutor.ID ); - - result.addProject( project ); + result.addProject( project, MavenOneBuildExecutor.ID ); } catch ( Exception e ) { Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinu= umProjectBuilder.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Thu May 1= 2 02:34:46 2005 @@ -16,29 +16,34 @@ * limitations under the License. */ =20 -import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; +import java.util.Iterator; +import java.util.List; =20 +import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper; +import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelperExc= eption; +import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor; +import org.apache.maven.continuum.project.MavenTwoProject; +import org.apache.maven.continuum.project.builder.AbstractContinuumProject= Builder; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderE= xception; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilding= Result; -import org.apache.maven.continuum.project.MavenTwoProject; -import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper; -import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor; -import org.apache.maven.continuum.execution.AbstractBuildExecutor; - -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.apache.maven.project.MavenProject; =20 /** * @author Trygve Laugstøl * @version $Id:$ */ public class MavenTwoContinuumProjectBuilder - extends AbstractLogEnabled + extends AbstractContinuumProjectBuilder implements ContinuumProjectBuilder { public static final String ID =3D "maven-two-builder"; =20 + private static final String POM_PART =3D "/pom.xml"; + /** @requirement */ private MavenBuilderHelper builderHelper; =20 @@ -55,23 +60,68 @@ =20 ContinuumProjectBuildingResult result =3D new ContinuumProjectBuil= dingResult(); =20 - MavenTwoProject project =3D new MavenTwoProject(); + try + { + readModules( url, result ); + } + catch ( MalformedURLException e ) + { + throw new ContinuumProjectBuilderException( "Error while build= ing Maven project.", e ); + } + + return result; + } + + // -------------------------------------------------------------------= --- + // + // -------------------------------------------------------------------= --- + + private void readModules( URL url, ContinuumProjectBuildingResult resu= lt ) + throws MalformedURLException, ContinuumProjectBuilderException + { + MavenProject mavenProject =3D null; =20 try { - File file =3D AbstractBuildExecutor.createMetadataFile( url ); + mavenProject =3D builderHelper.getMavenProject( createMetadata= File( url ) ); + } + catch ( MavenBuilderHelperException e ) + { + throw new ContinuumProjectBuilderException( "Error while build= ing Maven project.", e ); + } + catch ( IOException e ) + { =20 - builderHelper.mapMetadataToProject( file, project ); } - catch ( Exception e ) + + MavenTwoProject continuumProject =3D new MavenTwoProject(); + + builderHelper.mapMavenProjectToContinuumProject( mavenProject, con= tinuumProject ); + + result.addProject( continuumProject, MavenTwoBuildExecutor.ID ); + + List modules =3D mavenProject.getModules(); + + String prefix =3D url.toExternalForm(); + + String suffix =3D ""; + + int i =3D prefix.indexOf( '?' ); + + if ( i !=3D -1 ) { - throw new ContinuumProjectBuilderException( "Cannot create con= tinuum project.", e ); + suffix =3D prefix.substring( i ); + + prefix =3D prefix.substring( 0, i - POM_PART.length() ); } =20 - project.setExecutorId( MavenTwoBuildExecutor.ID ); + for ( Iterator it =3D modules.iterator(); it.hasNext(); ) + { + String module =3D (String) it.next(); =20 - result.addProject( project ); + URL moduleUrl =3D new URL( prefix + "/" + module + POM_PART + = suffix ); =20 - return result; + readModules( moduleUrl, result ); + } } } Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/mav= en/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinu= umProjectBuilderTest.java?rev=3D169796&r1=3D169795&r2=3D169796&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (orig= inal) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Thu M= ay 12 02:34:46 2005 @@ -17,10 +17,15 @@ */ =20 import java.io.File; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Iterator; =20 import org.apache.maven.continuum.project.MavenTwoProject; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder; import org.apache.maven.continuum.project.builder.ContinuumProjectBuilding= Result; +import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor; =20 import org.codehaus.plexus.PlexusTestCase; =20 @@ -34,7 +39,8 @@ public void testGetNagEmailAddressWhenTypeIsSetToEmail() throws Exception { - ContinuumProjectBuilder projectBuilder =3D (ContinuumProjectBuilde= r) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID= ); + ContinuumProjectBuilder projectBuilder =3D (ContinuumProjectBuilde= r) + lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProject= Builder.ID ); =20 File pom =3D getTestFile( "src/test/repository/maven-builder-helpe= r-1.xml" ); =20 @@ -52,7 +58,8 @@ public void testGetNagEmailAddressWhenTypeIsntSet() throws Exception { - ContinuumProjectBuilder projectBuilder =3D (ContinuumProjectBuilde= r) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID= ); + ContinuumProjectBuilder projectBuilder =3D (ContinuumProjectBuilde= r) + lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProject= Builder.ID ); =20 File pom =3D getTestFile( "src/test/repository/maven-builder-helpe= r-2.xml" ); =20 @@ -65,5 +72,60 @@ MavenTwoProject project =3D (MavenTwoProject) result.getProjects()= .get( 0 ); =20 assertEquals( "foo@bar", project.getNagEmailAddress() ); + } + + public void testCreateProjectsWithModules() + throws Exception + { + ContinuumProjectBuilder projectBuilder =3D (ContinuumProjectBuilde= r) + lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProject= Builder.ID ); + + String url =3D getTestFile( "src/test/resources/projects/continuum= /pom.xml?foo=3Dbar" ).toURL().toExternalForm(); + + ContinuumProjectBuildingResult result =3D projectBuilder.createPro= jectsFromMetadata( new URL( url ) ); + + assertNotNull( result ); + + assertEquals( 6, result.getProjects().size() ); + + Map projects =3D new HashMap(); + + for ( Iterator it =3D result.getProjects().iterator(); it.hasNext(= ); ) + { + MavenTwoProject project =3D (MavenTwoProject) it.next(); + + assertNotNull( project.getName() ); + + projects.put( project.getName(), project ); + } + + assertMavenTwoProject( "Continuum Parent Project", projects ); + assertMavenTwoProject( "Continuum Core", projects ); + assertMavenTwoProject( "Continuum Model", projects ); + assertMavenTwoProject( "Continuum Plexus Application", projects ); + assertMavenTwoProject( "Continuum Web", projects ); + assertMavenTwoProject( "Continuum XMLRPC Interface", projects ); + } + + // -------------------------------------------------------------------= --- + // + // -------------------------------------------------------------------= --- + + private void assertMavenTwoProject( String name, Map projects ) + { + MavenTwoProject project =3D (MavenTwoProject) projects.get( name ); + + assertNotNull( project ); + + assertEquals( name, project.getName() ); + + String scmUrl =3D "scm:svn:http://svn.apache.org/repos/asf/maven/c= ontinuum/trunk"; + + assertTrue( project.getScmUrl().startsWith( scmUrl ) ); + + assertEquals( 1, project.getConfiguration().size() ); + + assertEquals( "clean:clean, install", + project.getConfiguration().get( MavenTwoBuildExecuto= r=2ECONFIGURATION_GOALS ) ); } } Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/continuum-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/continuum-core/pom.xml?rev=3D169796&view= =3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-core/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-core/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,138 @@ + + 4.0.0 + + continuum-parent + org.apache.maven.continuum + 1.0-alpha-2-SNAPSHOT + + continuum-core + Continuum Core + + + org.apache.maven.continuum + continuum-model + 1.0-alpha-2-SNAPSHOT + + + + + plexus + plexus-jdo + 1.0-alpha-1-SNAPSHOT + + + plexus + plexus-velocity + 1.0 + + + plexus + plexus-taskqueue + 1.0-alpha-1-SNAPSHOT + + + plexus + plexus-notification + 1.0-alpha-1-SNAPSHOT + + + plexus + plexus-mail-sender-api + 1.0-alpha-1-SNAPSHOT + + + + + org.apache.maven + maven-core + 2.0-alpha-1 + + + org.apache.maven + maven-model + 2.0-alpha-1 + + + org.apache.maven + maven-artifact + 2.0-alpha-1 + + + org.apache.maven.wagon + wagon-provider-api + 1.0-alpha-2 + + + org.apache.maven.scm + maven-scm-api + 1.0-alpha-1-SNAPSHOT + + + + jdo + jdo + 1.0.1 + + + junit + junit + 3.8.1 + + + velocity + velocity + 1.4 + + + + + org.apache.maven.scm + maven-scm-provider-local + 1.0-alpha-1-SNAPSHOT + test + + + plexus + plexus-mail-sender-simple + 1.0-alpha-1-SNAPSHOT + + + + plexus + plexus-mail-sender-test + 1.0-alpha-1-SNAPSHOT + test + + + jpox + jpox + 1.0.4 + + + hsqldb + hsqldb + 1.7.3.0 + test + + + xerces + xercesImpl + 2.6.2 + test + + + Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/continuum-model/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/continuum-model/pom.xml?rev=3D169796&vie= w=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-model/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-model/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,50 @@ + + + continuum-parent + org.apache.maven.continuum + 1.0-alpha-2-SNAPSHOT + + 4.0.0 + continuum-model + Continuum Model + + + jdo + jdo + 1.0.1 + + + jpox + jpox-enhancer + 1.0.4 + =20 + =20 + + + + maven-jpox-plugin + 1.0-SNAPSHOT + + + maven-modello-plugin + 1.0-alpha-1 + + 1.0.0 + false + src/main/resources/continuum.mdo + + + + java + + + jpox-jdo-mapping + =20 + + jpox-store + =20 + + + + + Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/continuum-plexus-application/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/continuum-plexus-application/pom.xml?rev= =3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-plexus-application/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-plexus-application/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,128 @@ + + 4.0.0 + + org.apache.maven.continuum + continuum-parent + 1.0-alpha-2-SNAPSHOT + + continuum-plexus-application + Continuum Plexus Application + + + org.apache.maven.continuum + continuum-web + 1.0-alpha-2-SNAPSHOT + + + org.apache.maven.continuum + continuum-xmlrpc + 1.0-alpha-2-SNAPSHOT + + + + classworlds + classworlds + 1.1-alpha-1 + test + + + plexus + plexus-utils + 1.0-alpha-3-SNAPSHOT + + + plexus + plexus-velocity + 1.0 + + + + + plexus + plexus-service-jetty + 1.0-alpha-1-SNAPSHOT + plexus-service + + + plexus + plexus-service-xmlrpc + 1.0-alpha-1-SNAPSHOT + plexus-service + + + + + + + org.apache.maven.scm + maven-scm-provider-cvs + 1.0-alpha-1-SNAPSHOT + runtime + + + org.apache.maven.scm + maven-scm-provider-svn + 1.0-alpha-1-SNAPSHOT + runtime + + + + + org.apache.maven.wagon + wagon-http-lightweight + 1.0-alpha-2 + runtime + + + + + plexus + plexus-mail-sender-simple + 1.0-alpha-1-SNAPSHOT + runtime + + + + + + maven-plexus-plugin + 1.0-SNAPSHOT + + + app + + + bundle-application + + + test-runtime + + + + continuum + src/conf/application.xml + app.properties + src/conf + src/test/conf/testRuntimeConfiguration= .xml + target + + + + maven-assembly-plugin + 1.0-SNAPSHOT + + src/assembly/bin.xml + continuum-1.0-alpha-2-SNAPSHOT + + + + + Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/continuum-web/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/continuum-web/pom.xml?rev=3D169796&view= =3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-web/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-web/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,79 @@ + + 4.0.0 + + org.apache.maven.continuum + continuum-parent + 1.0-alpha-2-SNAPSHOT + + continuum-web + Continuum Web + + + org.apache.maven.continuum + continuum-model + 1.0-alpha-2-SNAPSHOT + + + org.apache.maven.continuum + continuum-core + 1.0-alpha-2-SNAPSHOT + + + + + plexus + plexus-log4j-logging + 1.0-SNAPSHOT + + + plexus + plexus-i18n + 1.0-beta-3 + + + plexus + plexus-formica + 1.0-beta-3-SNAPSHOT + + + plexus + plexus-formica-web + 1.0-alpha-1-SNAPSHOT + + + plexus + plexus-summit + 1.0-beta-4-SNAPSHOT + + + plexus + plexus-velocity + 1.0 + + + + commons-fileupload + commons-fileupload + 1.0 + + + jdo + jdo + 1.0.1 + + + servletapi + servletapi + 2.3 + + + ognl + ognl + 2.5.1 + + + Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/continuum-xmlrpc/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/continuum-xmlrpc/pom.xml?rev=3D169796&vi= ew=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-xmlrpc/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/continuum-xmlrpc/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,22 @@ + + 4.0.0 + + org.apache.maven.continuum + continuum-parent + 1.0-alpha-2-SNAPSHOT + + continuum-xmlrpc + Continuum XMLRPC Interface + + + org.apache.maven.continuum + continuum-model + 1.0-alpha-2-SNAPSHOT + + + org.apache.maven.continuum + continuum-core + 1.0-alpha-2-SNAPSHOT + + + Added: maven/continuum/trunk/continuum-core/src/test/resources/projects/con= tinuum/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/resources/projects/continuum/pom.xml?rev=3D169796&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/pom.xml (added) +++ maven/continuum/trunk/continuum-core/src/test/resources/projects/contin= uum/pom.xml Thu May 12 02:34:46 2005 @@ -0,0 +1,92 @@ + + 4.0.0 + org.apache.maven.continuum + continuum-parent + 1.0-alpha-2-SNAPSHOT + pom + Continuum Parent Project + http://cvs.continuum.codehaus.org/ + + continuum + http://continuum.codehaus.org/continuumweb/servlet/continuum + + + mail +
dev@continuum.codehaus.org
+ + + + 2003 + + + Continuum Announce List + announce-subscribe@continuum.codehaus.org + announce-unsubscribe@continuum.codehaus.org + http://archive.continuum.codehaus.org/ + + + Continuum Despots List + despots-subscribe@continuum.codehaus.org + despots-unsubscribe@continuum.codehaus.org + http://archive.continuum.codehaus.org/ + + + Continuum Dev List + dev-subscribe@continuum.codehaus.org + dev-unsubscribe@continuum.codehaus.org + http://archive.continuum.codehaus.org/ + + + Continuum User List + user-subscribe@continuum.codehaus.org + user-unsubscribe@continuum.codehaus.org + http://archive.continuum.codehaus.org/ + + + Continuum SCM List + scm-subscribe@continuum.codehaus.org + scm-unsubscribe@continuum.codehaus.org + http://archive.continuum.codehaus.org/ + + + + + plexus + plexus-container-default + 1.0-alpha-2 + + + plexus + plexus-utils + 1.0-alpha-3-SNAPSHOT + + + junit + junit + 3.8.1 + test + + + + scm:svn:http://svn.apache.org/repos/asf/maven/continuum/tr= unk + http://svn.apache.org/viewcvs.cgi/maven/continuum/trunk + + + Apache + http://www.apache.org/ + + + + repo1 + Maven Repository + scp://beaver.codehaus.org/home/projects/maven/repository-stagin= g/to-ibiblio/maven2 + + + + continuum-core + continuum-model + continuum-plexus-application + continuum-web + continuum-xmlrpc + +