You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2009/07/16 08:59:08 UTC
svn commit: r794555 - in
/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp:
JspScriptEngineFactory.java JspServletOptions.java SlingIOProvider.java
Author: cziegeler
Date: Thu Jul 16 06:59:07 2009
New Revision: 794555
URL: http://svn.apache.org/viewvc?rev=794555&view=rev
Log:
SLING-1049 : Clean up code.
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=794555&r1=794554&r2=794555&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Thu Jul 16 06:59:07 2009
@@ -35,7 +35,6 @@
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
-import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
import org.apache.sling.scripting.jsp.jasper.JasperException;
@@ -77,9 +76,6 @@
ComponentContext componentContext;
/** @scr.reference */
- private SlingRepository repository;
-
- /** @scr.reference */
private ServletContext slingServletContext;
private ClassLoader jspClassLoader;
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java?rev=794555&r1=794554&r2=794555&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspServletOptions.java Thu Jul 16 06:59:07 2009
@@ -609,7 +609,6 @@
String dir = getProperty("scratchdir");
this.scratchDir = (dir != null) ? dir : "/var/classes";
- //ioProvider.mkdirs(this.scratchDir);
String compilerTargetVM = getProperty("compilerTargetVM");
if (compilerTargetVM != null) {
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java?rev=794555&r1=794554&r2=794555&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java Thu Jul 16 06:59:07 2009
@@ -50,20 +50,13 @@
/** default log */
private static final Logger log = LoggerFactory.getLogger(SlingIOProvider.class);
- //private final SlingRepository repository;
-
private final ThreadLocal<ResourceResolver> requestResourceResolver;
- // private session for write access
- //private final ThreadLocal<Session> privateSession;
-
// used to find out about the mime type for created files
private final ServletContext servletContext;
SlingIOProvider(ServletContext servletContext) {
- //this.repository = repository;
this.requestResourceResolver = new ThreadLocal<ResourceResolver>();
- //this.privateSession = new ThreadLocal<Session>();
this.servletContext = servletContext;
}