continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r443441 - in /maven/continuum/branches/continuum-acegi: ./ continuum-api/ continuum-cc/ continuum-core-it/ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/resources/META-INF/plexus/ continuum...
Date Thu, 14 Sep 2006 19:11:03 GMT
Author: carlos
Date: Thu Sep 14 12:11:01 2006
New Revision: 443441

URL: http://svn.apache.org/viewvc?view=rev&rev=443441
Log:
Merged rev# 440537-443440 from trunk

Added:
    maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/TestAction.java
      - copied unchanged from r443424, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/TestAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
      - copied unchanged from r443424, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/
      - copied from r443424, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java
      - copied unchanged from r443424, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/DefaultXmlRpcService.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java
      - copied unchanged from r443424, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/xmlrpc/XmlRpcService.java
Removed:
    maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java
Modified:
    maven/continuum/branches/continuum-acegi/continuum-api/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-cc/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core-it/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/continuum-acegi/continuum-core/src/test-projects/timeout/   (props changed)
    maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
    maven/continuum/branches/continuum-acegi/continuum-model/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-irc/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-jabber/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-msn/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-notifiers/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-plexus-application/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-rpc-client/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-store/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
    maven/continuum/branches/continuum-acegi/continuum-test/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-web/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/template/default/controlfooter.ftl
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
    maven/continuum/branches/continuum-acegi/continuum-xmlrpc/pom.xml
    maven/continuum/branches/continuum-acegi/pom.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-api</artifactId>
   <name>Continuum API</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-cc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-cc/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-cc/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-cc/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-cc</artifactId>
   <name>Continuum Cruise Control Importer</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-acegi/continuum-core-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core-it/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core-it/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core-it/pom.xml Thu Sep 14 12:11:01 2006
@@ -7,7 +7,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core-it</artifactId>
   <name>Continuum Core Integration Test</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -50,7 +49,7 @@
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-webapp</artifactId>
       <type>pom</type>
-      <version>1.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-core</artifactId>
   <name>Continuum Core</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.derby</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Thu Sep 14 12:11:01 2006
@@ -177,16 +177,6 @@
         } );
     }
 
-    public void setActionManager( ActionManager actionManager )
-    {
-        this.actionManager = actionManager;
-    }
-
-    public ActionManager getActionManager()
-    {
-        return actionManager;
-    }
-
     // ----------------------------------------------------------------------
     // Project Groups
     // ----------------------------------------------------------------------
@@ -208,7 +198,6 @@
         throw new ContinuumException( "invalid group id" );
     }
 
-
     public ProjectGroup getProjectGroupByProjectId( int projectId )
         throws ContinuumException
     {
@@ -432,7 +421,6 @@
         buildProjects( ContinuumProjectState.TRIGGER_FORCED );
     }
 
-
     /**
      * fire of the builds of all projects across all project groups using their default build definitions
      *
@@ -467,16 +455,11 @@
             {
                 buildDefId = new Integer( store.getDefaultBuildDefinition( project.getId() ).getId() );
             }
-            catch (ContinuumStoreException e)
+            catch ( ContinuumStoreException e )
             {
                 throw new ContinuumException(
                     "Project (id=" + project.getId() + " doens't have a default build definition, this should be impossible, parent should have default definition set." );
             }
-            if ( buildDefId == null )
-            {
-                throw new ContinuumException(
-                    "Project (id=" + project.getId() + " doens't have a default build definition, this should be even more impossible since store should have throw exception" );
-            }
 
             buildProject( project, buildDefId.intValue(), trigger );
         }
@@ -496,7 +479,7 @@
 
         try
         {
-            projectsList = getProjectsInBuildOrder( store.getProjectsWithDependenciesByGroupId( projectGroupId ));
+            projectsList = getProjectsInBuildOrder( store.getProjectsWithDependenciesByGroupId( projectGroupId ) );
         }
         catch ( CycleDetectedException e )
         {
@@ -517,16 +500,11 @@
             {
                 buildDefId = new Integer( store.getDefaultBuildDefinition( project.getId() ).getId() );
             }
-            catch (ContinuumStoreException e)
+            catch ( ContinuumStoreException e )
             {
                 throw new ContinuumException(
                     "Project (id=" + project.getId() + " doens't have a default build definition, this should be impossible, parent should have default definition set." );
             }
-            if ( buildDefId == null )
-            {
-                throw new ContinuumException(
-                    "Project (id=" + project.getId() + " doens't have a default build definition, this should be even more impossible since store should have throw exception" );
-            }
 
             buildProject( project, buildDefId.intValue(), ContinuumProjectState.TRIGGER_FORCED );
         }
@@ -560,8 +538,6 @@
                 getLogger().info( "No projects to build for schedule " + schedule );
                 return;
             }
-
-
         }
         catch ( ContinuumStoreException e )
         {
@@ -588,20 +564,23 @@
 
             getLogger().info( "Building " + projectsList.size() + " projects" );
 
-            List buildDefinitionIds = (List) projectGroupsMap.get( new Integer( projectGroup.getId() ) );
+            List groupBuildDefinitionIds = (List) projectGroupsMap.get( new Integer( projectGroup.getId() ) );
 
             for ( Iterator j = projectsList.iterator(); j.hasNext(); )
             {
                 Project project = (Project) j.next();
 
                 // iterate through the project group build definitions and build
-                buildFromDefinitionIds( buildDefinitionIds, project );
+                buildFromDefinitionIds( groupBuildDefinitionIds, project );
 
                 // iterate through the project build definitions and build
-                if ( projectsMap != null )
+                List buildDefIds = projectsMap == null ? null : (List) projectsMap.get( new Integer( project.getId() ) );
+
+                buildFromDefinitionIds( buildDefIds, project );
+
+                if ( buildDefIds == null || buildDefIds.isEmpty() )
                 {
-                    List buildDefIds = (List) projectsMap.get( new Integer( project.getId() ) );
-                    buildFromDefinitionIds( buildDefIds, project );
+                    getLogger().info( "No build definitions, not building for project " + project );
                 }
             }
         }
@@ -616,6 +595,7 @@
             for ( Iterator buildDefinitionIterator = buildDefinitionIds.iterator(); buildDefinitionIterator.hasNext(); )
             {
                 Integer buildDefId = (Integer) buildDefinitionIterator.next();
+
                 if ( buildDefId != null && !isInBuildingQueue( project.getId(), buildDefId.intValue() )
                     && !isInCheckoutQueue( project.getId() ) )
                 {
@@ -623,10 +603,6 @@
                 }
             }
         }
-        else
-        {
-            getLogger().info( "No build definitions, not building for project " + project );
-        }
     }
 
     public void buildProject( int projectId )
@@ -711,7 +687,7 @@
                 if ( executor.isBuilding( project ) )
                 {
                     // project is building
-                    getLogger().info( "Project '" + project.getName() + "' always running." );
+                    getLogger().info( "Project '" + project.getName() + "' already being built." );
 
                     return;
                 }
@@ -728,7 +704,12 @@
             getLogger().info(
                 "Enqueuing '" + project.getName() + "' (Build definition id=" + buildDefinitionId + ")." );
 
-            buildQueue.put( new BuildProjectTask( project.getId(), buildDefinitionId, trigger ) );
+            BuildProjectTask task = new BuildProjectTask( project.getId(), buildDefinitionId, trigger );
+
+            task.setMaxExecutionTime( store.getBuildDefinition( buildDefinitionId ).getSchedule()
+                .getMaxJobExecutionTime() * 1000 );
+
+            buildQueue.put( task );
         }
         catch ( ContinuumStoreException e )
         {
@@ -1328,7 +1309,6 @@
         }
     }
 
-
     public List getBuildDefinitionsForProject( int projectId )
         throws ContinuumException
     {
@@ -2253,7 +2233,7 @@
     {
         try
         {
-            Action action = getActionManager().lookup( actionName );
+            Action action = actionManager.lookup( actionName );
 
             action.execute( context );
         }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/META-INF/plexus/components.xml Thu Sep 14 12:11:01 2006
@@ -182,7 +182,7 @@
           </property>
         </updateProperties>
       </configuration>
-      
+
     </component>
 
     <component>
@@ -438,6 +438,7 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>build-project</role-hint>
       <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
+      <instantiation-strategy>singleton</instantiation-strategy>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
@@ -483,6 +484,7 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>check-out-project</role-hint>
       <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
+      <instantiation-strategy>singleton</instantiation-strategy>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>

Propchange: maven/continuum/branches/continuum-acegi/continuum-core/src/test-projects/timeout/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 14 12:11:01 2006
@@ -0,0 +1 @@
+target

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Thu Sep 14 12:11:01 2006
@@ -252,4 +252,25 @@
 
         assertEquals( "Remove project group failed", projectGroupsBefore, projectGroupList.size() );
     }
+
+    public void testExecuteAction()
+        throws Exception
+    {
+        DefaultContinuum continuum = (DefaultContinuum) lookup( Continuum.ROLE );
+
+        String exceptionName = ContinuumException.class.getName();
+        try
+        {
+            continuum.executeAction( "testAction", new HashMap() );
+        }
+        catch ( ContinuumException e )
+        {
+            //expected, check for twice wrapped exception
+            if ( e.getCause() != null )
+            {
+                assertFalse( exceptionName + " is wrapped in " + exceptionName, e.getCause().getClass()
+                    .equals( ContinuumException.class ) );
+            }
+        }
+    }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java Thu Sep 14 12:11:01 2006
@@ -31,6 +31,7 @@
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -174,8 +175,8 @@
     {
         BuildProjectTask task = createTask( maxRunTime );
 
-        getTestFile( "src/test-projects/timeout/target/TEST-STARTED" ).delete();
-        getTestFile( "src/test-projects/timeout/target/TEST-COMPLETED" ).delete();
+        FileUtils.forceDelete( getTestFile( "src/test-projects/timeout/target/TEST-STARTED" ) );
+        FileUtils.forceDelete( getTestFile( "src/test-projects/timeout/target/TEST-COMPLETED" ) );
 
         System.err.println( "Queueing build" );
 

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml Thu Sep 14 12:11:01 2006
@@ -7,6 +7,11 @@
         <toOverride>nobody@localhost</toOverride>
       </configuration>
     </component>
+    <component>
+      <role>org.codehaus.plexus.action.Action</role>
+      <role-hint>testAction</role-hint>
+      <implementation>org.apache.maven.continuum.TestAction</implementation>
+    </component>
     <!--
      |
      | These point to the flows that we use as part of the runtime.

Modified: maven/continuum/branches/continuum-acegi/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-model/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-model/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-model/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-model</artifactId>
   <name>Continuum Model</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo Thu Sep 14 12:11:01 2006
@@ -804,6 +804,16 @@
           <type>int</type>
         </field>
         <field>
+          <name>maxJobExecutionTime</name>
+          <description>
+            Maximum execution time of a job in seconds before it's
+            terminated.
+          </description>
+          <version>1.0.0+</version>
+          <type>int</type>
+          <defaultValue>3600</defaultValue>
+        </field>
+        <field>
           <name>cronExpression</name>
           <version>1.0.0+</version>
           <type>String</type>

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-api/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,5 +10,4 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-api</artifactId>
   <name>Continuum Notifier API</name>
-  <version>1.1-SNAPSHOT</version>
 </project>

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-irc/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-irc/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-irc</artifactId>
   <name>Continuum IRC Notifier</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -20,7 +19,7 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-jabber/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-jabber/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,12 +10,11 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-jabber</artifactId>
   <name>Continuum Jabber Notifier</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-msn/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/continuum-notifier-msn/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-msn</artifactId>
   <name>Continuum MSN Notifier</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -20,7 +19,7 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/branches/continuum-acegi/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-notifiers/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-notifiers/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-notifiers/pom.xml Thu Sep 14 12:11:01 2006
@@ -8,7 +8,6 @@
   <artifactId>continuum-notifiers</artifactId>
   <packaging>pom</packaging>
   <name>Continuum Notifiers</name>
-  <version>1.1-SNAPSHOT</version>
   <modules>
     <module>continuum-notifier-api</module>
     <module>continuum-notifier-irc</module>

Modified: maven/continuum/branches/continuum-acegi/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-plexus-application/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-plexus-application/pom.xml Thu Sep 14 12:11:01 2006
@@ -8,7 +8,6 @@
   <artifactId>continuum-plexus-application</artifactId>
   <packaging>plexus-application</packaging>
   <name>Continuum Plexus Application</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -22,7 +21,7 @@
         </executions>
         <configuration>
           <descriptor>src/assembly/bin.xml</descriptor>
-          <finalName>continuum-1.1-SNAPSHOT</finalName>
+          <finalName>continuum-${pom.version}</finalName>
         </configuration>
       </plugin>
       <plugin>

Modified: maven/continuum/branches/continuum-acegi/continuum-rpc-client/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-rpc-client/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-rpc-client/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-rpc-client/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-rpc-client</artifactId>
   <name>Continuum client XML-RPC</name>
-  <version>1.1-SNAPSHOT</version>
   <description>XML-RPC client code for accessing Apache Continuum servers</description>
   <build>
     <plugins>

Modified: maven/continuum/branches/continuum-acegi/continuum-store/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-store/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-store/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-store/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-store</artifactId>
   <name>Continuum Store</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Thu Sep 14 12:11:01 2006
@@ -36,6 +36,7 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import javax.jdo.Extent;
+import javax.jdo.FetchPlan;
 import javax.jdo.JDOHelper;
 import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
@@ -1381,6 +1382,7 @@
         PersistenceManager pm = pmf.getPersistenceManager();
 
         pm.getFetchPlan().setMaxFetchDepth( -1 );
+        pm.getFetchPlan().setDetachmentOptions( FetchPlan.DETACH_LOAD_FIELDS );
 
         return pm;
     }

Modified: maven/continuum/branches/continuum-acegi/continuum-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-test/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-test/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-test/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-test</artifactId>
   <name>Continuum Test</name>
-  <version>1.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-web/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-web/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-web/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-web/pom.xml Thu Sep 14 12:11:01 2006
@@ -7,7 +7,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-web</artifactId>
   <name>Continuum Web</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <resources>
       <resource>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-webapp</artifactId>
   <name>Continuum Web APP</name>
-  <version>1.1-SNAPSHOT</version>
   <packaging>war</packaging>
   <build>
     <filters>
@@ -141,6 +140,22 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>src/main/webapp/WEB-INF</directory>
+              <includes>
+                <include>database</include>
+                <include>temp</include>
+                <include>logs</include>
+                <include>working-directory</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -256,6 +271,15 @@
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-notifier-msn</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-xmlrpc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xmlrpc</artifactId>
+      <version>1.0-beta-4</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Thu Sep 14 12:11:01 2006
@@ -23,8 +23,7 @@
 
 /**
  * @author Nik Gonzalez
- * @plexus.component role="com.opensymphony.xwork.Action"
- * role-hint="schedule"
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="schedule"
  */
 public class ScheduleAction
     extends ContinuumActionSupport
@@ -33,8 +32,6 @@
 
     private boolean active = true;
 
-    private String cronExpression;
-
     private int delay;
 
     private String description;
@@ -47,6 +44,22 @@
 
     private boolean confirmed;
 
+    private int maxJobExecutionTime;
+
+    private String second = "0";
+
+    private String minute = "0";
+
+    private String hour = "*";
+
+    private String dayOfMonth = "*";
+
+    private String month = "*";
+
+    private String dayOfWeek = "?";
+
+    private String year;
+
     public String summary()
         throws ContinuumException
     {
@@ -63,10 +76,28 @@
             {
                 schedule = getContinuum().getSchedule( id );
                 active = schedule.isActive();
-                cronExpression= schedule.getCronExpression();
+
+                String[] cronEx = schedule.getCronExpression().split( " " );
+                int i = 0;
+                while ( i < cronEx.length )
+                {
+                    switch( i )
+                    {
+                        case 0 : second = cronEx[i]; break;
+                        case 1 : minute = cronEx[i]; break;
+                        case 2 : hour = cronEx[i]; break;
+                        case 3 : dayOfMonth = cronEx[i]; break;
+                        case 4 : month = cronEx[i]; break;
+                        case 5 : dayOfWeek = cronEx[i]; break;
+                        case 6 : year = cronEx[i]; break;
+                    }
+                    i++;
+                }
+
                 description = schedule.getDescription();
                 name = schedule.getName();
                 delay = schedule.getDelay();
+                maxJobExecutionTime = schedule.getMaxJobExecutionTime();
             }
             catch ( ContinuumException e )
             {
@@ -83,14 +114,7 @@
         {
             try
             {
-                Schedule schedule = new Schedule();
-                schedule.setActive( active );
-                schedule.setCronExpression( cronExpression );
-                schedule.setDelay( delay );
-                schedule.setDescription( description );
-                schedule.setName( name );
-
-                getContinuum().addSchedule( schedule );
+                getContinuum().addSchedule( setFields( new Schedule() ) );
             }
             catch ( ContinuumException e )
             {
@@ -101,19 +125,9 @@
         }
         else
         {
-
             try
             {
-                schedule = getContinuum().getSchedule( id );
-
-                schedule.setActive( active );
-                schedule.setCronExpression( cronExpression );
-                schedule.setDelay( delay );
-                schedule.setDescription( description );
-                schedule.setName( name );
-
-                getContinuum().updateSchedule( schedule );
-
+                getContinuum().updateSchedule( setFields( getContinuum().getSchedule( id ) ) );
             }
             catch ( ContinuumException e )
             {
@@ -125,6 +139,18 @@
         }
     }
 
+    private Schedule setFields( Schedule schedule )
+    {
+        schedule.setActive( active );
+        schedule.setCronExpression( getCronExpression() );
+        schedule.setDelay( delay );
+        schedule.setDescription( description );
+        schedule.setName( name );
+        schedule.setMaxJobExecutionTime( maxJobExecutionTime );
+
+        return schedule;
+    }
+
     public String confirm()
         throws ContinuumException
     {
@@ -174,16 +200,6 @@
         this.active = active;
     }
 
-    public String getCronExpression()
-    {
-        return cronExpression;
-    }
-
-    public void setCronExpression( String cronExpression )
-    {
-        this.cronExpression = cronExpression;
-    }
-
     public int getDelay()
     {
         return delay;
@@ -232,5 +248,91 @@
     public void setConfirmed( boolean confirmed )
     {
         this.confirmed = confirmed;
+    }
+
+    public int getMaxJobExecutionTime()
+    {
+        return maxJobExecutionTime;
+    }
+
+    public void setMaxJobExecutionTime( int maxJobExecutionTime )
+    {
+        this.maxJobExecutionTime = maxJobExecutionTime;
+    }
+
+    public String getSecond()
+    {
+        return second;
+    }
+
+    public void setSecond( String second )
+    {
+        this.second = second;
+    }
+
+    public String getMinute()
+    {
+        return minute;
+    }
+
+    public void setMinute( String minute )
+    {
+        this.minute = minute;
+    }
+
+    public String getHour()
+    {
+        return hour;
+    }
+
+    public void setHour( String hour )
+    {
+        this.hour = hour;
+    }
+
+    public String getDayOfMonth()
+    {
+        return dayOfMonth;
+    }
+
+    public void setDayOfMonth( String dayOfMonth )
+    {
+        this.dayOfMonth = dayOfMonth;
+    }
+
+    public String getYear()
+    {
+        return year;
+    }
+
+    public void setYear( String year )
+    {
+        this.year = year;
+    }
+
+    public String getMonth()
+    {
+        return month;
+    }
+
+    public void setMonth( String month )
+    {
+        this.month = month;
+    }
+
+    public String getDayOfWeek()
+    {
+        return dayOfWeek;
+    }
+
+    public void setDayOfWeek( String dayOfWeek )
+    {
+        this.dayOfWeek = dayOfWeek;
+    }
+
+    private String getCronExpression()
+    {
+        return ( second + " " + minute + " " + hour + " " + dayOfMonth + " " +
+                    month + " " + dayOfWeek + " " + year ).trim();
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Thu Sep 14 12:11:01 2006
@@ -18,6 +18,8 @@
 
 import com.opensymphony.webwork.ServletActionContext;
 import com.opensymphony.webwork.views.util.UrlHelper;
+
+import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.apache.maven.continuum.web.util.StateGenerator;
 import org.extremecomponents.table.bean.Column;
@@ -39,35 +41,53 @@
     {
         ProjectSummary project = (ProjectSummary) tableModel.getCurrentRowBean();
 
-        int latestBuildId = project.getLatestBuildId();
-
-        String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
-
-        if ( project.getState() == 1 || project.getState() == 2 || project.getState() == 3 || project.getState() == 4 )
+        switch ( project.getState() )
         {
-            if ( latestBuildId != -1 && !StateGenerator.NEW.equals( state ) )
+            case ContinuumProjectState.NEW:
+            case ContinuumProjectState.OK:
+            case ContinuumProjectState.FAILED:
+            case ContinuumProjectState.ERROR:
             {
-                HashMap params = new HashMap();
-
-                params.put( "projectId", new Integer( project.getId() ) );
-
-                params.put( "projectName", project.getName() );
+                String state = StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
 
-                params.put( "buildId", new Integer( latestBuildId ) );
-
-                String url = UrlHelper.buildUrl( "/buildResult.action", ServletActionContext.getRequest(),
-                                                 ServletActionContext.getResponse(), params );
+                if ( project.getLatestBuildId() != -1 && !StateGenerator.NEW.equals( state ) )
+                {
+                    return createActionLink( "buildResult", project, state );
+                }
+                else
+                {
+                    return state;
+                }
+            }
 
-                return "<a href=\"" + url + "\">" + state + "</a>";
+            case ContinuumProjectState.BUILDING:
+            {
+                return StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() ) + " "
+                    + createActionLink( "cancelBuild", project, "(cancel)" );
             }
-            else
+
+            default:
             {
-                return state;
+                return "&nbsp;";
             }
         }
-        else
-        {
-            return "&nbsp;";
-        }
+    }
+
+    private static String createActionLink( String action, ProjectSummary project, String state )
+    {
+        HashMap params = new HashMap();
+
+        params.put( "projectId", new Integer( project.getId() ) );
+
+        params.put( "projectName", project.getName() );
+
+        params.put( "buildId", new Integer( project.getLatestBuildId() ) );
+
+        String url = UrlHelper.buildUrl( "/" + action + ".action",
+                                         ServletActionContext.getRequest(),
+                                         ServletActionContext.getResponse(),
+                                         params );
+
+        return "<a href=\"" + url + "\">" + state + "</a>";
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Thu Sep 14 12:11:01 2006
@@ -14,6 +14,9 @@
       <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
       <role-hint>check-out-project</role-hint>
     </component>
+    <component>
+      <role>org.apache.maven.continuum.web.xmlrpc.XmlRpcService</role>
+    </component>
     <!-- load on start to inject values into the aspect -->
     <component>
       <role>org.codehaus.plexus.acegi.intercept.method.aspectj.AspectJSecurityInterceptorHelper</role>
@@ -21,6 +24,29 @@
   </load-on-start>
 
   <components>
+    <!--
+    | The XML-RPC service
+    |-->
+    <component>
+      <role>org.apache.maven.continuum.web.xmlrpc.XmlRpcService</role>
+      <implementation>org.apache.maven.continuum.web.xmlrpc.DefaultXmlRpcService</implementation>
+      <description></description>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.xmlrpc.XmlRpcServer</role>
+          <field-name>xmlRpcServer</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.xmlrpc.ContinuumXmlRpc</role>
+          <field-name>handler</field-name>
+        </requirement>
+      </requirements>
+      <configuration>
+        <port>8000</port>
+        <handler-name>continuum</handler-name>
+      </configuration>
+    </component>
+
     <!--
     | The mail notifier
     |-->

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Sep 14 12:11:01 2006
@@ -101,7 +101,7 @@
 add.project.missing.repository.error = Missing 'repository' element in the POM.
 add.project.missing.scm.error = Missing 'scm' element in the POM.
 add.project.missing.scm.connection.error = Missing 'connection' sub-element in the 'scm' element in the POM.
-add.project.missing.notifier.type.error = Missing 'type' sub-element in the 'notifier' element in the POM. 
+add.project.missing.notifier.type.error = Missing 'type' sub-element in the 'notifier' element in the POM.
 add.project.missing.notifier.configuration.error = Missing 'configuration' sub-element in the 'notifier' element in the POM.
 add.project.metadata.transfer.error = Transfer of Metadata has failed.
 add.project.unauthorized.error = You are not authorized to access the requested URL. Please verify that the correct username and password are provided.
@@ -340,6 +340,7 @@
 schedules.table.description = Description
 schedules.table.delay = Quiet Period
 schedules.table.cronExpression = Cron Expression
+schedules.table.maxJobExecutionTime = Max Job Time
 
 # ----------------------------------------------------------------------
 # Page: Add/EditSchedule
@@ -355,10 +356,19 @@
 schedule.description.message = Enter a description of the schedule
 schedule.cronExpression.label = Cron Expression
 schedule.cronExpression.message = Enter the cron expression. Format is described there : <a href="http://www.opensymphony.com/quartz/api/org/quartz/CronTrigger.html" target="_blank">Syntax<a>
+schedule.maxJobExecutionTime.label = Maximum job execution time (seconds)
+schedule.maxJobExecutionTime.message = Enter the maxmimum number of seconds a job may execute in this schedule before it's terminated.
 schedule.quietPeriod.label = Quiet Period (seconds)
 schedule.quietPeriod.message = Enter a quiet period period for this schedule
 schedule.enabled.label = Enabled
 schedule.enabled.message = Enable/Disable the schedule
+schedule.second.label = Second
+schedule.minute.label = Minute
+schedule.hour.label = Hour
+schedule.dayOfMonth.label = Day of Month
+schedule.month.label = Month
+schedule.dayOfWeek.label = Day of Week
+schedule.year.label = Year [optional]
 
 # ----------------------------------------------------------------------
 # Page: SurefireReport

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/template/default/controlfooter.ftl
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/template/default/controlfooter.ftl?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/template/default/controlfooter.ftl (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/template/default/controlfooter.ftl Thu Sep 14 12:11:01 2006
@@ -1,3 +1,3 @@
-${parameters.after?if_exists}<#t/>
+${parameters.desc?if_exists} ${parameters.after?if_exists}<#t/>
     </td><#lt/>
 </tr>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Thu Sep 14 12:11:01 2006
@@ -251,6 +251,9 @@
       <result name="success" type="chain">schedules</result>
     </action>
 
+    <action name="cancelBuild" class="cancelBuild">
+      <result name="success" type="chain">buildResults</result>
+    </action>
 
   </package>
 

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp Thu Sep 14 12:11:01 2006
@@ -3,7 +3,7 @@
 <html>
   <ww:i18n name="localization.Continuum">
 <head>
-<title><ww:text name="editSchedule.page.title"/></title>              
+<title><ww:text name="editSchedule.page.title"/></title>
 </head>
 <body>
 <div class="app">
@@ -13,16 +13,33 @@
     <div class="axial">
       <ww:form action="saveSchedule" method="post">
         <ww:hidden name="id"/>
-        <table>
-          <tbody>
+          <table>
             <ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
                 <ww:param name="desc"><p><ww:text name="schedule.name.message"/></p></ww:param>
             </ww:textfield>
             <ww:textfield label="%{getText('schedule.description.label')}" name="description" required="true">
                 <ww:param name="desc"><p><ww:text name="schedule.description.message"/></p></ww:param>
             </ww:textfield>
-            <ww:textfield label="%{getText('schedule.cronExpression.label')}" name="cronExpression" required="true">
-                <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
+
+            <tr>
+              <th><ww:label theme="simple" value="%{getText('schedule.cronExpression.label')}:" required="true"/></th>
+              <td>
+                <table>
+                  <ww:textfield label="%{getText('schedule.second.label')}" name="second" size="2"/>
+                  <ww:textfield label="%{getText('schedule.minute.label')}" name="minute" size="2"/>
+                  <ww:textfield label="%{getText('schedule.hour.label')}" name="hour"  size="2"/>
+                  <ww:textfield label="%{getText('schedule.dayOfMonth.label')}" name="dayOfMonth"  size="2"/>
+                  <ww:textfield label="%{getText('schedule.month.label')}" name="month"  size="2"/>
+                  <ww:textfield label="%{getText('schedule.dayOfWeek.label')}" name="dayOfWeek"  size="2"/>
+                  <ww:textfield label="%{getText('schedule.year.label')}" name="year"  size="4">
+                    <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
+                  </ww:textfield>
+                </table>
+              </td>
+            </tr>
+
+            <ww:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" required="true">
+                <ww:param name="desc"><p><ww:text name="schedule.maxJobExecutionTime.message"/></p></ww:param>
             </ww:textfield>
             <ww:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
                 <ww:param name="desc"><p><ww:text name="schedule.quietPeriod.message"/></p></ww:param>
@@ -30,8 +47,8 @@
             <ww:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active" fieldValue="true">
                 <ww:param name="desc"><p><ww:text name="schedule.enabled.message"/></p></ww:param>
             </ww:checkbox>
-          </tbody>
-        </table>
+          </table>
+
         <div class="functnbar3">
           <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
         </div>
@@ -42,4 +59,4 @@
 
 </body>
 </ww:i18n>
-</html>
\ No newline at end of file
+</html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/DefaultBottom.jsp Thu Sep 14 12:11:01 2006
@@ -1,9 +1,24 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ page import="java.util.Calendar" %>
+<%
+    int inceptionYear = 2005;
+    int currentYear = Calendar.getInstance().get( Calendar.YEAR );
+    String copyrightRange = String.valueOf( inceptionYear );
+    if ( inceptionYear != currentYear )
+    {
+        copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
+    }
+%>
+<ww:i18n name="localization.Continuum">
 <div id="footer">
-  <table border="0" cellpadding="4" cellspacing="0">
-    <tbody><tr>
-      <td>
-        Continuum &#169; 2005 Apache Software Foundation
-      </td>
-    </tr>
-    </tbody></table>
+  <table with="100%" border="0" cellpadding="4" cellspacing="0">
+    <tbody>
+      <tr>
+        <td>
+          Continuum &#169; <%= copyrightRange %> Apache Software Foundation
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
+</ww:i18n>
\ No newline at end of file

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp Thu Sep 14 12:11:01 2006
@@ -16,7 +16,7 @@
         </jsp:include>
 
         <h3><ww:text name="projectView.section.title"/></h3>
-            
+
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <c1:data label="%{getText('projectView.project.name')}" name="project.name"/>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp Thu Sep 14 12:11:01 2006
@@ -21,6 +21,7 @@
             <ec:column property="description" title="schedules.table.description"/>
             <ec:column property="delay" title="schedules.table.delay"/>
             <ec:column property="cronExpression" title="schedules.table.cronExpression"/>
+            <ec:column property="maxJobExecutionTime" title="schedules.table.maxJobExecutionTime"/>
             <ec:column property="actions" title="&nbsp;">
                 <ww:url id="editScheduleUrl" action="schedule">
                   <ww:param name="id" value="${pageScope.schedule.id}"/>

Modified: maven/continuum/branches/continuum-acegi/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-xmlrpc/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-xmlrpc/pom.xml Thu Sep 14 12:11:01 2006
@@ -10,7 +10,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-xmlrpc</artifactId>
   <name>Continuum XMLRPC Interface</name>
-  <version>1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?view=diff&rev=443441&r1=443440&r2=443441
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Thu Sep 14 12:11:01 2006
@@ -145,72 +145,72 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>2.0.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
-        <version>2.0.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>2.0.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
-        <version>2.0.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>
-        <version>2.0.4</version>
+        <version>${maven.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-api</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-manager-plexus</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-bazaar</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-clearcase</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-cvsexe</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-local</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-perforce</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-starteam</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-svnexe</artifactId>
-        <version>1.0-beta-3</version>
+        <version>${maven-scm.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
@@ -240,67 +240,67 @@
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-model</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-api</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-store</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-core</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-test</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-web</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-xmlrpc</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-plexus-application</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-notifier-api</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-notifier-irc</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-notifier-jabber</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-notifier-msn</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-webapp</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>${pom.version}</version>
         <type>war</type>
       </dependency>
       <dependency>
@@ -409,7 +409,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-quartz</artifactId>
-        <version>1.0-alpha-2</version>
+        <version>1.0-alpha-3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -459,4 +459,8 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  <properties>
+    <maven.version>2.0.4</maven.version>
+    <maven-scm.version>1.0-beta-3</maven-scm.version>
+  </properties>
 </project>



Mime
View raw message