continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r327173 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/store/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java...
Date Fri, 21 Oct 2005 13:28:27 GMT
Author: evenisse
Date: Fri Oct 21 06:28:02 2005
New Revision: 327173

URL: http://svn.apache.org/viewcvs?rev=327173&view=rev
Log:
[CONTINUUM-361] Scheduler use now the correct build definition
[CONTINUUM-362] User can choose whiwh build definition is the default. The default build definition
will be use when user will force a build.

Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
    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/BuildController.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.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/buildqueue/BuildProjectTask.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
    maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
    maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
Fri Oct 21 06:28:02 2005
@@ -93,6 +93,9 @@
     void buildProject( int projectId, int trigger )
         throws ContinuumException;
 
+    void buildProject( int projectId, int buildDefinitionId, int trigger )
+        throws ContinuumException;
+
     // ----------------------------------------------------------------------
     // Build information
     // ----------------------------------------------------------------------
@@ -153,6 +156,12 @@
     // ----------------------------------------------------------------------
     // Build Definition
     // ----------------------------------------------------------------------
+
+    List getBuildDefinitions( int projectId )
+        throws ContinuumException;
+
+    BuildDefinition getDefaultBuildDefinition( int projectId )
+        throws ContinuumException;
 
     BuildDefinition getBuildDefinition( int projectId, int buildDefinitionId )
         throws ContinuumException;

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
Fri Oct 21 06:28:02 2005
@@ -51,6 +51,9 @@
     ProjectNotifier storeNotifier( ProjectNotifier notifier )
         throws ContinuumStoreException;
 
+    BuildDefinition getBuildDefinition( int buildDefinitionId )
+        throws ContinuumStoreException, ContinuumObjectNotFoundException;
+
     void removeBuildDefinition( BuildDefinition buildDefinition )
         throws ContinuumStoreException;
 

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=327173&r1=327172&r2=327173&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
Fri Oct 21 06:28:02 2005
@@ -257,15 +257,6 @@
     public void buildProjects( int trigger )
         throws ContinuumException
     {
-        /*
-        for ( Iterator i = getProjects().iterator(); i.hasNext(); )
-        {
-            Project project = (Project) i.next();
-
-            buildProject( project.getId(), trigger );
-        }
-        */
-
         Collection projectsList = null;
 
         try
@@ -316,7 +307,7 @@
                 if ( schedule.getId() == buildDef.getSchedule().getId() )
                 {
                     //TODO: Fix trigger name
-                    buildProject( project.getId(), ContinuumProjectState.TRIGGER_UNKNOWN
);
+                    buildProject( project.getId(), buildDef.getId(), ContinuumProjectState.TRIGGER_UNKNOWN
);
                 }
             }
         }
@@ -325,12 +316,22 @@
     public void buildProject( int projectId )
         throws ContinuumException
     {
-        buildProject( projectId, ContinuumProjectState.TRIGGER_FORCED );
+        BuildDefinition buildDef = getDefaultBuildDefinition( projectId );
+
+        buildProject( projectId, buildDef.getId(), ContinuumProjectState.TRIGGER_FORCED );
     }
 
     public void buildProject( int projectId, int trigger )
         throws ContinuumException
     {
+        BuildDefinition buildDef = getDefaultBuildDefinition( projectId );
+
+        buildProject( projectId, buildDef.getId(), trigger );
+    }
+
+    public void buildProject( int projectId, int buildDefinitionId, int trigger )
+        throws ContinuumException
+    {
         if ( isInBuildingQueue( projectId ) )
         {
             return;
@@ -340,9 +341,9 @@
         {
             Project project = store.getProject( projectId );
 
-            getLogger().info( "Enqueuing '" + project.getName() + "'." );
+            getLogger().info( "Enqueuing '" + project.getName() + "' (Build definition id="
+ buildDefinitionId + "." );
 
-            buildQueue.put( new BuildProjectTask( projectId, trigger ) );
+            buildQueue.put( new BuildProjectTask( projectId, buildDefinitionId, trigger )
);
         }
         catch ( ContinuumStoreException e )
         {
@@ -767,12 +768,38 @@
     // Build Definition
     // ----------------------------------------------------------------------
 
-    public BuildDefinition getBuildDefinition( int projectId, int buildDefinitionId )
+    public List getBuildDefinitions( int projectId )
         throws ContinuumException
     {
         Project project = getProjectWithAllDetails( projectId );
 
-        List buildDefinitions = project.getBuildDefinitions();
+        return project.getBuildDefinitions();
+    }
+
+    public BuildDefinition getDefaultBuildDefinition( int projectId )
+        throws ContinuumException
+    {
+        List buildDefinitions = getBuildDefinitions( projectId );
+
+        BuildDefinition buildDefinition = null;
+
+        for ( Iterator i = buildDefinitions.iterator(); i.hasNext(); )
+        {
+            buildDefinition = (BuildDefinition) i.next();
+
+            if ( buildDefinition.isDefaultForProject() )
+            {
+                break;
+            }
+        }
+
+        return buildDefinition;
+    }
+
+    public BuildDefinition getBuildDefinition( int projectId, int buildDefinitionId )
+        throws ContinuumException
+    {
+        List buildDefinitions = getBuildDefinitions( projectId );
 
         BuildDefinition buildDefinition = null;
 
@@ -804,6 +831,27 @@
 
         buildDefinition.setSchedule( schedule );
 
+        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) &&
!buildDefinition.isDefaultForProject() )
+        {
+            buildDefinition.setDefaultForProject( true );
+            
+            List buildDefinitions = getBuildDefinitions( projectId );
+
+            for ( Iterator i = buildDefinitions.iterator(); i.hasNext(); )
+            {
+                BuildDefinition bd = (BuildDefinition) i.next();
+
+                if ( bd.isDefaultForProject() )
+                {
+                    bd.setDefaultForProject( false );
+
+                    storeBuildDefinition( bd );
+
+                    break;
+                }
+            }
+        }
+
         storeBuildDefinition( buildDefinition );
     }
 
@@ -832,6 +880,27 @@
         buildDefinition.setArguments( (String) configuration.get( "arguments" ) );
 
         Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule"
) ).intValue() );
+
+        if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) )
+        {
+            buildDefinition.setDefaultForProject( true );
+            
+            List buildDefinitions = getBuildDefinitions( projectId );
+
+            for ( Iterator i = buildDefinitions.iterator(); i.hasNext(); )
+            {
+                BuildDefinition bd = (BuildDefinition) i.next();
+
+                if ( bd.isDefaultForProject() )
+                {
+                    bd.setDefaultForProject( false );
+
+                    storeBuildDefinition( bd );
+
+                    break;
+                }
+            }
+        }
 
         buildDefinition.setSchedule( schedule );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildController.java
Fri Oct 21 06:28:02 2005
@@ -24,5 +24,5 @@
 {
     String ROLE = BuildController.class.getName();
 
-    void build( int projectId, int trigger );
+    void build( int projectId, int buildDefinitionId, int trigger );
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
Fri Oct 21 06:28:02 2005
@@ -50,6 +50,6 @@
     {
         BuildProjectTask buildProjectTask = (BuildProjectTask) task;
 
-        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getTrigger()
);
+        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(),
buildProjectTask.getTrigger() );
     }
 }

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=327173&r1=327172&r2=327173&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
Fri Oct 21 06:28:02 2005
@@ -69,7 +69,7 @@
     /**
      * @todo structure of this method is a bit of a mess (too much exception/finally code)
      */
-    public void build( int projectId, int trigger )
+    public void build( int projectId, int buildDefinitionId, int trigger )
     {
         long startTime = System.currentTimeMillis();
 
@@ -108,6 +108,8 @@
             Map actionContext = new HashMap();
 
             actionContext.put( AbstractContinuumAction.KEY_PROJECT_ID, new Integer( projectId
) );
+
+            actionContext.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_ID, new Integer(
buildDefinitionId ) );
 
             actionContext.put( AbstractContinuumAction.KEY_TRIGGER, new Integer( trigger
) );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java
Fri Oct 21 06:28:02 2005
@@ -27,14 +27,18 @@
 {
     private int projectId;
 
+    private int buildDefinitionId;
+
     private long timestamp;
 
     private int trigger;
 
-    public BuildProjectTask( int projectId, int trigger )
+    public BuildProjectTask( int projectId, int buildDefinitionId, int trigger )
     {
         this.projectId = projectId;
 
+        this.buildDefinitionId = buildDefinitionId;
+
         this.timestamp = System.currentTimeMillis();
 
         this.trigger = trigger;
@@ -43,6 +47,11 @@
     public int getProjectId()
     {
         return projectId;
+    }
+
+    public int getBuildDefinitionId()
+    {
+        return buildDefinitionId;
     }
 
     public long getTimestamp()

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
Fri Oct 21 06:28:02 2005
@@ -38,6 +38,8 @@
 
     public static final String KEY_PROJECT_ID = "project-id";
 
+    public static final String KEY_BUILD_DEFINITION_ID = "build-definition-id";
+
     public static final String KEY_UNVALIDATED_PROJECT = "unvalidated-project";
 
     public static final String KEY_PROJECT_GROUP_ID = "project-group-id";
@@ -82,6 +84,11 @@
     public static int getProjectGroupId( Map context )
     {
         return Integer.valueOf( getString( context, KEY_PROJECT_GROUP_ID ) ).intValue();
+    }
+
+    public static int getBuildDefinitionId( Map context )
+    {
+        return getInteger( context, KEY_BUILD_DEFINITION_ID );
     }
 
     public static String getBuildId( Map context )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
Fri Oct 21 06:28:02 2005
@@ -103,7 +103,7 @@
         // TODO: select actualy build def
         List buildDefinitions = project.getBuildDefinitions();
 
-        BuildDefinition buildDefinition = (BuildDefinition) buildDefinitions.iterator().next();
+        BuildDefinition buildDefinition = store.getBuildDefinition( getBuildDefinitionId(
context ) );
 
         build.setScmResult( scmResult );
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
Fri Oct 21 06:28:02 2005
@@ -86,6 +86,8 @@
 
             BuildDefinition bd = new BuildDefinition();
 
+            bd.setDefaultForProject( true );
+
             bd.setArguments( "" );
 
             bd.setGoals( "clean:clean jar:install" );

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=327173&r1=327172&r2=327173&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
Fri Oct 21 06:28:02 2005
@@ -128,6 +128,8 @@
 
             BuildDefinition bd = new BuildDefinition();
 
+            bd.setDefaultForProject( true );
+
             bd.setArguments( "--batch-mode --non-recursive" );
 
             bd.setGoals( "clean:clean install" );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildqueue/BuildQueueTest.java
Fri Oct 21 06:28:02 2005
@@ -127,7 +127,7 @@
     private void buildProject( int projectId, int trigger )
         throws Exception
     {
-        buildQueue.put( new BuildProjectTask( projectId, trigger ) );
+        buildQueue.put( new BuildProjectTask( projectId, 0, trigger ) );
     }
 
     private void assertNextBuildIs( int expectedProjectId )

Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Fri Oct 21 06:28:02 2005
@@ -548,6 +548,12 @@
           <type>int</type>
         </field>
         <field>
+          <name>defaultForProject</name>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+        <field>
           <name>goals</name>
           <version>1.0.0+</version>
           <type>String</type>

Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
(original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
Fri Oct 21 06:28:02 2005
@@ -259,6 +259,12 @@
         return notifier;
     }
 
+    public BuildDefinition getBuildDefinition( int buildDefinitionId )
+        throws ContinuumStoreException, ContinuumObjectNotFoundException
+    {
+        return (BuildDefinition) getObjectById( BuildDefinition.class, buildDefinitionId
);
+    }
+
     public void removeBuildDefinition( BuildDefinition buildDefinition )
         throws ContinuumStoreException
     {

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml Fri Oct
21 06:28:02 2005
@@ -35,6 +35,15 @@
       <label-key>buildDefinition.arguments.label</label-key>
       <message-key>buildDefinition.arguments.message</message-key>
     </element>
+    <element>
+      <id>defaultForProject</id>
+      <validators>
+      </validators>
+      <type>checkbox</type>
+      <label-key>buildDefinition.default.label</label-key>
+      <message-key>buildDefinition.default.message</message-key>
+      <default-value>false</default-value>
+    </element>
   </elements>
 
   <!-- Add -->

Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
Fri Oct 21 06:28:02 2005
@@ -166,6 +166,8 @@
 buildDefinition.goals.message =  Enter one or more goals - leave empty to use the default
 buildDefinition.arguments.label = Arguments
 buildDefinition.arguments.message =  Enter one or more command line arguments
+buildDefinition.default.label = Is it default?
+buildDefinition.default.message =  Check it if it's the default build definition
 buildDefinition.schedule.label = Schedule
 
 // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm?rev=327173&r1=327172&r2=327173&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
Fri Oct 21 06:28:02 2005
@@ -40,6 +40,15 @@
             </td>
           </tr>
           <tr>
+            <th>$i18n.getString( "buildDefinition.default.label" )</th>
+            <td>
+              <input type="checkbox" name="defaultForProject" #if( $buildDefinition.defaultForProject
) checked="checked" #end/>
+                  <p>
+                    $i18n.getString( "buildDefinition.default.message" ) <font color="red"><b></b></font>
+                  </p>
+            </td>
+          </tr>
+          <tr>
             <th>$i18n.getString( "buildDefinition.schedule.label" )</th>
             <td>
               <select name="schedule">



Mime
View raw message