This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.console-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-console.git
commit a42cebaa772e581289186247ff0444f0e3108939 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Aug 22 11:03:00 2012 +0000 Extend from AbstractResource git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/script-console@1375983 13f79535-47bb-0310-9956-ffa450edef68 --- .../console/internal/RuntimeScriptResource.java | 13 +++-------- .../console/internal/ScriptConsolePlugin.java | 25 +++++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/sling/scripting/console/internal/RuntimeScriptResource.java b/src/main/java/org/apache/sling/scripting/console/internal/RuntimeScriptResource.java index aef76df..249587c 100644 --- a/src/main/java/org/apache/sling/scripting/console/internal/RuntimeScriptResource.java +++ b/src/main/java/org/apache/sling/scripting/console/internal/RuntimeScriptResource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.sling.scripting.console.internal; import java.io.ByteArrayInputStream; @@ -23,24 +22,18 @@ import java.io.UnsupportedEncodingException; import java.util.Collections; import java.util.Iterator; -import org.apache.sling.adapter.SlingAdaptable; +import org.apache.sling.api.resource.AbstractResource; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceMetadata; import org.apache.sling.api.resource.ResourceResolver; -/** - * User: chetanm - * Date: 5/1/12 - * Time: 12:20 PM - */ -class RuntimeScriptResource extends SlingAdaptable implements Resource { +class RuntimeScriptResource extends AbstractResource implements Resource { + private ResourceMetadata metadata = new ResourceMetadata(); - private final String extension; private final String path; private final byte[] scriptContent; public RuntimeScriptResource(String extension, String scriptText) { - this.extension = extension; this.scriptContent = getScriptContent(scriptText); this.path = "script." + extension; } diff --git a/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java b/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java index 1fcfe9b..ff2df9b 100644 --- a/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java +++ b/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java @@ -14,13 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.sling.scripting.console.internal; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; import javax.servlet.ServletException; @@ -29,7 +33,12 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.fileupload.FileItem; import org.apache.commons.io.IOUtils; -import org.apache.felix.scr.annotations.*; +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Deactivate; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.Service; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.DefaultVariableResolver; import org.apache.felix.webconsole.SimpleWebConsolePlugin; @@ -43,15 +52,11 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * User: chetanm - * Date: 4/30/12 - * Time: 9:06 PM - */ @Component @Service @Property(name = "felix.webconsole.label", value = ScriptConsolePlugin.NAME) public class ScriptConsolePlugin extends SimpleWebConsolePlugin { + private Logger log = LoggerFactory.getLogger(getClass()); public static final String NAME = "scriptconsole"; private static final String TITLE = "%script.title"; @@ -97,8 +102,6 @@ public class ScriptConsolePlugin extends SimpleWebConsolePlugin { //enclosing OSGi container bindings.put("bundleContext", bundleContext); - - final String lang = WebConsoleUtil.getParameter(req, "lang"); final Resource resource = new RuntimeScriptResource(lang, script); final boolean webClient = "webconsole".equals(WebConsoleUtil.getParameter(req,"client")); @@ -241,6 +244,4 @@ public class ScriptConsolePlugin extends SimpleWebConsolePlugin { public void deactivate() { super.deactivate(); } - - } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
