This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.registration-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit f6eaa8692aeac9c4c0db3463eb9330b6067d7208 Author: Felix Meschberger <fmesc...@apache.org> AuthorDate: Fri May 25 10:05:59 2012 +0000 SLING-2494 Require configuration to prevent using unsuitable or even unusable default configuration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration@1342555 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/jcr/registration/impl/JndiRegistrationSupport.java | 5 ++++- .../apache/sling/jcr/registration/impl/RmiRegistrationSupport.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java index 32c5fb4..081473a 100644 --- a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java +++ b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java @@ -29,6 +29,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; import org.apache.sling.jcr.registration.AbstractRegistrationSupport; import org.osgi.service.log.LogService; @@ -49,7 +50,9 @@ import org.osgi.service.log.LogService; metatype = true, label = "%jndi.name", description = "%jndi.description", - name = "org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport") + name = "org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport", + policy = ConfigurationPolicy.REQUIRE + ) @org.apache.felix.scr.annotations.Properties({ @Property( name = "java.naming.factory.initial", diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java index de0dad7..faf0583 100644 --- a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java +++ b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java @@ -28,6 +28,7 @@ import java.rmi.server.UnicastRemoteObject; import javax.jcr.Repository; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory; import org.apache.jackrabbit.rmi.server.ServerAdapterFactory; @@ -47,7 +48,8 @@ import org.osgi.service.log.LogService; metatype = true, label = "%rmi.name", description = "%rmi.description", - name = "org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport") + name = "org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport", + policy = ConfigurationPolicy.REQUIRE) @org.apache.felix.scr.annotations.Properties({ @Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true), @Property(name = "service.description", value = "RMI based Repository Registration", propertyPrivate = true) -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.