trivial Sightly refactoring:
* removed redundant code from the SightlyJavaCompilerService which is now handled by the SourceIdentifier
* removed redundant SightlyEngineConfiguration options
* adapted the REPL java source code servlet to the new pattern of generating java classes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1748764 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
index e8a1939..90f0cc2 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
@@ -70,8 +70,10 @@
if (request.getServerPort() != 80) {
configurationLink.append(":").append(request.getServerPort());
}
- configurationLink.append(request.getContextPath()).append("/system/console/configMgr/org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration");
- response.getWriter().write("/**\n * Please enable development mode at\n * " + configurationLink.toString() + "\n */");
+ configurationLink.append(request.getContextPath())
+ .append("/system/console/configMgr/org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration");
+ response.getWriter().write("/**\n * Please enable the \"Keep Generated Java Source Code\" option at\n * " + configurationLink
+ .toString() + "\n */");
} else {
response.getWriter().write(getClassSourceCode());
}
@@ -79,7 +81,7 @@
private String getClassSourceCode() {
if (classesFolder != null && classesFolder.isDirectory()) {
- File classFile = new File(classesFolder, "/apps/repl/components/repl/SightlyJava_template.java");
+ File classFile = new File(classesFolder, "org/apache/sling/scripting/sightly/apps/repl/components/repl/template_html.java");
if (classFile.isFile()) {
try {
return IOUtils.toString(new FileInputStream(classFile), "UTF-8");
@@ -87,9 +89,10 @@
LOGGER.error("Unable to read file " + classFile.getAbsolutePath(), e);
}
}
+ LOGGER.warn("Source code for " + (classesFolder.isDirectory() ? classesFolder.getAbsolutePath() : "") +
+ "/org/apache/sling/scripting/sightly/apps/repl/components/repl/template_html.java was not found. Maybe you need to " +
+ "configure the Sightly Scripting Engine to keep the generated source files?");
}
- LOGGER.warn("Source code for " + (classesFolder.isDirectory() ? classesFolder.getAbsolutePath() : "") +
- "/apps/repl/components/repl/SightlyJava_template.java was not found. Maybe you need to enable dev mode for Sightly?");
return "";
}
