incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r633143 - in /incubator/sling/trunk/jcr/jackrabbit-client: pom.xml src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
Date Mon, 03 Mar 2008 15:53:01 GMT
Author: fmeschbe
Date: Mon Mar  3 07:53:00 2008
New Revision: 633143

URL: http://svn.apache.org/viewvc?rev=633143&view=rev
Log:
SLING-185 Adapt to moved implementatio stuff in jcr/base (jcr-rmi not needed
any more for the client bundle, as this is part of the accessor in the
jcr/base module)

Modified:
    incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
    incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java

Modified: incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/pom.xml?rev=633143&r1=633142&r2=633143&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/pom.xml Mon Mar  3 07:53:00 2008
@@ -70,13 +70,8 @@
                         </Bundle-Activator>
                         <!-- No Export-Package -->
                         <Private-Package>
-                            org.apache.sling.jcr.jackrabbit.client,
-                            org.apache.jackrabbit.rmi.*
+                            org.apache.sling.jcr.jackrabbit.client
                         </Private-Package>
-                        <Import-Package>
-                            javax.xml.*; org.apache.xml.*;
-                            org.xml.*;resolution:=optional, *
-                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -92,19 +87,19 @@
 
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.base</artifactId>
+            <artifactId>org.apache.sling.jcr.api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.api</artifactId>
+            <artifactId>org.apache.sling.jcr.base</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
 
         <!-- OSGi Libraries -->

Modified: incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java?rev=633143&r1=633142&r2=633143&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
Mon Mar  3 07:53:00 2008
@@ -25,8 +25,8 @@
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
-import org.apache.sling.jcr.api.AbstractSlingRepository;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.base.AbstractSlingRepository;
 import org.apache.sling.jcr.base.util.RepositoryAccessor;
 import org.osgi.service.log.LogService;
 
@@ -75,9 +75,6 @@
     protected Repository getDelegatee() throws RepositoryException {
         if (this.delegatee == null) {
             this.delegatee = this.getRepository();
-            if(this.delegatee != null) {
-                repositoryAvailable();
-            }
         }
 
         return this.delegatee;
@@ -85,18 +82,6 @@
 
     protected LogService getLog() {
         return this.log;
-    }
-
-    //---------- SCR integration ----------------------------------------------
-
-    // set logger
-    protected void bindLogService(LogService log) {
-        this.log = log;
-    }
-
-    // remove logger
-    protected void unbindLogService(LogService log) {
-        this.log = null;
     }
 
     //---------- Repository Publication ---------------------------------------



Mime
View raw message