Mailing-List: contact commits-help@ace.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ace.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1464011 - in /ace/trunk: org.apache.ace.scheduler.api/
 org.apache.ace.scheduler/
 org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/
Date: Wed, 03 Apr 2013 13:50:37 -0000
To: commits@ace.apache.org
From: marrs@apache.org
Message-Id: <20130403135038.33B6523888FD@eris.apache.org>

Author: marrs
Date: Wed Apr  3 13:50:37 2013
New Revision: 1464011

URL: http://svn.apache.org/r1464011
Log:
ACE-333 Merged the scheduler.

Added:
    ace/trunk/org.apache.ace.scheduler/api.bnd
    ace/trunk/org.apache.ace.scheduler/impl.bnd
    ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/
    ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
    ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/packageinfo
Removed:
    ace/trunk/org.apache.ace.scheduler.api/
Modified:
    ace/trunk/org.apache.ace.scheduler/bnd.bnd

Added: ace/trunk/org.apache.ace.scheduler/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/api.bnd?rev=1464011&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/api.bnd (added)
+++ ace/trunk/org.apache.ace.scheduler/api.bnd Wed Apr  3 13:50:37 2013
@@ -0,0 +1,2 @@
+Export-Package: org.apache.ace.scheduler.constants
+Bundle-Version: 1.0.0

Modified: ace/trunk/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/bnd.bnd?rev=1464011&r1=1464010&r2=1464011&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.scheduler/bnd.bnd Wed Apr  3 13:50:37 2013
@@ -1,8 +1,5 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.test;version=latest
-Private-Package: org.apache.ace.scheduler
-Bundle-Activator: org.apache.ace.scheduler.Activator
-Bundle-Version: 1.0.0
\ No newline at end of file
+-sub: *.bnd
\ No newline at end of file

Added: ace/trunk/org.apache.ace.scheduler/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/impl.bnd?rev=1464011&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/impl.bnd (added)
+++ ace/trunk/org.apache.ace.scheduler/impl.bnd Wed Apr  3 13:50:37 2013
@@ -0,0 +1,3 @@
+Bundle-Activator: org.apache.ace.scheduler.Activator
+Private-Package: org.apache.ace.scheduler
+Bundle-Version: 1.0.0
\ No newline at end of file

Added: ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java?rev=1464011&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java (added)
+++ ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java Wed Apr  3 13:50:37 2013
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.ace.scheduler.constants;
+
+/**
+ * Compile time constants for the scheduler.
+ */
+public interface SchedulerConstants {
+    /** Persistent ID for the scheduler, provided for configuration purposes. */
+    public static final String SCHEDULER_PID = "org.apache.ace.scheduler";
+    /** Name of the task that will be scheduled. */
+    public static final String SCHEDULER_NAME_KEY = "taskName";
+    /** Description of the task. */
+    public static final String SCHEDULER_DESCRIPTION_KEY = "description";
+    /** The recipe describing when the task should be scheduled. */
+    public static final String SCHEDULER_RECIPE = "recipe";
+    /** Determines if the recipe provided in the task overrides any recipe that is configured. */
+    public static final String SCHEDULER_RECIPE_OVERRIDE = "override";
+}
\ No newline at end of file

Added: ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/packageinfo?rev=1464011&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/packageinfo (added)
+++ ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/packageinfo Wed Apr  3 13:50:37 2013
@@ -0,0 +1 @@
+version 1.0
\ No newline at end of file