continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r377721 - in /maven/continuum/branches/continuum-1.0.x: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-web/src/main/resources/META-INF/plexus/
Date Tue, 14 Feb 2006 13:24:17 GMT
Author: evenisse
Date: Tue Feb 14 05:24:14 2006
New Revision: 377721

URL: http://svn.apache.org/viewcvs?rev=377721&view=rev
Log:
[CONTINUUM-592] Fix NPE. I renamed addBuildDefinition(projectId, configuration) because ognl
choose the wrong method

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=377721&r1=377720&r2=377721&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
Tue Feb 14 05:24:14 2006
@@ -191,7 +191,7 @@
     void addBuildDefinition( int projectId, BuildDefinition buildDefinition )
         throws ContinuumException;
 
-    void addBuildDefinition( int projectId, Map configuration )
+    void addBuildDefinitionFromParams( int projectId, Map configuration )
         throws ContinuumException;
 
     void removeBuildDefinition( int projectId, int buildDefinitionId )

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=377721&r1=377720&r2=377721&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Tue Feb 14 05:24:14 2006
@@ -1077,7 +1077,10 @@
 
         buildDefinition.setSchedule( schedule );
 
-        buildDefinition.setDefaultForProject( true );
+        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) )
+        {
+            buildDefinition.setDefaultForProject( true );
+        }
 
         updateBuildDefinition( buildDefinition, projectId );
     }
@@ -1117,7 +1120,7 @@
         updateProject( project );
     }
 
-    public void addBuildDefinition( int projectId, Map configuration )
+    public void addBuildDefinitionFromParams( int projectId, Map configuration )
         throws ContinuumException
     {
         BuildDefinition buildDefinition = new BuildDefinition();

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=377721&r1=377720&r2=377721&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
Tue Feb 14 05:24:14 2006
@@ -562,7 +562,7 @@
            -->
           <call>
             <cid>addBuildDefinition</cid>
-            <expression>addBuildDefinition(#id,#parameters)</expression>
+            <expression>addBuildDefinitionFromParams(#id,#parameters)</expression>
           </call>
           <call>
             <cid>deleteBuildDefinition</cid>



Mime
View raw message