You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2015/05/12 17:49:47 UTC

svn commit: r1678986 - in /sling/trunk: bundles/scripting/sightly/testing/src/main/provisioning/model.txt launchpad/builder/src/main/provisioning/sling.txt pom.xml

Author: radu
Date: Tue May 12 15:49:47 2015
New Revision: 1678986

URL: http://svn.apache.org/r1678986
Log:
SLING-4707 - Replace the JCR Classloader with the File System Classloader

* replaced org.apache.sling.jcr.classloader with org.apache.sling.commons.fsclassloader

Modified:
    sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
    sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
    sling/trunk/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1678986&r1=1678985&r2=1678986&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Tue May 12 15:49:47 2015
@@ -20,7 +20,6 @@
 # Dependencies
 [artifacts]
   org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
-  org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.0
   org.apache.sling/org.apache.sling.i18n/2.2.10
   javax.mail/mail/1.4.7
   org.apache.sling/org.apache.sling.xss/1.0.2

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1678986&r1=1678985&r2=1678986&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue May 12 15:49:47 2015
@@ -34,6 +34,7 @@
     org.apache.sling/org.apache.sling.commons.compiler/2.2.0
     org.apache.sling/org.apache.sling.commons.scheduler/2.4.6
     org.apache.sling/org.apache.sling.commons.threads/3.2.0
+    org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.1-SNAPSHOT
     org.apache.sling/org.apache.sling.discovery.api/1.0.2
     org.apache.sling/org.apache.sling.discovery.support/1.0.0
     org.apache.sling/org.apache.sling.discovery.impl/1.1.0
@@ -51,7 +52,6 @@
     org.apache.sling/org.apache.sling.servlets.post/2.3.7-SNAPSHOT
     org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT
     org.apache.sling/org.apache.sling.jcr.resource/2.5.0
-    org.apache.sling/org.apache.sling.jcr.classloader/3.2.2
     org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
     org.apache.sling/org.apache.sling.fsresource/1.1.4
     org.apache.sling/org.apache.sling.launchpad.content/2.0.8

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1678986&r1=1678985&r2=1678986&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Tue May 12 15:49:47 2015
@@ -114,6 +114,7 @@
 
         <!-- The commons sub project -->
         <module>bundles/commons/classloader</module>
+        <module>bundles/commons/fsclassloader</module>
         <module>bundles/commons/compiler</module>
         <module>bundles/commons/json</module>
         <module>bundles/commons/log</module>
@@ -135,7 +136,6 @@
         <!-- The JCR sub project -->
         <module>bundles/jcr/api</module>
         <module>bundles/jcr/base</module>
-        <module>bundles/jcr/classloader</module>
         <module>bundles/jcr/contentloader</module>
         <!--
         <module>bundles/jcr/jackrabbit-base</module>