incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1499280 - in /sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server: ./ pom.xml src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Date Wed, 03 Jul 2013 09:04:10 GMT
Author: fmeschbe
Date: Wed Jul  3 09:04:10 2013
New Revision: 1499280

URL: http://svn.apache.org/r1499280
Log:
Implement support for service based ResourceResolver and Session access

- Also need to adapt SlingServerRepository due to changed service registration of the base
class

Added:
    sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/
      - copied from r1464118, sling/trunk/bundles/jcr/jackrabbit-server/
Modified:
    sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
    sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java

Modified: sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml?rev=1499280&r1=1464118&r2=1499280&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
(original)
+++ sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/pom.xml
Wed Jul  3 09:04:10 2013
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.base</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -219,6 +219,14 @@
             <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>

Modified: sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java?rev=1499280&r1=1464118&r2=1499280&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
(original)
+++ sling/whiteboard/fmeschbe/deprecate_login_administrative/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Wed Jul  3 09:04:10 2013
@@ -295,17 +295,23 @@ public class SlingServerRepository exten
      *
      * @see org.apache.sling.jcr.base.AbstractSlingRepository#registerService()
      */
-    @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()
+//    @Override
+//    protected ServiceRegistration registerService() {
+//
+//        @SuppressWarnings("unchecked")
+//        Dictionary<String, Object> props = getComponentContext().getProperties();
+//
+//        String[] interfaces = new String[] {
+//
+//        };
+//
+//        return getComponentContext().getBundleContext().registerService(interfaces, this,
props);
+//    }
+
+    protected String[] getServiceRegistrationInterfaces() {
+        return new String[] {
+                SlingRepository.class.getName(), Repository.class.getName(), RepositoryManager.class.getName()
         };
-
-        return getComponentContext().getBundleContext().registerService(interfaces, this,
props);
     }
 
     //---------- Helper -------------------------------------------------------



Mime
View raw message