You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/11 23:25:43 UTC

svn commit: r725845 - /continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java

Author: olamy
Date: Thu Dec 11 14:25:43 2008
New Revision: 725845

URL: http://svn.apache.org/viewvc?rev=725845&view=rev
Log:
[CONTINUUM-1953] [regression] Build definitions not linked when creating a new project with a given build defintion template


Modified:
    continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java

Modified: continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=725845&r1=725844&r2=725845&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Thu Dec 11 14:25:43 2008
@@ -27,6 +27,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.continuum.dao.LocalRepositoryDao;
@@ -305,6 +306,12 @@
                 continuumProject.setScmTag( mavenProject.getScm().getTag() );
             }
 
+            // CONTINUUM-1953 add build def from build template def used
+            for ( Iterator<BuildDefinition> iterator = buildDefinitionTemplate.getBuildDefinitions().iterator(); iterator
+                .hasNext(); )
+            {
+                continuumProject.addBuildDefinition( iterator.next() );
+            }
             result.addProject( continuumProject, MavenTwoBuildExecutor.ID );
         }
 



Re: svn commit: r725845 - /continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java

Posted by Olivier Lamy <ol...@apache.org>.
Hi,
It looks this commit break some units.
I will review that .

--
Olivier

2008/12/11  <ol...@apache.org>:
> Author: olamy
> Date: Thu Dec 11 14:25:43 2008
> New Revision: 725845
>
> URL: http://svn.apache.org/viewvc?rev=725845&view=rev
> Log:
> [CONTINUUM-1953] [regression] Build definitions not linked when creating a new project with a given build defintion template
>
>
> Modified:
>    continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
>
> Modified: continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
> URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=725845&r1=725844&r2=725845&view=diff
> ==============================================================================
> --- continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
> +++ continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Thu Dec 11 14:25:43 2008
> @@ -27,6 +27,7 @@
>  import java.net.URISyntaxException;
>  import java.net.URL;
>  import java.util.ArrayList;
> +import java.util.Iterator;
>  import java.util.List;
>
>  import org.apache.continuum.dao.LocalRepositoryDao;
> @@ -305,6 +306,12 @@
>                 continuumProject.setScmTag( mavenProject.getScm().getTag() );
>             }
>
> +            // CONTINUUM-1953 add build def from build template def used
> +            for ( Iterator<BuildDefinition> iterator = buildDefinitionTemplate.getBuildDefinitions().iterator(); iterator
> +                .hasNext(); )
> +            {
> +                continuumProject.addBuildDefinition( iterator.next() );
> +            }
>             result.addProject( continuumProject, MavenTwoBuildExecutor.ID );
>         }
>
>
>
>