continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1333330 - in /continuum/trunk: continuum-core/src/main/java/org/apache/continuum/builder/distributed/ continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/ continuum-docs/src/site/apt/user_guides/managing_builddef/ conti...
Date Thu, 03 May 2012 07:27:15 GMT
Author: ctan
Date: Thu May  3 07:27:14 2012
New Revision: 1333330

URL: http://svn.apache.org/viewvc?rev=1333330&view=rev
Log:
[CONTINUUM-2436] make Build Fresh != Always Build

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt
    continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/DefaultDistributedBuildService.java
Thu May  3 07:27:14 2012
@@ -411,11 +411,6 @@ public class DefaultDistributedBuildServ
     
             List<ChangeSet> changes = distributedBuildUtil.getScmChanges( context );
     
-            if ( buildDefinition.isBuildFresh() )
-            {
-                log.info( "FreshBuild configured, building (projectId=" + projectId + ")"
);
-                return true;
-            }
             if ( buildDefinition.isAlwaysBuild() )
             {
                 log.info( "AlwaysBuild configured, building (projectId=" + projectId + ")"
);

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Thu May  3 07:27:14 2012
@@ -490,11 +490,6 @@ public class DefaultBuildController
         throws TaskExecutionException
     {
         BuildDefinition buildDefinition = context.getBuildDefinition();
-        if ( buildDefinition.isBuildFresh() )
-        {
-            log.info( "FreshBuild configured, building" );
-            return true;
-        }
         if ( buildDefinition.isAlwaysBuild() )
         {
             log.info( "AlwaysBuild configured, building" );

Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt
(original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt
Thu May  3 07:27:14 2012
@@ -25,7 +25,7 @@ Project Group Build Definition
     * You may have arguments for Maven, such as <<<--batch-mode --non-recursive>>>.
     Add your arguments in the <<Arguments>> text box or leave it empty.
 
-    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build
process. <<Build Fresh>> will always build the project.
+    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build
process.
     Check <<Always Build>> if you want to execute the goal every time you build
the project.
     If you want this build definition to be your default for building your project,
     check the <<Is it default?>> check box.

Modified: continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt
(original)
+++ continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt
Thu May  3 07:27:14 2012
@@ -27,7 +27,7 @@ Project Build Definition
     * You may have arguments for Maven, such as <<<--batch-mode --non-recursive>>>.
     Add your arguments in the <<Arguments>> text box or leave it empty.
 
-    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build
process. <<BuildFresh>> will always build the project.
+    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build
process.
     Check <<Always Build>> if you want to execute the goal every time you build
the project.
     If you want this build definition to be your default for building your project,
     check the <<Is it default?>> check box.

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
(original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
Thu May  3 07:27:14 2012
@@ -488,16 +488,7 @@ public abstract class AbstractContinuumT
         assertElementPresent( "buildDefinitionType" );
         assertTextPresent( "Build Environment" );
         assertElementPresent( "profileId" );
-
-        if ( isChecked( "buildFresh" ) )
-        {
-            assertDisabled( "alwaysBuild" );
-            assertIsChecked( "alwaysBuild" );
-        }
-        else
-        {
-            assertEnabled( "alwaysBuild" );
-        }
+        assertEnabled( "alwaysBuild" );
     }
 
     public void addEditGroupBuildDefinition(String groupName,String buildFile,String goals,String
arguments,
@@ -520,8 +511,6 @@ public abstract class AbstractContinuumT
 
             // need to do this for the onclick event
             click( "buildFresh" );
-            assertDisabled( "alwaysBuild" );
-            assertIsChecked( "alwaysBuild" );
         }
         else
         {
@@ -532,10 +521,9 @@ public abstract class AbstractContinuumT
 
             // need to do this for the onclick event
             click( "buildFresh" );
-            assertEnabled( "alwaysBuild" );
-            assertIsNotChecked( "alwaysBuild" );
         }
 
+        assertEnabled( "alwaysBuild" );
         if ( isElementPresent( "defaultBuildDefinition" ) )
         {
             if ( isDefault )

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
Thu May  3 07:27:14 2012
@@ -53,7 +53,7 @@ public abstract class AbstractBuildDefin
         }
         bds.setDescription( buildDefinition.getDescription() );
         bds.setType( buildDefinition.getType() );
-        bds.setAlwaysBuild( buildDefinition.isBuildFresh() || buildDefinition.isAlwaysBuild()
);
+        bds.setAlwaysBuild( buildDefinition.isAlwaysBuild() );
         return bds;
     }
 

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=1333330&r1=1333329&r2=1333330&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Thu
May  3 07:27:14 2012
@@ -24,21 +24,6 @@
   <s:i18n name="localization.Continuum">
     <head>
         <title><s:text name="buildDefinition.page.title"/></title>
-        <script language="javascript">
-          function setAlwaysBuild()
-          {
-              if ( document.saveBuildDefinition.buildFresh.checked == true )
-              {
-                  document.saveBuildDefinition.alwaysBuild.checked = true;
-                  document.saveBuildDefinition.alwaysBuild.disabled = true;
-              }
-              else
-              {
-                  document.saveBuildDefinition.alwaysBuild.checked = false;
-                  document.saveBuildDefinition.alwaysBuild.disabled = false;
-              }
-          }
-        </script>
     </head>
     <body>
       <div id="axial" class="h3">
@@ -80,15 +65,8 @@
                     </s:else>
     
                     <s:textfield label="%{getText('buildDefinition.arguments.label')}"
name="arguments"/>
-                    <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}"
id="buildFresh" name="buildFresh" value="buildFresh" fieldValue="true" onclick="setAlwaysBuild();"/>
-                    <c:choose>
-                    <c:when test="${buildFresh == true}">
-                      <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}"
id="alwaysBuild" name="alwaysBuild" value="true" disabled="true"/>
-                    </c:when>
-                    <c:otherwise>
-                      <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}"
id="alwaysBuild" name="alwaysBuild"/>
-                    </c:otherwise>
-                    </c:choose>
+                    <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}"
id="buildFresh" name="buildFresh" value="buildFresh" fieldValue="true"/>
+                    <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}"
id="alwaysBuild" name="alwaysBuild" value="alwaysBuild" fieldValue="true"/>
                     <c:choose>
                     <c:when test="${defaultBuildDefinition == true}">
                       <s:label label="%{getText('buildDefinition.defaultForProject.label')}"
value="true"/>



Mime
View raw message