Author: fmeschbe
Date: Mon Aug 5 12:18:30 2013
New Revision: 1510446
URL: http://svn.apache.org/r1510446
Log:
SLING-2944 Revert Service User Mapper changes to cut a 2.1.2 release before
applying these changes again
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/ (props changed)
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
(props changed)
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
(contents, props changed)
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
Propchange: sling/trunk/bundles/jcr/jackrabbit-server/
('svn:mergeinfo' removed)
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1510446&r1=1510445&r2=1510446&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Mon Aug 5 12:18:30 2013
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.1.3-SNAPSHOT</version>
+ <version>2.1.0</version>
<scope>compile</scope>
</dependency>
@@ -219,14 +219,6 @@
<scope>compile</scope>
</dependency>
- <!-- for SCR plugin supporting descriptor inheritance -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.serviceusermapper</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
Propchange:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 5 12:18:30 2013
@@ -0,0 +1 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java:1499280-1499674
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java?rev=1510446&r1=1510445&r2=1510446&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Mon Aug 5 12:18:30 2013
@@ -286,17 +286,26 @@ public class SlingServerRepository exten
}
/**
- * Returns the Jackrabbit {@code RepositoryManager} interface implemented
by
- * the Jackrabbit Repository in addition to the {@code SlingRepository} and
- * {@code Repository} interfaces implemented by the base class.
+ * Overrides the registerService method of
<code>AbstractSlingRepository</code>, in order to register
+ * <code>org.apache.jackrabbit.api.management.RepositoryManager</code>
Service using the
+ * component properties as service registration properties.
*
- * @since bundle version 2.2.0 replacing the previously overwriting of the
- * now final {@code AbstractSlingRepository.registerService} method.
+ * @return The OSGi <code>ServiceRegistration</code> object representing
+ * the registered service.
+ *
+ * @see org.apache.sling.jcr.base.AbstractSlingRepository#registerService()
*/
- protected String[] getServiceRegistrationInterfaces() {
- return new String[] {
- SlingRepository.class.getName(), Repository.class.getName(),
RepositoryManager.class.getName()
+ @Override
+ protected ServiceRegistration registerService() {
+
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> props =
getComponentContext().getProperties();
+
+ String[] interfaces = new String[] {
+ SlingRepository.class.getName(), Repository.class.getName(),
RepositoryManager.class.getName()
};
+
+ return
getComponentContext().getBundleContext().registerService(interfaces, this,
props);
}
//---------- Helper -------------------------------------------------------
Propchange:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 5 12:18:30 2013
@@ -0,0 +1 @@
+/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java:1499280-1499674
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=1510446&r1=1510445&r2=1510446&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
Mon Aug 5 12:18:30 2013
@@ -28,12 +28,6 @@ repository.description = Configuration t
In addition, if the registration URL is not empty, the repository is
registered \
as defined.
-admin.login.enabled.name = Enable Administrator Login
-admin.login.enabled.description = Whether to enable or disable the \
- SlingRepository.loginAdministrative method. The default is "true". See \
-
http://sling.apache.org/documentation/the-sling-engine/service-authentication.html
\
- for information on deprecating and disabling the loginAdministrative method.
-
admin.name.name = Administator
admin.name.description = The user name of the administrative user. This user \
name is used to implement the SlingRepository.loginAdministrative(String) \
