From continuum-commits-return-166-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Mon May 16 18:08:16 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 57608 invoked from network); 16 May 2005 18:08:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 May 2005 18:08:15 -0000 Received: (qmail 52935 invoked by uid 500); 16 May 2005 14:59:56 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 52896 invoked by uid 500); 16 May 2005 14:59:55 -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 52882 invoked by uid 99); 16 May 2005 14:59:55 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,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; Mon, 16 May 2005 07:59:53 -0700 Received: (qmail 95760 invoked by uid 65534); 16 May 2005 14:59:40 -0000 Message-ID: <20050516145940.95759.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r170394 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum: DefaultContinuum.java buildcontroller/DefaultBuildController.java execution/maven/m2/DefaultMavenBuilderHelper.java project/builder/maven/MavenTwoContinuumProjectBuilder.java Date: Mon, 16 May 2005 14:59:40 -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: Mon May 16 07:59:38 2005 New Revision: 170394 URL: http://svn.apache.org/viewcvs?rev=3D170394&view=3Drev Log: o Fixing broken test. 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/maven/m2/DefaultMavenBuilderHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/builder/maven/MavenTwoContinuumProjectBuilder.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=3D170394&r1= =3D170393&r2=3D170394&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 Mon May 16 07:59:38 2005 @@ -249,7 +249,7 @@ // Maven 2.x projects // -------------------------------------------------------------------= --- =20 - public void addMavenTwoProject( String metadataUrl ) =20 + public void addMavenTwoProject( String metadataUrl ) throws ContinuumException { core.addProjectsFromUrl( metadataUrl, MavenTwoBuildExecutor.ID ); 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=3D170394&r1=3D170393&r2=3D170394&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 Mon May 16 07:59:38 2005 @@ -286,7 +286,10 @@ setBuildResult( context.build.getId(), context.state, context.resu= lt, context.scmResult, e ); } =20 - private void setBuildResult( String buildId, int state, ContinuumBuild= Result result, UpdateScmResult scmResult, + private void setBuildResult( String buildId, + int state, + ContinuumBuildResult result, + UpdateScmResult scmResult, Throwable e ) throws ContinuumStoreException { 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=3D170394&r1=3D170393&r2=3D170394&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 Mon May 16 07:59:3= 8 2005 @@ -31,7 +31,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.settings.MavenSettingsBuilder; -import org.apache.maven.settings.Settings; + import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; =20 @@ -182,12 +182,11 @@ // -------------------------------------------------------------------= --- =20 private ArtifactRepository getRepository() - throws MavenBuilderHelperException { Repository repository =3D new Repository(); =20 - return artifactRepositoryFactory.createArtifactRepository( "local"= ,=20 - "file:/= /" + localRepository,=20 + return artifactRepositoryFactory.createArtifactRepository( "local", + "file:/= /" + localRepository, reposit= oryLayout, reposit= ory.getSnapshotPolicy() ); } 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=3D170394&r1=3D170393&r2=3D170394&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 Mon May 1= 6 07:59:38 2005 @@ -109,6 +109,10 @@ =20 prefix =3D prefix.substring( 0, i - POM_PART.length() ); } + else + { + prefix =3D prefix.substring( 0, prefix.length() - POM_PART.len= gth() ); + } =20 for ( Iterator it =3D modules.iterator(); it.hasNext(); ) {