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 <[email protected]> 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 [email protected]. - * - * 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 [email protected]. - * - * 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 [email protected].
