Here are my current diffs to get a working version of sling, as of this morning.


Index: 
bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
===================================================================
--- 
bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
  (revision 1603357)
+++ 
bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
  (working copy)
@@ -23,6 +23,7 @@

 import org.apache.jackrabbit.api.management.DataStoreGarbageCollector;
 import org.apache.jackrabbit.api.management.RepositoryManager;
+import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.base.AbstractSlingRepository2;
 import org.apache.sling.jcr.base.AbstractSlingRepositoryManager;
@@ -48,7 +49,9 @@
         final Repository base = this.getRepository();
         if (base instanceof RepositoryManager) {
             return ((RepositoryManager) 
base).createDataStoreGarbageCollector();
-        }
+        } else if (base instanceof RepositoryImpl) {
+                       return ((RepositoryImpl) 
base).createDataStoreGarbageCollector();
+               }

         return null;
     }
Index: launchpad/builder/src/main/bundles/list.xml
===================================================================
--- launchpad/builder/src/main/bundles/list.xml (revision 1603357)
+++ launchpad/builder/src/main/bundles/list.xml (working copy)
@@ -389,7 +389,7 @@
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.felix</groupId>





Robert A. Decker
[email protected]
http://robdecker.com/about


On 17 Jun 2014, at 23:35, Robert A. Decker <[email protected]> wrote:

> Yes, it works, thanks.
> 
> I'm getting a new error that is probably unrelated:
> org.apache.sling.commons.json.sling,version=[2.0,3) -- Cannot be resolved
> For bundle "Apache Sling Default GET Servletsorg.apache.sling.servlets.get” 
> on a brand new build with nothing custom installed.
> 
> In the pom for:
> <artifactId>org.apache.sling.servlets.get</artifactId>
> 
> There’s the dependency:
>        <dependency>
>            <groupId>org.apache.sling</groupId>
>            <artifactId>org.apache.sling.commons.json</artifactId>
>            <version>2.0.7-SNAPSHOT</version>
>            <scope>provided</scope>
>        </dependency>
> 
> But 2.0.6 seems to be the version of org.apache.sling.commons.json that’s 
> installed.
> 
> 
> 
> Robert A. Decker
> [email protected]
> http://robdecker.com/about
> 
> 
> On 16 Jun 2014, at 15:03, Bertrand Delacretaz <[email protected]> wrote:
> 
>> Hi Rob,
>> 
>> On Mon, Jun 16, 2014 at 12:49 PM, Robert A. Decker <[email protected]> 
>> wrote:
>>> I see that this is fixed in the sling explorer’s source code (node.esp 
>>> file). And so
>>> I uninstall version 1.0.2 and install 1.0.3-SNAPSHOT...
>> 
>> http://svn.apache.org/r1602859 should fix this, could you confirm?
>> 
>> Ciao,
>> -Bertrand
>> 
> 
> 

Reply via email to