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/02 15:23:34 UTC
svn commit: r1333035 - in /sling/trunk/bundles/jcr/jackrabbit-server: ./
src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/
src/main/resources/OSGI-INF/metatype/
Author: fmeschbe
Date: Wed May 2 13:23:33 2012
New Revision: 1333035
URL: http://svn.apache.org/viewvc?rev=1333035&view=rev
Log: (empty)
Removed:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AbstractRegistrationSupport.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/JndiRegistrationSupport.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/RmiRegistrationSupport.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1333035&r1=1333034&r2=1333035&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Wed May 2 13:23:33 2012
@@ -132,7 +132,6 @@
org.apache.tika.*,
<!-- Jackrabbit internals -->
- org.apache.jackrabbit.rmi.*,
org.apache.jackrabbit.util,
org.apache.jackrabbit.value,
org.apache.jackrabbit.commons.*,
@@ -219,13 +218,6 @@
<version>2.2.9</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
-
<!-- OSGi Libraries -->
<dependency>
Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1333035&r1=1333034&r2=1333035&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties Wed May 2 13:23:33 2012
@@ -95,34 +95,3 @@ repository.url.override.property.descrip
If the corresponding System Property value is not empty, it is used to acquire \
a Repository via JNDI or RMI, instead of using the embedded one. \
Leave this value empty to force the use of the embedded Repository.
-
-#
-# JNDI Registration Support
-jndi.name = Apache Sling Embedded JCR Repository JNDI Registrar
-jndi.description = The JNDI Registrar listens for embedded repositories \
- to be registered as services and registers them in the JNDI context under the \
- name specified in the "name" service property.
-
-jndi.factory.name = Initial Context Factory
-jndi.factory.description = The fully qualified class name of the factory class \
- that will create an initial context.
-
-jndi.providerurl.name = Provider URL
-jndi.providerurl.description = An URL string for the service provider (e.g. \
- "ldap://somehost:389").
-
-#
-# RMI Registration Support
-rmi.name = Apache Sling Embedded JCR Repository RMI Registrar
-rmi.description = The RMI Registrar listens for embedded repositories \
- to be registered as services and registers them in an RMI registry under the \
- name specified in the "name" service property.
-
-rmi.port.name = Port Number
-rmi.port.description = Port number of the RMI registry to use. The RMI Registrar \
- first tries to create a private RMI registry at this port. If this fails, an \
- existing registry is tried to connect at this port on local host. If this \
- number is negative, the RMI Registrar is disabled. If this number is higher \
- than 65535, an error message is logged and the RMI Registrar is also \
- disabled. If this number is zero, the system default RMI Registry port 1099 \
- is used.