You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/04/09 20:09:22 UTC
[archiva-redback-components-spring-quartz] branch master created
(now 582d295)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git.
at 582d295 Adding gitignore
This branch includes the following new commits:
new 1d04453 import redback components sources http://svn.codehaus.org/redback/components/trunk/ r1724.
new b5cdc62 fix license headers in poms
new 23a9617 upgrade modules to use last parent pom
new bad54dc fix license headers
new de3029e fix pom due to asf move
new 7b71b77 use quartz 2.1.3
new abc71ce use o.a.a package namespace for spring-quartz component
new 830f8be remove @version $Id$
new 5933d99 use indexOf char
new 1b86571 [REDBACK-296] interface Scheduler the method schedulJob takes an implementation, not a interface Submitted by Adrien Lecharpentier.
new d8c1eec [MRM-1651] Add OSGi support in spring-apacheds, spring-quartz, spring-registry, spring-taskqueue, spring-utils
new 32eb074 [MRM-1651] Improve OSGi statements by defining version ranges
new 8aaa932 configure svnpub for redback-components site
new bbe1e57 fix site deployment
new 6948f27 use a staged released parent
new 0c4eee7 add missing <version>
new ab9fa2f [maven-release-plugin] prepare release spring-quartz-2.0
new 266165b [maven-release-plugin] prepare for next development iteration
new cacf251 log4j 2.0-beta1
new 8640750 remove System.out
new 1cf4e44 use last quartz version
new 715a3dc use indexOf(char)
new 48cf916 quartz 2.1.7
new 36bc724 use staged released parent
new 2f22fca back to parent snapshot
new 2331ba8 fix various path for deployment
new 3f40148 use released parent pom
new 3b8a23f upgrade to last spring version
new be160a8 use last quartz version
new 9cd341f remove unused imports
new ea4d674 use JobBuilder
new b2c4774 remove old plexus javadoc
new 3d05477 rename field
new 7c9ecfa use TriggerBuilder
new 308bde4 fix logging
new 4ecf2f1 fix logging warn level
new 5e3d52b formatting
new 0bb8027 use a staged released parent
new 963eb48 [maven-release-plugin] prepare release spring-quartz-2.1
new 9ffb862 [maven-release-plugin] prepare for next development iteration
new ed46ee3 1.7
new 81758be use diamond
new 627a324 use last parent
new 73297a7 spring version 4.1.0 update need update to 2.4-SNAPSHOT parent
new 6c81000 Changing parent version
new 582d295 Adding gitignore
The 46 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 33/46: rename field
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 3d0547732457f900650fdda2de8bb5e84e470340
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 29 00:01:08 2013 +0000
rename field
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546481 13f79535-47bb-0310-9956-ffa450edef68
---
.../configuration/SchedulerConfiguration.java | 38 +++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
index 3874c15..00e7131 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -34,96 +34,96 @@ import javax.inject.Inject;
public class SchedulerConfiguration
{
@Inject
- private Scheduler plexusScheduler;
+ private Scheduler scheduler;
public String getInstanceName()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME );
}
public void setInstanceName( String instanceName )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, instanceName );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, instanceName );
}
public String getInstanceId()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID );
}
public void setInstanceId( String InstanceId )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID, InstanceId );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID, InstanceId );
}
public String getThreadName()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME );
}
public void setThreadName( String threadName )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME, threadName );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME, threadName );
}
public String getIdleWaitTime()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME );
}
public void setIdleWaitTime( String idleWaitTime )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME, idleWaitTime );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME, idleWaitTime );
}
public String getDbFailureRetryInterval()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL );
}
public void setDbFailureRetryInterval( String dbFailureRetryInterval )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL, dbFailureRetryInterval );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL, dbFailureRetryInterval );
}
public String getClassLoadHelper()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS );
}
public void setClassLoadHelper( String classLoadHelper )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS, classLoadHelper );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS, classLoadHelper );
}
public String getContextKey()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX );
}
public void setContextKey( String contextKey )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX, contextKey );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX, contextKey );
}
public String getUserTransactionURL()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL );
}
public void setUserTransactionURL( String userTransactionURL )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL, userTransactionURL );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL, userTransactionURL );
}
public String getWrapJobExecutionInUserTransaction()
{
- return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX );
+ return scheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX );
}
public void setWrapJobExecutionInUserTransaction( String wrapJobExecutionInUserTransaction )
{
- plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX, wrapJobExecutionInUserTransaction );
+ scheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX, wrapJobExecutionInUserTransaction );
}
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 34/46: use TriggerBuilder
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 7c9ecfadb44031673e0f9cb5cb40585f97d404e0
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 29 00:08:37 2013 +0000
use TriggerBuilder
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546482 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/scheduler/CronExpressionValidator.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index e57ee8f..acea7da 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -20,8 +20,9 @@ package org.apache.archiva.redback.components.scheduler;
*/
import org.apache.commons.lang.StringUtils;
+import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger;
-import org.quartz.impl.triggers.CronTriggerImpl;
+import org.quartz.TriggerBuilder;
import org.springframework.stereotype.Service;
import java.text.ParseException;
@@ -55,9 +56,11 @@ public final class CronExpressionValidator
return false;
}
- CronTriggerImpl cronTrigger = new CronTriggerImpl();
+ CronTrigger cronTrigger = TriggerBuilder.newTrigger()
+ .withSchedule( CronScheduleBuilder.cronSchedule( cronExpression ) )
+ .build();
+
- cronTrigger.setCronExpression( cronExpression );
if ( cronParams[3].equals( "?" ) || cronParams[5].equals( "?" ) )
{
@@ -113,7 +116,7 @@ public final class CronExpressionValidator
return false;
}
}
- catch ( ParseException e )
+ catch ( RuntimeException e )
{
return false;
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 21/46: use last quartz
version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 1cf4e443a46b0c3511a4c55ad45051d6398ba6fc
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Dec 9 08:08:14 2012 +0000
use last quartz version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1418831 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7816b26..092bf38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.3</version>
+ <version>2.1.6</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 27/46: use released
parent pom
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 3f40148bcbbd5e8cfb1382d29ffb39f9f730a8d6
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu May 9 12:13:43 2013 +0000
use released parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1480598 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e06467e..34ad8bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 22/46: use indexOf(char)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 715a3dc1d3c6d1b178f1bc99ac15ec36f96ffb45
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Dec 31 14:24:12 2012 +0000
use indexOf(char)
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1427137 13f79535-47bb-0310-9956-ffa450edef68
---
.../components/scheduler/CronExpressionValidator.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index 2400954..e57ee8f 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -192,15 +192,15 @@ public final class CronExpressionValidator
return true;
}
- if ( dayOfWeekField.indexOf( "L" ) >= 0 )
+ if ( dayOfWeekField.indexOf( 'L' ) >= 0 )
{
return checkFieldWithLetter( dayOfWeekField, "L", 1, 7, -1, -1 );
}
- else if ( dayOfWeekField.indexOf( "C" ) >= 0 )
+ else if ( dayOfWeekField.indexOf( 'C' ) >= 0 )
{
return checkFieldWithLetter( dayOfWeekField, "C", 1, 7, -1, -1 );
}
- else if ( dayOfWeekField.indexOf( "#" ) >= 0 )
+ else if ( dayOfWeekField.indexOf( '#' ) >= 0 )
{
return checkFieldWithLetter( dayOfWeekField, "#", 1, 7, 1, 5 );
}
@@ -217,7 +217,7 @@ public final class CronExpressionValidator
private boolean checkField( String secondsField, int minimal, int maximal )
{
- if ( secondsField.indexOf( "-" ) > -1 )
+ if ( secondsField.indexOf( '-' ) > -1 )
{
String startValue = secondsField.substring( 0, secondsField.indexOf( "-" ) );
String endValue = secondsField.substring( secondsField.indexOf( "-" ) + 1 );
@@ -239,15 +239,15 @@ public final class CronExpressionValidator
return false;
}
}
- else if ( secondsField.indexOf( "," ) > -1 )
+ else if ( secondsField.indexOf( ',' ) > -1 )
{
return checkListField( secondsField, minimal, maximal );
}
- else if ( secondsField.indexOf( "/" ) > -1 )
+ else if ( secondsField.indexOf( '/' ) > -1 )
{
return checkIncrementField( secondsField, minimal, maximal );
}
- else if ( secondsField.indexOf( "*" ) != -1 )
+ else if ( secondsField.indexOf( '*' ) != -1 )
{
return true;
}
@@ -357,9 +357,9 @@ public final class CronExpressionValidator
private boolean checkIncrementField( String value, int minimal, int maximal )
{
- String start = value.substring( 0, value.indexOf( "/" ) );
+ String start = value.substring( 0, value.indexOf( '/' ) );
- String increment = value.substring( value.indexOf( "/" ) + 1 );
+ String increment = value.substring( value.indexOf( '/' ) + 1 );
if ( !"*".equals( start ) )
{
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 37/46: formatting
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 5e3d52b587f74d7bf0609f9276494d5f8e4bdac4
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Dec 16 04:53:35 2013 +0000
formatting
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1551116 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/scheduler/AbstractJob.java | 58 ++++++++++++++--------
1 file changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
index f5eef6a..c89e795 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
@@ -34,53 +34,69 @@ import org.slf4j.LoggerFactory;
* ServiceBroker.
*
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
- *
*/
public abstract class AbstractJob
implements InterruptableJob
{
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private Logger log = LoggerFactory.getLogger( getClass() );
- /** JobDataMap tag for the job's logger. */
+ /**
+ * JobDataMap tag for the job's logger.
+ */
public static final String LOGGER = "JOB_LOGGER";
-
- /** JobDataMap tag for the job's context. */
+
+ /**
+ * JobDataMap tag for the job's context.
+ */
public static final String CONTEXT = "JOB_CONTEXT";
- /** JobDataMap tag for the job's service broker. */
+ /**
+ * JobDataMap tag for the job's service broker.
+ */
public static final String SERVICE_MANAGER = "JOB_SERVICE_MANAGER";
-
- /** JobDataMap tag for the job's configuration. */
+
+ /**
+ * JobDataMap tag for the job's configuration.
+ */
public static final String EXECUTION_CONFIGURATION = "JOB_EXECUTION_CONFIGURATION";
- /** Job Data Map */
+ /**
+ * Job Data Map
+ */
private JobDataMap jobDataMap;
private boolean interrupted;
- /** Set Job Data Map */
- public void setJobDataMap(JobDataMap jobDataMap)
+ /**
+ * Set Job Data Map
+ */
+ public void setJobDataMap( JobDataMap jobDataMap )
{
this.jobDataMap = jobDataMap;
}
-
- /** Get Job Data Map */
+
+ /**
+ * Get Job Data Map
+ */
public JobDataMap getJobDataMap()
{
return jobDataMap;
- }
-
- /** Get the Logger. */
+ }
+
+ /**
+ * Get the Logger.
+ */
public Logger getLogger()
{
- return (Logger) getJobDataMap().get(LOGGER);
- }
-
+ return (Logger) getJobDataMap().get( LOGGER );
+ }
- /** Execute the Job. */
- public abstract void execute(JobExecutionContext context)
+ /**
+ * Execute the Job.
+ */
+ public abstract void execute( JobExecutionContext context )
throws JobExecutionException;
public boolean isInterrupted()
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 08/46: remove @version
$Id$
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 830f8be57f9a7024d602e00a0429121cfc0dff93
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jul 5 20:51:15 2012 +0000
remove @version $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1357900 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/archiva/redback/components/scheduler/AbstractJob.java | 2 +-
.../archiva/redback/components/scheduler/CronExpressionValidator.java | 2 +-
.../apache/archiva/redback/components/scheduler/DefaultJobListener.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
index 44013ea..f5eef6a 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* ServiceBroker.
*
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
- * @version $Id$
+ *
*/
public abstract class AbstractJob
implements InterruptableJob
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index bb35c99..5944279 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -32,7 +32,7 @@ import java.util.StringTokenizer;
/**
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
- * @version $Id$
+ *
*/
@Service
public final class CronExpressionValidator
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
index 602142a..21d9c4a 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
@@ -29,7 +29,7 @@ import org.quartz.JobListener;
* service broker and configuration will work as expected.
*
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
- * @version $Id$
+ *
*/
public class DefaultJobListener
implements JobListener
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 45/46: Changing parent
version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 6c81000725a545a07fb98a75b75747a864c84cdb
Author: Martin Stockhammer <m....@web.de>
AuthorDate: Mon Apr 9 22:09:06 2018 +0200
Changing parent version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b8367c3..befc075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 44/46: spring version
4.1.0 update need update to 2.4-SNAPSHOT parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 73297a704f1b619b468d8aa394896de199177cf6
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Sep 20 01:09:30 2014 +0000
spring version 4.1.0 update
need update to 2.4-SNAPSHOT parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1626376 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cda244d..b8367c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.3</version>
+ <version>2.4-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 12/46: [MRM-1651]
Improve OSGi statements by defining version ranges
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 32eb0746745e6bfebbeb6d2d57a5a86b5167e76f
Author: Jean-Baptiste Onofre <jb...@apache.org>
AuthorDate: Fri Aug 3 07:45:35 2012 +0000
[MRM-1651] Improve OSGi statements by defining version ranges
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1368818 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/pom.xml b/pom.xml
index 09f4560..a070f61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.archiva.redback.components.scheduler*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.quartz*;version="[2.1,3)",
+ org.springframework*;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 04/46: fix license
headers
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit bad54dcf581f82712c3e2f470caf5286295fa316
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 21:33:42 2012 +0000
fix license headers
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310599 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/scheduler/AbstractJob.java | 2 +-
.../scheduler/CronExpressionValidator.java | 25 ++++----
.../components/scheduler/DefaultJobListener.java | 68 +++++----------------
.../components/scheduler/DefaultScheduler.java | 2 +-
.../redback/components/scheduler/Scheduler.java | 2 +-
.../configuration/SchedulerConfiguration.java | 2 +-
.../scheduler/CronExpressionValidatorTest.java | 25 ++++----
.../redback/components/scheduler/JobOne.java | 70 ++++++----------------
.../components/scheduler/SchedulerTest.java | 19 ++++++
9 files changed, 83 insertions(+), 132 deletions(-)
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java b/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
index 2956c74..6a397e3 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
@@ -9,7 +9,7 @@ package org.codehaus.redback.components.scheduler;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
index a6fe180..ce7bd39 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
@@ -1,19 +1,22 @@
package org.codehaus.redback.components.scheduler;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java b/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
index db12893..6065084 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
@@ -1,61 +1,23 @@
package org.codehaus.redback.components.scheduler;
-/* ----------------------------------------------------------------------------
- * The Apache Software License, Version 1.1
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Plexus", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * ----------------------------------------------------------------------------
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
index cec012f..6df46d3 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
@@ -9,7 +9,7 @@ package org.codehaus.redback.components.scheduler;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java b/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
index 39f1100..d1db495 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
@@ -9,7 +9,7 @@ package org.codehaus.redback.components.scheduler;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
index a340b02..fceb852 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -9,7 +9,7 @@ package org.codehaus.redback.components.scheduler.configuration;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java b/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
index 6f0f832..22e4146 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
+++ b/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
@@ -1,19 +1,22 @@
package org.codehaus.redback.components.scheduler;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java b/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
index 83e6948..797c4a4 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
+++ b/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
@@ -1,59 +1,23 @@
package org.codehaus.redback.components.scheduler;
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
index 58ffda9..56bd059 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
+++ b/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
@@ -1,5 +1,24 @@
package org.codehaus.redback.components.scheduler;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import junit.framework.TestCase;
import org.junit.After;
import org.junit.Test;
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 16/46: add missing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 0c4eee746e8379bca5e0c762ee327efaf5609687
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 13:01:32 2012 +0000
add missing <version>
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388463 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 942ac27..2cac449 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
+ <version>2.0-SNAPSHOT</version>
<artifactId>spring-quartz</artifactId>
<packaging>bundle</packaging>
<name>Spring Quartz Component</name>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 35/46: fix logging
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 308bde4748aa10f8f13f8c0ebcb70c5e242a0557
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Dec 2 02:55:24 2013 +0000
fix logging
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546880 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/archiva/redback/components/scheduler/JobOne.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
index 681d002..19de8a9 100644
--- a/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
@@ -41,8 +41,7 @@ public class JobOne
throws JobExecutionException
{
logger.info(
- " --- Testing Scheduler Component\n --- " + context.getJobDetail().getDescription() + " executed.["
- + new Date() + "]" );
+ " --- Testing Scheduler Component --- {} executed.[{}]", context.getJobDetail().getDescription(), new Date() );
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 41/46: 1.7
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit ed46ee351f2a9838e85b31c7729ff1da1374ab23
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 5 12:03:56 2014 +0000
1.7
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1585080 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8d2982f..db0f0c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.2</version>
+ <version>2.3-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 02/46: fix license
headers in poms
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit b5cdc62b50d5688954b20adcda9109971531afea
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 10:23:31 2012 +0000
fix license headers in poms
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310271 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5afe0b9..d40f3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.codehaus.redback.components</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 32/46: remove old plexus
javadoc
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit b2c47748a74e2f3c6bb031c2068d7f451c69061a
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 29 00:00:51 2013 +0000
remove old plexus javadoc
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546480 13f79535-47bb-0310-9956-ffa450edef68
---
.../components/scheduler/configuration/SchedulerConfiguration.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
index aaed87b..3874c15 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -29,14 +29,10 @@ import javax.inject.Inject;
* Class to represent the configuration file for the proxy
*
* @author John Tolentino
- * plexus.component role="org.codehaus.plexus.scheduler.configuration.SchedulerConfiguration"
*/
@Service
public class SchedulerConfiguration
{
- /*
- * plexus.required
- */
@Inject
private Scheduler plexusScheduler;
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 07/46: use o.a.a package
namespace for spring-quartz component
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit abc71ce6bda46d75901e543e77914bbd577a44b8
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Apr 11 22:23:37 2012 +0000
use o.a.a package namespace for spring-quartz component
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1325044 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva}/redback/components/scheduler/AbstractJob.java | 2 +-
.../redback/components/scheduler/CronExpressionValidator.java | 2 +-
.../archiva}/redback/components/scheduler/DefaultJobListener.java | 2 +-
.../archiva}/redback/components/scheduler/DefaultScheduler.java | 3 +--
.../archiva}/redback/components/scheduler/Scheduler.java | 2 +-
.../components/scheduler/configuration/SchedulerConfiguration.java | 4 ++--
src/main/resources/META-INF/spring-context.xml | 2 +-
.../redback/components/scheduler/CronExpressionValidatorTest.java | 3 ++-
.../archiva}/redback/components/scheduler/JobOne.java | 2 +-
.../archiva}/redback/components/scheduler/SchedulerTest.java | 2 +-
src/test/resources/spring-context.xml | 7 ++-----
11 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
similarity index 97%
rename from src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
index 6a397e3..44013ea 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/AbstractJob.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
similarity index 99%
rename from src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index ce7bd39..bb35c99 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
similarity index 98%
rename from src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
index 6065084..602142a 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultJobListener.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
similarity index 98%
rename from src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
index 6df46d3..d2f8553 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,6 @@ import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
import org.quartz.TriggerListener;
-import org.quartz.core.QuartzScheduler;
import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.StdScheduler;
import org.quartz.impl.StdSchedulerFactory;
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
similarity index 96%
rename from src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
index d1db495..58dd6e8 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
similarity index 97%
rename from src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
rename to src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
index fceb852..aaed87b 100644
--- a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler.configuration;
+package org.apache.archiva.redback.components.scheduler.configuration;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.codehaus.redback.components.scheduler.configuration;
* under the License.
*/
-import org.codehaus.redback.components.scheduler.Scheduler;
+import org.apache.archiva.redback.components.scheduler.Scheduler;
import org.quartz.impl.StdSchedulerFactory;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/META-INF/spring-context.xml b/src/main/resources/META-INF/spring-context.xml
index 04ec35b..cff1130 100755
--- a/src/main/resources/META-INF/spring-context.xml
+++ b/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,6 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.redback.components.scheduler"/>
+ base-package="org.apache.archiva.redback.components.scheduler"/>
</beans>
\ No newline at end of file
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
similarity index 96%
rename from src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
index 22e4146..79b1738 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidatorTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.codehaus.redback.components.scheduler;
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
similarity index 95%
rename from src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
index 797c4a4..56caf57 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
similarity index 98%
rename from src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
rename to src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
index 56bd059..f473f1b 100644
--- a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.redback.components.scheduler;
+package org.apache.archiva.redback.components.scheduler;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/resources/spring-context.xml b/src/test/resources/spring-context.xml
index 16ec4a1..26f0515 100755
--- a/src/test/resources/spring-context.xml
+++ b/src/test/resources/spring-context.xml
@@ -20,13 +20,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 10/46: [REDBACK-296]
interface Scheduler the method schedulJob takes an implementation,
not a interface Submitted by Adrien Lecharpentier.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 1b8657190874c1f9770c265afdaf0b8780adcd86
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Jul 28 20:56:25 2012 +0000
[REDBACK-296] interface Scheduler the method schedulJob takes an implementation, not a interface
Submitted by Adrien Lecharpentier.
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1366772 13f79535-47bb-0310-9956-ffa450edef68
---
.../components/scheduler/DefaultScheduler.java | 23 +++++++++++++++-------
.../redback/components/scheduler/Scheduler.java | 3 ++-
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
index d2f8553..ddf71e6 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.components.scheduler;
* under the License.
*/
+import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.JobListener;
import org.quartz.Matcher;
@@ -47,18 +48,19 @@ public class DefaultScheduler
private StdScheduler scheduler;
- public void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ public void scheduleJob( JobDetail jobDetail, Trigger trigger )
throws SchedulerException
{
- if ( jobDetail == null || jobDetail.getName() == null )
+
+ if ( jobDetail == null || jobDetail.getKey() == null || jobDetail.getKey().getName() == null )
{
throw new SchedulerException( "No job or no job name - cannot schedule this job" );
}
- if ( jobExists( jobDetail.getName(), jobDetail.getGroup() ) )
+ if ( jobExists( jobDetail.getKey() ) )
{
- log.warn( "Will not schedule this job as a job {" + jobDetail.getName() + ":" + jobDetail.getGroup()
- + "} already exists." );
+ log.warn( "Will not schedule this job as a job {" + jobDetail.getKey().getName() + ":"
+ + jobDetail.getKey().getGroup() + "} already exists." );
return;
}
@@ -89,7 +91,8 @@ public class DefaultScheduler
scheduler.getListenerManager().addTriggerListener( listener, new AllMatch() );
}
- private static class AllMatch<R extends Key<?>> implements Matcher<R>
+ private static class AllMatch<R extends Key<?>>
+ implements Matcher<R>
{
public boolean isMatch( R key )
{
@@ -153,7 +156,13 @@ public class DefaultScheduler
throws SchedulerException
{
- return ( scheduler.getJobDetail( new JobKey( jobName, jobGroup ) ) != null );
+ return jobExists( new JobKey( jobName, jobGroup ) );
+ }
+
+ private boolean jobExists( JobKey jobKey )
+ throws SchedulerException
+ {
+ return scheduler.getJobDetail( jobKey ) != null;
}
public void shutdown( boolean waitForJobsToComplete )
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
index 58dd6e8..722c405 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.components.scheduler;
* under the License.
*/
+import org.quartz.JobDetail;
import org.quartz.JobListener;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
@@ -30,7 +31,7 @@ import java.util.Properties;
public interface Scheduler
{
- void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ void scheduleJob( JobDetail jobDetail, Trigger trigger )
throws SchedulerException;
/**
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 03/46: upgrade modules
to use last parent pom
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 23a9617bdd7595222d977199b5de2579d428afb0
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 19:44:08 2012 +0000
upgrade modules to use last parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310561 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d40f3c5..6ae93ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,9 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.codehaus.redback.components</groupId>
+ <groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 31/46: use JobBuilder
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit ea4d674e5b7bfafdc26393d2e7d69fe9a93c84b2
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 29 00:00:28 2013 +0000
use JobBuilder
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546479 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/components/scheduler/SchedulerTest.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
index f8a1d39..0f1b39c 100644
--- a/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
@@ -23,12 +23,13 @@ import junit.framework.TestCase;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
import org.quartz.TriggerListener;
-import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.triggers.SimpleTriggerImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,9 +68,10 @@ public class SchedulerTest
dataMap.put( "project", "continuum" );
- JobDetailImpl jobDetail = new JobDetailImpl( "job", "group", JobOne.class );
-
- jobDetail.setJobDataMap( dataMap );
+ JobDetail jobDetail = JobBuilder.newJob( JobOne.class )
+ .withIdentity( "job", "group" )
+ .setJobData( dataMap )
+ .build();
TriggerBuilder.newTrigger();
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 18/46:
[maven-release-plugin] prepare for next development iteration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 266165bb5f2171af1ed5d959e4f24e97cd52f689
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 13:25:24 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388484 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad90386..4f74deb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<artifactId>spring-quartz</artifactId>
<packaging>bundle</packaging>
<name>Spring Quartz Component</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.0</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-quartz-2.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 46/46: Adding gitignore
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 582d295ddccea1b94a1986db07d94fa90498e973
Author: Martin Stockhammer <m....@web.de>
AuthorDate: Mon Apr 9 22:09:18 2018 +0200
Adding gitignore
---
.gitignore | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f52bf1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.idea/**
+.project
+.classpath
+.settings
+.java-version
+target
+.DS_Store
+.site-content
+out
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 42/46: use diamond
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 81758be22e6b697559f5a543037ae8753001acb9
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 5 12:44:37 2014 +0000
use diamond
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1585087 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/scheduler/CronExpressionValidator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index acea7da..54bbe41 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -378,7 +378,7 @@ public final class CronExpressionValidator
{
StringTokenizer st = new StringTokenizer( value, "," );
- List values = new ArrayList();
+ List<String> values = new ArrayList<>();
while ( st.hasMoreTokens() )
{
@@ -387,9 +387,9 @@ public final class CronExpressionValidator
int previousValue = -1;
- for ( Iterator i = values.iterator(); i.hasNext(); )
+ for ( Iterator<String> i = values.iterator(); i.hasNext(); )
{
- String currentValue = (String) i.next();
+ String currentValue = i.next();
if ( !checkIntValue( currentValue, minimal, maximal ) )
{
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 01/46: import redback
components sources http://svn.codehaus.org/redback/components/trunk/ r1724.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 1d044533376007470f0688bed71d767452fceafd
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 09:33:40 2012 +0000
import redback components sources
http://svn.codehaus.org/redback/components/trunk/ r1724.
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310262 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 91 +++++
.../redback/components/scheduler/AbstractJob.java | 96 +++++
.../scheduler/CronExpressionValidator.java | 441 +++++++++++++++++++++
.../components/scheduler/DefaultJobListener.java | 125 ++++++
.../components/scheduler/DefaultScheduler.java | 180 +++++++++
.../redback/components/scheduler/Scheduler.java | 60 +++
.../configuration/SchedulerConfiguration.java | 133 +++++++
src/main/resources/META-INF/spring-context.xml | 34 ++
.../scheduler/CronExpressionValidatorTest.java | 127 ++++++
.../redback/components/scheduler/JobOne.java | 79 ++++
.../components/scheduler/SchedulerTest.java | 102 +++++
src/test/resources/spring-context.xml | 41 ++
12 files changed, 1509 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5afe0b9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.codehaus.redback.components</groupId>
+ <artifactId>redback-components</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <relativePath>../redback-components-parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>spring-quartz</artifactId>
+ <name>Spring Quartz Component</name>
+ <version>1.1-SNAPSHOT</version>
+
+ <url>http://redback.codehaus.org/components/${project.artifactId}</url>
+
+ <distributionManagement>
+ <site>
+ <id>codehaus.org</id>
+ <url>dav:https://dav.codehaus.org/redback/components/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
+
+ <scm>
+ <connection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-quartz</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-quartz</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/redback/components/trunk/spring-quartz</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>60</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java b/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
new file mode 100644
index 0000000..2956c74
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/AbstractJob.java
@@ -0,0 +1,96 @@
+package org.codehaus.redback.components.scheduler;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.InterruptableJob;
+import org.quartz.UnableToInterruptJobException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Base class from which all <code>Job</code>s running in the
+ * scheduler should be derived from if they want access to the
+ * ServiceBroker.
+ *
+ * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
+ * @version $Id$
+ */
+public abstract class AbstractJob
+ implements InterruptableJob
+{
+
+ private Logger log = LoggerFactory.getLogger( getClass() );
+
+ /** JobDataMap tag for the job's logger. */
+ public static final String LOGGER = "JOB_LOGGER";
+
+ /** JobDataMap tag for the job's context. */
+ public static final String CONTEXT = "JOB_CONTEXT";
+
+ /** JobDataMap tag for the job's service broker. */
+ public static final String SERVICE_MANAGER = "JOB_SERVICE_MANAGER";
+
+ /** JobDataMap tag for the job's configuration. */
+ public static final String EXECUTION_CONFIGURATION = "JOB_EXECUTION_CONFIGURATION";
+
+ /** Job Data Map */
+ private JobDataMap jobDataMap;
+
+ private boolean interrupted;
+
+ /** Set Job Data Map */
+ public void setJobDataMap(JobDataMap jobDataMap)
+ {
+ this.jobDataMap = jobDataMap;
+ }
+
+ /** Get Job Data Map */
+ public JobDataMap getJobDataMap()
+ {
+ return jobDataMap;
+ }
+
+ /** Get the Logger. */
+ public Logger getLogger()
+ {
+ return (Logger) getJobDataMap().get(LOGGER);
+ }
+
+
+
+ /** Execute the Job. */
+ public abstract void execute(JobExecutionContext context)
+ throws JobExecutionException;
+
+ public boolean isInterrupted()
+ {
+ return interrupted;
+ }
+
+ public void interrupt()
+ throws UnableToInterruptJobException
+ {
+ interrupted = true;
+ }
+}
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
new file mode 100644
index 0000000..a6fe180
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/CronExpressionValidator.java
@@ -0,0 +1,441 @@
+package org.codehaus.redback.components.scheduler;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.quartz.CronTrigger;
+import org.quartz.impl.triggers.CronTriggerImpl;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+ * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+@Service
+public final class CronExpressionValidator
+{
+
+ /**
+ * Validates a cron expression.
+ *
+ * @param cronExpression The expression to validate
+ * @return True is expression is valid
+ */
+ public boolean validate( String cronExpression )
+ {
+ try
+ {
+ String[] cronParams = StringUtils.split( cronExpression );
+
+ if ( cronParams.length < 6 || cronParams.length > 7 )
+ {
+ return false;
+ }
+
+ CronTriggerImpl cronTrigger = new CronTriggerImpl();
+
+ cronTrigger.setCronExpression( cronExpression );
+
+ if ( cronParams[3].equals( "?" ) || cronParams[5].equals( "?" ) )
+ {
+ //Check seconds param
+ if ( !checkSecondsField( cronParams[0] ) )
+ {
+ return false;
+ }
+
+ //Check minutes param
+ if ( !checkMinutesField( cronParams[1] ) )
+ {
+ return false;
+ }
+
+ //Check hours param
+ if ( !checkHoursField( cronParams[2] ) )
+ {
+ return false;
+ }
+
+ //Check day-of-month param
+ if ( !checkDayOfMonthField( cronParams[3] ) )
+ {
+ return false;
+ }
+
+ //Check months param
+ if ( !checkMonthsField( cronParams[4] ) )
+ {
+ return false;
+ }
+
+ //Check day-of-week param
+ if ( !checkDayOfWeekField( cronParams[5] ) )
+ {
+ return false;
+ }
+
+ //Check year param
+ if ( cronParams.length == 7 )
+ {
+ if ( !checkYearField( cronParams[6] ) )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ catch ( ParseException e )
+ {
+ return false;
+ }
+ }
+
+ private boolean checkSecondsField( String secondsField )
+ {
+ return checkField( secondsField, 0, 59 );
+ }
+
+ private boolean checkMinutesField( String minutesField )
+ {
+ return checkField( minutesField, 0, 59 );
+ }
+
+ private boolean checkHoursField( String hoursField )
+ {
+ return checkField( hoursField, 0, 23 );
+ }
+
+ private boolean checkDayOfMonthField( String dayOfMonthField )
+ {
+ if ( "?".equals( dayOfMonthField ) )
+ {
+ return true;
+ }
+
+ if ( dayOfMonthField.indexOf( "L" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfMonthField, "L", 1, 7, -1, -1 );
+ }
+ else if ( dayOfMonthField.indexOf( "W" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfMonthField, "W", 1, 31, -1, -1 );
+ }
+ else if ( dayOfMonthField.indexOf( "C" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfMonthField, "C", 1, 31, -1, -1 );
+ }
+ else
+ {
+ return checkField( dayOfMonthField, 1, 31 );
+ }
+ }
+
+ private boolean checkMonthsField( String monthsField )
+ {
+ monthsField = StringUtils.replace( monthsField, "JAN", "1" );
+ monthsField = StringUtils.replace( monthsField, "FEB", "2" );
+ monthsField = StringUtils.replace( monthsField, "MAR", "3" );
+ monthsField = StringUtils.replace( monthsField, "APR", "4" );
+ monthsField = StringUtils.replace( monthsField, "MAY", "5" );
+ monthsField = StringUtils.replace( monthsField, "JUN", "6" );
+ monthsField = StringUtils.replace( monthsField, "JUL", "7" );
+ monthsField = StringUtils.replace( monthsField, "AUG", "8" );
+ monthsField = StringUtils.replace( monthsField, "SEP", "9" );
+ monthsField = StringUtils.replace( monthsField, "OCT", "10" );
+ monthsField = StringUtils.replace( monthsField, "NOV", "11" );
+ monthsField = StringUtils.replace( monthsField, "DEC", "12" );
+
+ return checkField( monthsField, 1, 31 );
+ }
+
+ private boolean checkDayOfWeekField( String dayOfWeekField )
+ {
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "SUN", "1" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "MON", "2" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "TUE", "3" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "WED", "4" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "THU", "5" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "FRI", "6" );
+ dayOfWeekField = StringUtils.replace( dayOfWeekField, "SAT", "7" );
+
+ if ( "?".equals( dayOfWeekField ) )
+ {
+ return true;
+ }
+
+ if ( dayOfWeekField.indexOf( "L" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfWeekField, "L", 1, 7, -1, -1 );
+ }
+ else if ( dayOfWeekField.indexOf( "C" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfWeekField, "C", 1, 7, -1, -1 );
+ }
+ else if ( dayOfWeekField.indexOf( "#" ) >= 0 )
+ {
+ return checkFieldWithLetter( dayOfWeekField, "#", 1, 7, 1, 5 );
+ }
+ else
+ {
+ return checkField( dayOfWeekField, 1, 7 );
+ }
+ }
+
+ private boolean checkYearField( String yearField )
+ {
+ return checkField( yearField, 1970, 2099 );
+ }
+
+ private boolean checkField( String secondsField, int minimal, int maximal )
+ {
+ if ( secondsField.indexOf( "-" ) > -1 )
+ {
+ String startValue = secondsField.substring( 0, secondsField.indexOf( "-" ) );
+ String endValue = secondsField.substring( secondsField.indexOf( "-" ) + 1 );
+
+ if ( !( checkIntValue( startValue, minimal, maximal ) && checkIntValue( endValue, minimal, maximal ) ) )
+ {
+ return false;
+ }
+ try
+ {
+ int startVal = Integer.parseInt( startValue );
+ int endVal = Integer.parseInt( endValue );
+
+ return endVal > startVal;
+
+ }
+ catch ( NumberFormatException e )
+ {
+ return false;
+ }
+ }
+ else if ( secondsField.indexOf( "," ) > -1 )
+ {
+ return checkListField( secondsField, minimal, maximal );
+ }
+ else if ( secondsField.indexOf( "/" ) > -1 )
+ {
+ return checkIncrementField( secondsField, minimal, maximal );
+ }
+ else if ( secondsField.indexOf( "*" ) != -1 )
+ {
+ return true;
+ }
+ else
+ {
+ return checkIntValue( secondsField, minimal, maximal );
+ }
+ }
+
+ private boolean checkFieldWithLetter( String value, String letter, int minimalBefore, int maximalBefore,
+ int minimalAfter, int maximalAfter )
+ {
+ boolean canBeAlone = false;
+ boolean canHaveIntBefore = false;
+ boolean canHaveIntAfter = false;
+ boolean mustHaveIntBefore = false;
+ boolean mustHaveIntAfter = false;
+
+ if ( "L".equals( letter ) )
+ {
+ canBeAlone = true;
+ canHaveIntBefore = true;
+ canHaveIntAfter = false;
+ mustHaveIntBefore = false;
+ mustHaveIntAfter = false;
+ }
+ if ( "W".equals( letter ) || "C".equals( letter ) )
+ {
+ canBeAlone = false;
+ canHaveIntBefore = true;
+ canHaveIntAfter = false;
+ mustHaveIntBefore = true;
+ mustHaveIntAfter = false;
+ }
+ if ( "#".equals( letter ) )
+ {
+ canBeAlone = false;
+ canHaveIntBefore = true;
+ canHaveIntAfter = true;
+ mustHaveIntBefore = true;
+ mustHaveIntAfter = true;
+ }
+
+ String beforeLetter = "";
+ String afterLetter = "";
+
+ if ( value.indexOf( letter ) >= 0 )
+ {
+ beforeLetter = value.substring( 0, value.indexOf( letter ) );
+ }
+
+ if ( !value.endsWith( letter ) )
+ {
+ afterLetter = value.substring( value.indexOf( letter ) + 1 );
+ }
+
+ if ( value.indexOf( letter ) >= 0 )
+ {
+ if ( letter.equals( value ) )
+ {
+ return canBeAlone;
+ }
+
+ if ( canHaveIntBefore )
+ {
+ if ( mustHaveIntBefore && beforeLetter.length() == 0 )
+ {
+ return false;
+ }
+
+ if ( !checkIntValue( beforeLetter, minimalBefore, maximalBefore, true ) )
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if ( beforeLetter.length() > 0 )
+ {
+ return false;
+ }
+ }
+
+ if ( canHaveIntAfter )
+ {
+ if ( mustHaveIntAfter && afterLetter.length() == 0 )
+ {
+ return false;
+ }
+
+ if ( !checkIntValue( afterLetter, minimalAfter, maximalAfter, true ) )
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if ( afterLetter.length() > 0 )
+ {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ private boolean checkIncrementField( String value, int minimal, int maximal )
+ {
+ String start = value.substring( 0, value.indexOf( "/" ) );
+
+ String increment = value.substring( value.indexOf( "/" ) + 1 );
+
+ if ( !"*".equals( start ) )
+ {
+ return checkIntValue( start, minimal, maximal ) && checkIntValue( increment, minimal, maximal, false );
+ }
+ else
+ {
+ return checkIntValue( increment, minimal, maximal );
+ }
+ }
+
+ private boolean checkListField( String value, int minimal, int maximal )
+ {
+ StringTokenizer st = new StringTokenizer( value, "," );
+
+ List values = new ArrayList();
+
+ while ( st.hasMoreTokens() )
+ {
+ values.add( st.nextToken() );
+ }
+
+ int previousValue = -1;
+
+ for ( Iterator i = values.iterator(); i.hasNext(); )
+ {
+ String currentValue = (String) i.next();
+
+ if ( !checkIntValue( currentValue, minimal, maximal ) )
+ {
+ return false;
+ }
+
+ try
+ {
+ int val = Integer.parseInt( currentValue );
+
+ if ( val <= previousValue )
+ {
+ return false;
+ }
+ else
+ {
+ previousValue = val;
+ }
+ }
+ catch ( NumberFormatException e )
+ {
+ // we have always an int
+ }
+ }
+
+ return true;
+ }
+
+ private boolean checkIntValue( String value, int minimal, int maximal )
+ {
+ return checkIntValue( value, minimal, maximal, true );
+ }
+
+ private static boolean checkIntValue( String value, int minimal, int maximal, boolean checkExtremity )
+ {
+ try
+ {
+ int val = Integer.parseInt( value );
+
+ if ( checkExtremity )
+ {
+ if ( val < minimal || val > maximal )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ catch ( NumberFormatException e )
+ {
+ return false;
+ }
+ }
+}
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java b/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
new file mode 100644
index 0000000..db12893
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/DefaultJobListener.java
@@ -0,0 +1,125 @@
+package org.codehaus.redback.components.scheduler;
+
+/* ----------------------------------------------------------------------------
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Plexus", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ----------------------------------------------------------------------------
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * ----------------------------------------------------------------------------
+ */
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobListener;
+
+/**
+ * Currently the role this class plays is set the value of the <code>JobDataMap</code>
+ * in the job so that the convenience methods for accessing the logger, context,
+ * service broker and configuration will work as expected.
+ *
+ * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
+ * @version $Id$
+ */
+public class DefaultJobListener
+ implements JobListener
+{
+ /**
+ * <p>
+ * <p/>
+ * Get the name of the <code>JobListener</code>.</p>
+ */
+ public String getName()
+ {
+ return "DefaultJobLister";
+ }
+
+ /**
+ * <p>
+ * <p/>
+ * Called by the <code>{@link Scheduler}</code> when a <code>{@link Job}</code>
+ * is about to be executed (an associated <code>{@link org.quartz.Trigger}</code> has
+ * occured).</p>
+ */
+ public void jobToBeExecuted( JobExecutionContext context )
+ {
+ Job job = context.getJobInstance();
+
+ // Only attempt to set the ServiceBroker when we are dealing
+ // with subclasses AbstractJob.
+ if ( job instanceof AbstractJob )
+ {
+ ( (AbstractJob) job ).setJobDataMap( context.getJobDetail().getJobDataMap() );
+ }
+ }
+
+ public void jobExecutionVetoed( JobExecutionContext jobExecutionContext )
+ {
+ }
+
+ /**
+ * <p>
+ * <p/>
+ * Called by the <code>{@link Scheduler}</code> after a <code>{@link Job}</code>
+ * has been executed, and be for the associated <code>Trigger</code>'s
+ * <code>triggered(xx)</code> method has been called.</p>
+ */
+ public void jobWasExecuted( JobExecutionContext context, JobExecutionException jobException )
+ {
+ Job job = context.getJobInstance();
+
+ // Only attempt to null the ServiceBroker when we are dealing
+ // with subclasses AbstractJob.
+ if ( job instanceof AbstractJob )
+ {
+ }
+ }
+}
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
new file mode 100644
index 0000000..cec012f
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/DefaultScheduler.java
@@ -0,0 +1,180 @@
+package org.codehaus.redback.components.scheduler;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.quartz.JobKey;
+import org.quartz.JobListener;
+import org.quartz.Matcher;
+import org.quartz.SchedulerException;
+import org.quartz.SchedulerFactory;
+import org.quartz.Trigger;
+import org.quartz.TriggerListener;
+import org.quartz.core.QuartzScheduler;
+import org.quartz.impl.JobDetailImpl;
+import org.quartz.impl.StdScheduler;
+import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.utils.Key;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.Properties;
+
+public class DefaultScheduler
+ implements Scheduler
+{
+
+ private Logger log = LoggerFactory.getLogger( getClass() );
+
+ private Properties properties;
+
+ private StdScheduler scheduler;
+
+ public void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ throws SchedulerException
+ {
+ if ( jobDetail == null || jobDetail.getName() == null )
+ {
+ throw new SchedulerException( "No job or no job name - cannot schedule this job" );
+ }
+
+ if ( jobExists( jobDetail.getName(), jobDetail.getGroup() ) )
+ {
+ log.warn( "Will not schedule this job as a job {" + jobDetail.getName() + ":" + jobDetail.getGroup()
+ + "} already exists." );
+
+ return;
+ }
+
+ try
+ {
+ scheduler.scheduleJob( jobDetail, trigger );
+ }
+ catch ( SchedulerException e )
+ {
+ throw new SchedulerException( "Error scheduling job.", e );
+ }
+ catch ( Exception e )
+ {
+ throw new SchedulerException( "Error scheduling job (Verify your cron expression).", e );
+ }
+ }
+
+ public void addGlobalJobListener( JobListener listener )
+ throws SchedulerException
+ {
+ scheduler.getListenerManager().addJobListener( listener, new AllMatch() );
+ }
+
+ public void addGlobalTriggerListener( TriggerListener listener )
+ throws SchedulerException
+ {
+ scheduler.getListenerManager().addTriggerListener( listener, new AllMatch() );
+ }
+
+ private static class AllMatch<R extends Key<?>> implements Matcher<R>
+ {
+ public boolean isMatch( R key )
+ {
+ return true;
+ }
+ }
+
+ @PostConstruct
+ public void initialize()
+ throws SchedulerException
+ {
+ SchedulerFactory factory = new StdSchedulerFactory( properties );
+
+ scheduler = (StdScheduler) factory.getScheduler();
+
+ scheduler.start();
+
+ }
+
+ @PreDestroy
+ public void stop()
+ {
+ scheduler.shutdown();
+ }
+
+ public void unscheduleJob( String jobName, String groupName )
+ throws SchedulerException
+ {
+ if ( jobName == null )
+ {
+ throw new SchedulerException( "Job name null - cannot unschedule job" );
+ }
+
+ try
+ {
+ if ( jobExists( jobName, groupName ) )
+ {
+ scheduler.deleteJob( new JobKey( jobName, groupName ) );
+ }
+ }
+ catch ( SchedulerException e )
+ {
+ throw new SchedulerException( "Error unscheduling job.", e );
+ }
+ }
+
+ public boolean interruptSchedule( String jobName, String groupName )
+ throws SchedulerException
+ {
+ try
+ {
+ return scheduler.interrupt( new JobKey( jobName, groupName ) );
+ }
+ catch ( Exception e )
+ {
+ throw new SchedulerException( "Can't interrup job \"" + jobName + "\".", e );
+ }
+ }
+
+ private boolean jobExists( String jobName, String jobGroup )
+ throws SchedulerException
+ {
+
+ return ( scheduler.getJobDetail( new JobKey( jobName, jobGroup ) ) != null );
+ }
+
+ public void shutdown( boolean waitForJobsToComplete )
+ {
+ log.info( "call shutdown waitForJobsToComplete : {}", waitForJobsToComplete );
+ scheduler.shutdown( waitForJobsToComplete );
+ }
+
+ public StdScheduler getScheduler()
+ {
+ return scheduler;
+ }
+
+ public void setProperties( Properties properties )
+ {
+ this.properties = properties;
+ }
+
+ public Properties getProperties()
+ {
+ return properties;
+ }
+}
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java b/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
new file mode 100644
index 0000000..39f1100
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/Scheduler.java
@@ -0,0 +1,60 @@
+package org.codehaus.redback.components.scheduler;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.quartz.JobListener;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerListener;
+import org.quartz.impl.JobDetailImpl;
+
+import java.util.Properties;
+
+public interface Scheduler
+{
+
+ void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ throws SchedulerException;
+
+ /**
+ * @param listener
+ */
+ void addGlobalJobListener( JobListener listener )
+ throws SchedulerException;
+
+ /**
+ * @param listener
+ */
+ void addGlobalTriggerListener( TriggerListener listener )
+ throws SchedulerException;
+
+ void unscheduleJob( String jobName, String groupName )
+ throws SchedulerException;
+
+ boolean interruptSchedule( String jobName, String groupName )
+ throws SchedulerException;
+
+ void setProperties( Properties properties );
+
+ Properties getProperties();
+
+ void shutdown( boolean waitForJobsToComplete );
+
+}
diff --git a/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java b/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
new file mode 100644
index 0000000..a340b02
--- /dev/null
+++ b/src/main/java/org/codehaus/redback/components/scheduler/configuration/SchedulerConfiguration.java
@@ -0,0 +1,133 @@
+package org.codehaus.redback.components.scheduler.configuration;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.codehaus.redback.components.scheduler.Scheduler;
+import org.quartz.impl.StdSchedulerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
+
+/**
+ * Class to represent the configuration file for the proxy
+ *
+ * @author John Tolentino
+ * plexus.component role="org.codehaus.plexus.scheduler.configuration.SchedulerConfiguration"
+ */
+@Service
+public class SchedulerConfiguration
+{
+ /*
+ * plexus.required
+ */
+ @Inject
+ private Scheduler plexusScheduler;
+
+ public String getInstanceName()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME );
+ }
+
+ public void setInstanceName( String instanceName )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, instanceName );
+ }
+
+ public String getInstanceId()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID );
+ }
+
+ public void setInstanceId( String InstanceId )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_INSTANCE_ID, InstanceId );
+ }
+
+ public String getThreadName()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME );
+ }
+
+ public void setThreadName( String threadName )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_THREAD_NAME, threadName );
+ }
+
+ public String getIdleWaitTime()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME );
+ }
+
+ public void setIdleWaitTime( String idleWaitTime )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_IDLE_WAIT_TIME, idleWaitTime );
+ }
+
+ public String getDbFailureRetryInterval()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL );
+ }
+
+ public void setDbFailureRetryInterval( String dbFailureRetryInterval )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_DB_FAILURE_RETRY_INTERVAL, dbFailureRetryInterval );
+ }
+
+ public String getClassLoadHelper()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS );
+ }
+
+ public void setClassLoadHelper( String classLoadHelper )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS, classLoadHelper );
+ }
+
+ public String getContextKey()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX );
+ }
+
+ public void setContextKey( String contextKey )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_CONTEXT_PREFIX, contextKey );
+ }
+
+ public String getUserTransactionURL()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL );
+ }
+
+ public void setUserTransactionURL( String userTransactionURL )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_USER_TX_URL, userTransactionURL );
+ }
+
+ public String getWrapJobExecutionInUserTransaction()
+ {
+ return plexusScheduler.getProperties().getProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX );
+ }
+
+ public void setWrapJobExecutionInUserTransaction( String wrapJobExecutionInUserTransaction )
+ {
+ plexusScheduler.getProperties().setProperty( StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX, wrapJobExecutionInUserTransaction );
+ }
+
+}
diff --git a/src/main/resources/META-INF/spring-context.xml b/src/main/resources/META-INF/spring-context.xml
new file mode 100755
index 0000000..04ec35b
--- /dev/null
+++ b/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ default-lazy-init="true">
+
+ <context:annotation-config />
+ <context:component-scan
+ base-package="org.codehaus.redback.components.scheduler"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java b/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
new file mode 100644
index 0000000..6f0f832
--- /dev/null
+++ b/src/test/java/org/codehaus/redback/components/scheduler/CronExpressionValidatorTest.java
@@ -0,0 +1,127 @@
+package org.codehaus.redback.components.scheduler;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
+public class CronExpressionValidatorTest
+ extends TestCase
+{
+
+ @Inject
+ CronExpressionValidator validator;
+
+ @Test
+ public void testValidation()
+ throws Exception
+ {
+
+ assertTrue( validator.validate( "0 0 * * * ?" ) );
+
+ assertTrue( validator.validate( "0 0 * ? * *" ) );
+
+ assertFalse( validator.validate( "0 0 4-1 * * ?" ) );
+
+ assertTrue( validator.validate( "0 0 1-4 * * ?" ) );
+
+ assertTrue( validator.validate( "0 0,15,30,45 * * * ?" ) );
+
+ assertFalse( validator.validate( "0 0,45,15,30 * * * ?" ) );
+
+ assertTrue( validator.validate( "0 0 12 * * ?" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * *" ) );
+
+ assertTrue( validator.validate( "0 15 10 * * ?" ) );
+
+ assertTrue( validator.validate( "0 15 10 * * ? *" ) );
+
+ assertTrue( validator.validate( "0 15 10 * * ? 2005" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 2100" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 1969" ) );
+
+ assertTrue( validator.validate( "0 15 10 * * ? 2005-2007" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 2005-2100" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 1960-2010" ) );
+
+ assertTrue( validator.validate( "0 15 10 * * ? 2005/2" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 2100/3" ) );
+
+ assertFalse( validator.validate( "0 15 10 * * ? 1960/10" ) );
+
+ assertTrue( validator.validate( "0 * 14 * * ?" ) );
+
+ assertTrue( validator.validate( "0 0/5 14 * * ?" ) );
+
+ assertTrue( validator.validate( "0 0/5 14,18 * * ?" ) );
+
+ assertTrue( validator.validate( "0 0-5 14 * * ?" ) );
+
+ assertTrue( validator.validate( "0 10,44 14 ? 3 WED" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * MON-FRI" ) );
+
+ assertTrue( validator.validate( "0 15 10 15 * ?" ) );
+
+ assertTrue( validator.validate( "0 15 10 L * ?" ) );
+
+ assertFalse( validator.validate( "0 15 10 6#3 * ?" ) );
+
+ assertTrue( validator.validate( "0 15 10 15W * ?" ) );
+
+ assertFalse( validator.validate( "0 15 10 15W1 * ?" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * 6L" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * 6L" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * 6L 2002-2005" ) );
+
+ assertFalse( validator.validate( "0 15 10 ? * 6L3 2002-2005" ) );
+
+ assertTrue( validator.validate( "0 15 10 ? * 6#3" ) );
+
+ assertFalse( validator.validate( "0 15 10 ? * 6#" ) );
+
+ assertFalse( validator.validate( "0 15 10 ? * #3" ) );
+
+ assertFalse( validator.validate( "0 15 10 ? * 8#3" ) );
+
+ assertFalse( validator.validate( "0 15 10 ? * 6#6" ) );
+
+ assertFalse( validator.validate( "0 0" ) );
+
+ assertFalse( validator.validate( "0 0 * * * *" ) );
+
+ assertFalse( validator.validate( "a a a a a a" ) );
+
+ assertFalse( validator.validate( "0 0 0 ? 0 A" ) );
+ }
+}
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java b/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
new file mode 100644
index 0000000..83e6948
--- /dev/null
+++ b/src/test/java/org/codehaus/redback/components/scheduler/JobOne.java
@@ -0,0 +1,79 @@
+package org.codehaus.redback.components.scheduler;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Turbine", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.util.Date;
+
+public class JobOne
+ implements Job
+{
+ public JobOne()
+ {
+ }
+
+ public void execute( JobExecutionContext context )
+ throws JobExecutionException
+ {
+ System.out.println(
+ " --- Testing Scheduler Component\n --- " + context.getJobDetail().getDescription() + " executed.["
+ + new Date() + "]" );
+
+ }
+
+}
diff --git a/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
new file mode 100644
index 0000000..58ffda9
--- /dev/null
+++ b/src/test/java/org/codehaus/redback/components/scheduler/SchedulerTest.java
@@ -0,0 +1,102 @@
+package org.codehaus.redback.components.scheduler;
+
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerListener;
+import org.quartz.impl.JobDetailImpl;
+import org.quartz.impl.triggers.SimpleTriggerImpl;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
+public class SchedulerTest
+ extends TestCase
+ implements TriggerListener
+{
+ private boolean triggerFired;
+
+ @Inject
+ private Scheduler scheduler;
+
+ @After
+ public void stop()
+ {
+ scheduler.shutdown( true );
+ }
+
+ @Test
+ public void testCreation()
+ throws Exception
+ {
+
+
+ assertNotNull( scheduler );
+
+ JobDataMap dataMap = new JobDataMap();
+
+ dataMap.put( "project", "continuum" );
+
+ JobDetailImpl jobDetail = new JobDetailImpl( "job", "group", JobOne.class );
+
+ jobDetail.setJobDataMap( dataMap );
+
+ TriggerBuilder.newTrigger();
+
+ Trigger trigger = new SimpleTriggerImpl( "trigger", "group" );
+
+ scheduler.addGlobalTriggerListener( this );
+
+ scheduler.scheduleJob( jobDetail, trigger );
+
+ while ( ! triggerFired )
+ {
+ //System.out.println("! triggerFired");
+ Thread.sleep( 10 );
+ }
+ System.out.println("ok triggerFired");
+ }
+
+ public void triggerComplete( Trigger trigger, JobExecutionContext context, int triggerInstructionCode )
+ {
+ }
+
+ public boolean vetoJobExecution( Trigger trigger, JobExecutionContext context )
+ {
+ return false;
+ }
+
+ public void triggerFired( Trigger trigger, JobExecutionContext context )
+ {
+ System.out.println( "Trigger fired!" );
+
+ triggerFired = true;
+ }
+
+ public void triggerMisfired( Trigger trigger )
+ {
+ }
+
+ public void triggerComplete( Trigger trigger, JobExecutionContext context,
+ Trigger.CompletedExecutionInstruction triggerInstructionCode )
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getName()
+ {
+ return "foo";
+ }
+
+
+
+}
+
diff --git a/src/test/resources/spring-context.xml b/src/test/resources/spring-context.xml
new file mode 100755
index 0000000..16ec4a1
--- /dev/null
+++ b/src/test/resources/spring-context.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
+ <property name="properties">
+ <props>
+ <prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
+ <prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop>
+ <prop key="org.quartz.threadPool.threadCount">1</prop>
+ <prop key="org.quartz.threadPool.threadPriority">4</prop>
+ <prop key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop>
+ </props>
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 06/46: use quartz 2.1.3
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 7b71b7711a886c8c5f5ea54ad721e2570520aaed
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Apr 11 08:56:15 2012 +0000
use quartz 2.1.3
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1324651 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 345362e..3539102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.1</version>
+ <version>2.1.3</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 14/46: fix site
deployment
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit bbe1e57c03489abe8fd6f936dfc934c6a0c38d79
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Aug 31 10:17:55 2012 +0000
fix site deployment
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1379403 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index cd4be22..68e2a09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,13 @@
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>file://${user.home}/redback-components-site-deploy/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 25/46: back to parent
snapshot
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 2f22fca20c17abf5414c622a26b10e717ebb5d86
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Apr 28 09:44:00 2013 +0000
back to parent snapshot
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476744 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6e84890..ab54230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 13/46: configure svnpub
for redback-components site
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 8aaa932dd0747fee17f5ebcc6f12b9fc16f45589
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Aug 28 20:19:24 2012 +0000
configure svnpub for redback-components site
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1378297 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a070f61..cd4be22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,13 +34,6 @@
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId}</url>
- </site>
- </distributionManagement>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 05/46: fix pom due to
asf move
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit de3029ecb8af70064e4633673c9430fd72276399
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 22:40:56 2012 +0000
fix pom due to asf move
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310624 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6ae93ef..345362e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,21 +27,21 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-quartz</artifactId>
<name>Spring Quartz Component</name>
- <version>1.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
- <url>http://redback.codehaus.org/components/${project.artifactId}</url>
+ <url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
<distributionManagement>
<site>
- <id>codehaus.org</id>
- <url>dav:https://dav.codehaus.org/redback/components/${project.artifactId}</url>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId}</url>
</site>
</distributionManagement>
<scm>
- <connection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-quartz</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-quartz</developerConnection>
- <url>http://fisheye.codehaus.org/browse/redback/components/trunk/spring-quartz</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 23/46: quartz 2.1.7
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 48cf9162c02fdc45db310e27ee72aaa9af29cba9
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Mar 19 21:58:01 2013 +0000
quartz 2.1.7
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1458536 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 092bf38..ab54230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.6</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 38/46: use a staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 0bb80277fb43dbb4642dc5bf1cb7e92b6e90813d
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 01:24:49 2014 +0000
use a staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558639 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1932037..c50b6f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 09/46: use indexOf char
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 5933d99c50a1b37478673f750b93299d96a67c5b
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Jul 8 16:08:07 2012 +0000
use indexOf char
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1358767 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/scheduler/CronExpressionValidator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
index 5944279..2400954 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/CronExpressionValidator.java
@@ -141,15 +141,15 @@ public final class CronExpressionValidator
return true;
}
- if ( dayOfMonthField.indexOf( "L" ) >= 0 )
+ if ( dayOfMonthField.indexOf( 'L' ) >= 0 )
{
return checkFieldWithLetter( dayOfMonthField, "L", 1, 7, -1, -1 );
}
- else if ( dayOfMonthField.indexOf( "W" ) >= 0 )
+ else if ( dayOfMonthField.indexOf( 'W' ) >= 0 )
{
return checkFieldWithLetter( dayOfMonthField, "W", 1, 31, -1, -1 );
}
- else if ( dayOfMonthField.indexOf( "C" ) >= 0 )
+ else if ( dayOfMonthField.indexOf( 'C' ) >= 0 )
{
return checkFieldWithLetter( dayOfMonthField, "C", 1, 31, -1, -1 );
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 26/46: fix various path
for deployment
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 2331ba82359dec5e522a057af17c30d3d72e49e0
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun May 5 10:53:13 2013 +0000
fix various path for deployment
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1479288 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ab54230..e06467e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>file://${user.home}/redback-components-site-deploy/${project.artifactId}</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/${project.artifactId}</url>
</site>
</distributionManagement>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 39/46:
[maven-release-plugin] prepare release spring-quartz-2.1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 963eb4833b058b71ad7ad8967b78977c1ff5a809
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 01:35:18 2014 +0000
[maven-release-plugin] prepare release spring-quartz-2.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558654 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index c50b6f1..5447371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<artifactId>spring-quartz</artifactId>
<packaging>bundle</packaging>
<name>Spring Quartz Component</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-quartz-2.1</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 40/46:
[maven-release-plugin] prepare for next development iteration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 9ffb86294b043e3038c5f70829a071f9efbdb243
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 01:35:26 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558656 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5447371..8d2982f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<artifactId>spring-quartz</artifactId>
<packaging>bundle</packaging>
<name>Spring Quartz Component</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.1</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-quartz-2.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 30/46: remove unused
imports
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 9cd341f9a4fd99022edc3018368259918063d09a
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 29 00:00:04 2013 +0000
remove unused imports
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546478 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/archiva/redback/components/scheduler/DefaultScheduler.java | 1 -
.../java/org/apache/archiva/redback/components/scheduler/Scheduler.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
index ddf71e6..7876c38 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
@@ -27,7 +27,6 @@ import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
import org.quartz.TriggerListener;
-import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.StdScheduler;
import org.quartz.impl.StdSchedulerFactory;
import org.quartz.utils.Key;
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
index 722c405..d64e24f 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
@@ -24,7 +24,6 @@ import org.quartz.JobListener;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
import org.quartz.TriggerListener;
-import org.quartz.impl.JobDetailImpl;
import java.util.Properties;
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 24/46: use staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 36bc7246446d084ec4179416455a5dc4e4bae9b6
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 27 07:41:50 2013 +0000
use staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476518 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ab54230..6e84890 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 15/46: use a staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 6948f27daba5b71a23f688d54794b003b978a213
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 11:28:22 2012 +0000
use a staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388432 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 68e2a09..942ac27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 36/46: fix logging warn
level
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 4ecf2f1f2f343d58a901e32daa47008d2e828a70
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Dec 2 02:55:36 2013 +0000
fix logging warn level
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546881 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/archiva/redback/components/scheduler/DefaultScheduler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
index 7876c38..55f912b 100644
--- a/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
+++ b/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
@@ -58,8 +58,8 @@ public class DefaultScheduler
if ( jobExists( jobDetail.getKey() ) )
{
- log.warn( "Will not schedule this job as a job {" + jobDetail.getKey().getName() + ":"
- + jobDetail.getKey().getGroup() + "} already exists." );
+ log.warn( "Will not schedule this job as a job ({}:{}) already exists.",
+ jobDetail.getKey().getName(), jobDetail.getKey().getGroup() );
return;
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 19/46: log4j 2.0-beta1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit cacf2513f9d850b12decec1a1fccc5df6b82e0d5
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Sep 22 16:04:11 2012 +0000
log4j 2.0-beta1
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388823 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4f74deb..7816b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 43/46: use last parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 627a324a81ebcc46257e889c69b4d09355ff40ac
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Sep 10 01:22:01 2014 +0000
use last parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1623894 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index db0f0c4..cda244d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 28/46: upgrade to last
spring version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 3b8a23f989255949f5aa3108619bcca2319fa1df
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 22 03:46:17 2013 +0000
upgrade to last spring version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1544407 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 34ad8bb..adf7031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 11/46: [MRM-1651] Add
OSGi support in spring-apacheds, spring-quartz, spring-registry,
spring-taskqueue, spring-utils
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit d8c1eec846c7499bd57ec09caa940f888ed6a869
Author: Jean-Baptiste Onofre <jb...@apache.org>
AuthorDate: Thu Aug 2 07:34:34 2012 +0000
[MRM-1651] Add OSGi support in spring-apacheds, spring-quartz, spring-registry, spring-taskqueue, spring-utils
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1368371 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3539102..09f4560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,19 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>spring-quartz</artifactId>
+ <packaging>bundle</packaging>
<name>Spring Quartz Component</name>
- <version>2.0-SNAPSHOT</version>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -82,9 +85,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -93,4 +101,5 @@
</plugin>
</plugins>
</build>
+
</project>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 29/46: use last quartz
version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit be160a82bc87020679a26fbf87b4a8fa66193713
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Nov 28 23:30:10 2013 +0000
use last quartz version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546474 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index adf7031..1932037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.7</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>c3p0</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 20/46: remove System.out
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit 86407502409de9c9ea977ed793a2198c26136b90
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Nov 20 21:10:24 2012 +0000
remove System.out
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1411873 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/components/scheduler/JobOne.java | 8 +++++++-
.../redback/components/scheduler/SchedulerTest.java | 19 ++++++++++---------
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
index 56caf57..681d002 100644
--- a/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/JobOne.java
@@ -18,15 +18,21 @@ package org.apache.archiva.redback.components.scheduler;
* specific language governing permissions and limitations
* under the License.
*/
+
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Date;
public class JobOne
implements Job
{
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
public JobOne()
{
}
@@ -34,7 +40,7 @@ public class JobOne
public void execute( JobExecutionContext context )
throws JobExecutionException
{
- System.out.println(
+ logger.info(
" --- Testing Scheduler Component\n --- " + context.getJobDetail().getDescription() + " executed.["
+ new Date() + "]" );
diff --git a/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
index f473f1b..f8a1d39 100644
--- a/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/scheduler/SchedulerTest.java
@@ -30,19 +30,23 @@ import org.quartz.TriggerBuilder;
import org.quartz.TriggerListener;
import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.triggers.SimpleTriggerImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
-@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
+@RunWith ( SpringJUnit4ClassRunner.class )
+@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class SchedulerTest
extends TestCase
implements TriggerListener
{
private boolean triggerFired;
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
@Inject
private Scheduler scheduler;
@@ -57,7 +61,6 @@ public class SchedulerTest
throws Exception
{
-
assertNotNull( scheduler );
JobDataMap dataMap = new JobDataMap();
@@ -76,12 +79,11 @@ public class SchedulerTest
scheduler.scheduleJob( jobDetail, trigger );
- while ( ! triggerFired )
+ while ( !triggerFired )
{
- //System.out.println("! triggerFired");
- Thread.sleep( 10 );
+ Thread.sleep( 10 );
}
- System.out.println("ok triggerFired");
+ logger.info( "ok triggerFired" );
}
public void triggerComplete( Trigger trigger, JobExecutionContext context, int triggerInstructionCode )
@@ -95,7 +97,7 @@ public class SchedulerTest
public void triggerFired( Trigger trigger, JobExecutionContext context )
{
- System.out.println( "Trigger fired!" );
+ logger.info( "Trigger fired!" );
triggerFired = true;
}
@@ -116,6 +118,5 @@ public class SchedulerTest
}
-
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-quartz] 17/46:
[maven-release-plugin] prepare release spring-quartz-2.0
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-quartz.git
commit ab9fa2f3bb5f6214f4f2ffc06a40486de141ff92
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 13:25:12 2012 +0000
[maven-release-plugin] prepare release spring-quartz-2.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388482 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cac449..ad90386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<artifactId>spring-quartz</artifactId>
<packaging>bundle</packaging>
<name>Spring Quartz Component</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-quartz-2.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-quartz-2.0</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.