SLING-2494 Require configuration to prevent using unsuitable or even unusable default configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1342555 13f79535-47bb-0310-9956-ffa450edef68
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.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 @@
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 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 @@
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)
