continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r673519 - in /continuum/trunk: ./ continuum-core/src/main/java/org/apache/maven/continuum/build/settings/ continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/ continuum-core/src/main/java/org/apache/maven/continuum...
Date Wed, 02 Jul 2008 21:59:34 GMT
Author: olamy
Date: Wed Jul  2 14:59:33 2008
New Revision: 673519

URL: http://svn.apache.org/viewvc?rev=673519&view=rev
Log:
[CONTINUUM-1799] Thread count for schedule is not configurable

Upgrade to last plexus-quartz SNAPSHOT (means quartz upgrade to 1.5.2)



Removed:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerException.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java
    continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?rev=673519&r1=673518&r2=673519&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
Wed Jul  2 14:59:33 2008
@@ -53,7 +53,7 @@
     private ContinuumStore store;
 
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private Scheduler scheduler;
 

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=673519&r1=673518&r2=673519&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
Wed Jul  2 14:59:33 2008
@@ -342,7 +342,7 @@
         throws ContinuumProjectBuilderException, BuildDefinitionServiceException
     {
         List<BuildDefinition> buildDefinitions = new ArrayList<BuildDefinition>();
-        for ( BuildDefinition buildDefinition : (List<BuildDefinition>)template.getBuildDefinitions()
)
+        for ( BuildDefinition buildDefinition : (List<BuildDefinition>) template.getBuildDefinitions()
)
         {
             // due to CONTINUUM-1207 CONTINUUM-1436 user can do what they want with arguments
             // we must remove if exists --non-recursive or -N

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java?rev=673519&r1=673518&r2=673519&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java
Wed Jul  2 14:59:33 2008
@@ -25,39 +25,6 @@
  */
 public class ContinuumSchedulerConstants
 {
-    /**
-     * Checkout before performing a build
-     */
-    public static final int SCM_MODE_CHECKOUT = 0;
-
-    /**
-     * Update before performing a build
-     */
-    public static final int SCM_MODE_UPDATE = 1;
-
-    // ----------------------------------------------------------------------
-    // Default Schedule
-    // ----------------------------------------------------------------------
-
-    /**
-     * Default schedule name
-     */
-    public static final String DEFAULT_SCHEDULE_NAME = "Default";
-
-    /**
-     * Default schedule description
-     */
-    public static final String DEFAULT_SCHEDULE_DESC = "Default Continuum Schedule";
-
-    /**
-     * Default scm mode which is to update
-     */
-    public static final int DEFAULT_SCHEDULE_SCM_MODE = SCM_MODE_UPDATE;
-
-    /**
-     * Every hour on the hour
-     */
-    public static final String DEFAULT_CRON_EXPRESSION = "0 0 * * * ?";
 
     // ----------------------------------------------------------------------
     // Keys for JobDataMap

Modified: continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=673519&r1=673518&r2=673519&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Wed
Jul  2 14:59:33 2008
@@ -390,6 +390,36 @@
       </configuration>
     </component>
 
+    <component>
+      <role>org.codehaus.plexus.scheduler.Scheduler</role>
+      <implementation>org.codehaus.plexus.scheduler.DefaultScheduler</implementation>
+      <role-hint>default</role-hint>
+      <configuration>
+        <properties>
+          <property>
+            <name>org.quartz.scheduler.instanceName</name>
+            <value>continuumScheduler</value>
+          </property>
+          <property>
+            <name>org.quartz.threadPool.class</name>
+            <value>org.quartz.simpl.SimpleThreadPool</value>
+          </property>
+          <property>
+            <name>org.quartz.threadPool.threadCount</name>
+            <value>7</value>
+          </property>
+          <property>
+            <name>org.quartz.threadPool.threadPriority</name>
+            <value>4</value>
+          </property>
+          <property>
+            <name>org.quartz.jobStore.class</name>
+            <value>org.quartz.simpl.RAMJobStore</value>
+          </property>
+        </properties>
+      </configuration>
+    </component>    
+    
     <!--
      | Logger manager
      -->

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=673519&r1=673518&r2=673519&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Wed Jul  2 14:59:33 2008
@@ -731,7 +731,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-quartz</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>1.0-alpha-4-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>



Mime
View raw message