SLING-1460 : Move SlingSettingsService to API bundle

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@927001 13f79535-47bb-0310-9956-ffa450edef68

Author: cziegeler

src/main/java/org/apache/sling/engine/SlingSettingsService.java

@@ -20,8 +20,11 @@
 
 /**
  * The <code>SlingSettingsService</code> provides basic Sling settings.
+ * @deprecated Use the {@link org.apache.sling.api.services.SlingSettingsService}
  */
-public interface SlingSettingsService {
+@Deprecated
+public interface SlingSettingsService
+    extends org.apache.sling.api.services.SlingSettingsService {
 
     /**
      * The identifier of the running Sling instance.

src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java

@@ -48,9 +48,10 @@ public void start(BundleContext context) throws Exception {
         props.put(Constants.SERVICE_DESCRIPTION,
             "Apache Sling Settings Service");
         props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
-        serviceRegistration = context.registerService(SlingSettingsService.class.getName(),
-                                                      service,
-                                                      props);
+        serviceRegistration = context.registerService(new String[] {
+                                               org.apache.sling.api.services.SlingSettingsService.class.getName(),
+                                               SlingSettingsService.class.getName()},
+                                           service, props);
         try {
             RequestHistoryConsolePlugin.initPlugin(context);
         } catch (Throwable ignore) {

src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java

@@ -95,7 +95,7 @@ public SlingSettingsServiceImpl(final BundleContext context) {
     }
 
     /**
-     * @see org.apache.sling.engine.SlingSettingsService#getSlingId()
+     * @see org.apache.sling.api.services.SlingSettingsService#getSlingId()
      */
     public String getSlingId() {
         return this.slingId;