continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
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 GMT
Author: trygvis
Date: Mon May 16 07:59:38 2005
New Revision: 170394

URL: http://svn.apache.org/viewcvs?rev=170394&view=rev
Log:
o Fixing broken test.

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    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/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=170394&r1=170393&r2=170394&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Mon May 16 07:59:38 2005
@@ -249,7 +249,7 @@
     // Maven 2.x projects
     // ----------------------------------------------------------------------
 
-    public void addMavenTwoProject( String metadataUrl )  
+    public void addMavenTwoProject( String metadataUrl )
         throws ContinuumException
     {
         core.addProjectsFromUrl( metadataUrl, MavenTwoBuildExecutor.ID );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=170394&r1=170393&r2=170394&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Mon May 16 07:59:38 2005
@@ -286,7 +286,10 @@
         setBuildResult( context.build.getId(), context.state, context.result, context.scmResult,
e );
     }
 
-    private void setBuildResult( String buildId, int state, ContinuumBuildResult 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/maven/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/DefaultMavenBuilderHelper.java?rev=170394&r1=170393&r2=170394&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Mon May 16 07:59:38 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;
 
@@ -182,12 +182,11 @@
     // ----------------------------------------------------------------------
 
     private ArtifactRepository getRepository()
-        throws MavenBuilderHelperException
     {
         Repository repository = new Repository();
 
-        return artifactRepositoryFactory.createArtifactRepository( "local", 
-                                                                   "file://" + localRepository,

+        return artifactRepositoryFactory.createArtifactRepository( "local",
+                                                                   "file://" + localRepository,
                                                                    repositoryLayout,
                                                                    repository.getSnapshotPolicy()
);
     }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/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/MavenTwoContinuumProjectBuilder.java?rev=170394&r1=170393&r2=170394&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 May 16 07:59:38 2005
@@ -109,6 +109,10 @@
 
             prefix = prefix.substring( 0, i - POM_PART.length() );
         }
+        else
+        {
+            prefix = prefix.substring( 0, prefix.length() - POM_PART.length() );
+        }
 
         for ( Iterator it = modules.iterator(); it.hasNext(); )
         {



Mime
View raw message