Author: cziegeler
Date: Wed Mar 24 10:19:09 2010
New Revision: 927001
URL: http://svn.apache.org/viewvc?rev=927001&view=rev
Log:
SLING-1460 : Move SlingSettingsService to API bundle
Added:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
(with props)
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
Added:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java?rev=927001&view=auto
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
(added)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
Wed Mar 24 10:19:09 2010
@@ -0,0 +1,32 @@
+/*
+ * 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.sling.api.services;
+
+/**
+ * The <code>SlingSettingsService</code> provides basic Sling settings.
+ *
+ * @since 2.1
+ */
+public interface SlingSettingsService {
+
+ /**
+ * The identifier of the running Sling instance.
+ */
+ String getSlingId();
+}
Propchange:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/services/SlingSettingsService.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java?rev=927001&r1=927000&r2=927001&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/SlingSettingsService.java
Wed Mar 24 10:19:09 2010
@@ -20,8 +20,11 @@ package org.apache.sling.engine;
/**
* 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.
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java?rev=927001&r1=927000&r2=927001&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/EngineBundleActivator.java
Wed Mar 24 10:19:09 2010
@@ -48,9 +48,10 @@ public class EngineBundleActivator imple
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) {
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java?rev=927001&r1=927000&r2=927001&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
Wed Mar 24 10:19:09 2010
@@ -95,7 +95,7 @@ public class SlingSettingsServiceImpl im
}
/**
- * @see org.apache.sling.engine.SlingSettingsService#getSlingId()
+ * @see org.apache.sling.api.services.SlingSettingsService#getSlingId()
*/
public String getSlingId() {
return this.slingId;
