incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r600526 - in /incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp: JspScriptHandler.java JspServletContext.java RepositoryIOProvider.java SlingIOProvider.java
Date Mon, 03 Dec 2007 13:26:59 GMT
Author: fmeschbe
Date: Mon Dec  3 05:26:59 2007
New Revision: 600526

URL: http://svn.apache.org/viewvc?rev=600526&view=rev
Log:
Rename RepositoryIOProvider to SlingIOProvider - it is Sling, that makes this special.

Added:
    incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
      - copied, changed from r600525, incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/RepositoryIOProvider.java
Removed:
    incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/RepositoryIOProvider.java
Modified:
    incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptHandler.java
    incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletContext.java

Modified: incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptHandler.java?rev=600526&r1=600525&r2=600526&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptHandler.java
(original)
+++ incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptHandler.java
Mon Dec  3 05:26:59 2007
@@ -79,7 +79,7 @@
      */
     private ClassLoader jspClassLoader;
 
-    private RepositoryIOProvider ioProvider;
+    private SlingIOProvider ioProvider;
 
     private SlingTldLocationsCache tldLocationsCache;
 
@@ -169,7 +169,7 @@
         Thread.currentThread().setContextClassLoader(jspClassLoader);
 
         try {
-            ioProvider = new RepositoryIOProvider(repository);
+            ioProvider = new SlingIOProvider(repository);
 
             tldLocationsCache = new SlingTldLocationsCache(slingServletContext,
                 componentContext.getBundleContext());

Modified: incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletContext.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletContext.java?rev=600526&r1=600525&r2=600526&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletContext.java
(original)
+++ incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletContext.java
Mon Dec  3 05:26:59 2007
@@ -38,11 +38,11 @@
     /** default log */
     private static final Logger log = LoggerFactory.getLogger(JspServletContext.class);
 
-    private final RepositoryIOProvider ioProvider;
+    private final SlingIOProvider ioProvider;
     private final ServletContext delegatee;
     private final SlingTldLocationsCache tcs;
 
-    JspServletContext(RepositoryIOProvider ioProvider, ServletContext componentContext,
+    JspServletContext(SlingIOProvider ioProvider, ServletContext componentContext,
             SlingTldLocationsCache tcs) {
         this.ioProvider = ioProvider;
         this.delegatee = componentContext;

Copied: incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
(from r600525, incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/RepositoryIOProvider.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java?p2=incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java&p1=incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/RepositoryIOProvider.java&r1=600525&r2=600526&rev=600526&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/RepositoryIOProvider.java
(original)
+++ incubator/sling/trunk/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
Mon Dec  3 05:26:59 2007
@@ -45,12 +45,12 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The <code>RepositoryIOProvider</code> TODO
+ * The <code>SlingIOProvider</code> TODO
  */
-class RepositoryIOProvider implements IOProvider {
+class SlingIOProvider implements IOProvider {
 
     /** default log */
-    private static final Logger log = LoggerFactory.getLogger(RepositoryIOProvider.class);
+    private static final Logger log = LoggerFactory.getLogger(SlingIOProvider.class);
 
     private final SlingRepository repository;
 
@@ -59,7 +59,7 @@
     // private session for write access
     private ThreadLocal<Session> privateSession;
 
-    RepositoryIOProvider(SlingRepository repository) {
+    SlingIOProvider(SlingRepository repository) {
         this.repository = repository;
         this.requestResourceResolver = new ThreadLocal<ResourceResolver>();
         this.privateSession = new ThreadLocal<Session>();
@@ -304,11 +304,11 @@
 
     private static class RepositoryOutputStream extends ByteArrayOutputStream {
 
-        private final RepositoryIOProvider repositoryOutputProvider;
+        private final SlingIOProvider repositoryOutputProvider;
 
         private final String fileName;
 
-        RepositoryOutputStream(RepositoryIOProvider repositoryOutputProvider,
+        RepositoryOutputStream(SlingIOProvider repositoryOutputProvider,
                 String fileName) {
             this.repositoryOutputProvider = repositoryOutputProvider;
             this.fileName = fileName;



Mime
View raw message