You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2012/05/25 12:05:59 UTC
svn commit: r1342555 - in
/sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl:
JndiRegistrationSupport.java RmiRegistrationSupport.java
Author: fmeschbe
Date: Fri May 25 10:05:59 2012
New Revision: 1342555
URL: http://svn.apache.org/viewvc?rev=1342555&view=rev
Log:
SLING-2494 Require configuration to prevent using unsuitable or even unusable default configuration
Modified:
sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
Modified: sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java?rev=1342555&r1=1342554&r2=1342555&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java (original)
+++ sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java Fri May 25 10:05:59 2012
@@ -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",
Modified: sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java?rev=1342555&r1=1342554&r2=1342555&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java (original)
+++ sling/trunk/bundles/jcr/registration/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java Fri May 25 10:05:59 2012
@@ -28,6 +28,7 @@ import java.rmi.server.UnicastRemoteObje
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)