This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-standalone.git
commit d937aa727bd44e8e9885ca7c99397820cd5801d3 Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue May 14 08:07:01 2013 +0000 Create new support module git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1482243 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/discovery/impl/standalone/NoClusterDiscoveryService.java | 5 ++--- .../sling/discovery/impl/standalone/StandardPropertyProvider.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/discovery/impl/standalone/NoClusterDiscoveryService.java b/src/main/java/org/apache/sling/discovery/impl/standalone/NoClusterDiscoveryService.java index cfb3c6b..e495e99 100644 --- a/src/main/java/org/apache/sling/discovery/impl/standalone/NoClusterDiscoveryService.java +++ b/src/main/java/org/apache/sling/discovery/impl/standalone/NoClusterDiscoveryService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.discovery.impl; +package org.apache.sling.discovery.impl.standalone; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,6 @@ import java.util.Set; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; @@ -57,7 +56,7 @@ import org.slf4j.LoggerFactory; * which can be used for a cluster less installation (= single instance). * It is disabled by default and can be enabled through a OSGi configuration. */ -@Component(policy = ConfigurationPolicy.REQUIRE, immediate=true) +@Component(immediate=true) @Service(value = {DiscoveryService.class}) public class NoClusterDiscoveryService implements DiscoveryService { diff --git a/src/main/java/org/apache/sling/discovery/impl/standalone/StandardPropertyProvider.java b/src/main/java/org/apache/sling/discovery/impl/standalone/StandardPropertyProvider.java index 798ff0a..dacdb7a 100644 --- a/src/main/java/org/apache/sling/discovery/impl/standalone/StandardPropertyProvider.java +++ b/src/main/java/org/apache/sling/discovery/impl/standalone/StandardPropertyProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.discovery.impl; +package org.apache.sling.discovery.impl.standalone; import java.util.ArrayList; import java.util.Collection; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
