Author: cziegeler
Date: Wed Dec 19 09:34:12 2007
New Revision: 605630
URL: http://svn.apache.org/viewvc?rev=605630&view=rev
Log:
Fix javadocs, use generics and remove unused imports.
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxConfigManagerAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/BundleListRender.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ComponentRenderAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ConfigManagerBase.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
incubator/sling/trunk/osgi/obr/src/main/java/org/apache/sling/osgi/obr/Resource.java
incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNode.java
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngineFactory.java
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngineFactory.java
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxBundleDetailsAction.java
Wed Dec 19 09:34:12 2007
@@ -72,7 +72,8 @@
long bundleId = getBundleId(request);
Bundle bundle = getBundleContext().getBundle(bundleId);
if (bundle != null) {
- Dictionary headers = bundle.getHeaders();
+ @SuppressWarnings("unchecked")
+ Dictionary<String, String> headers = bundle.getHeaders();
JSONArray props = new JSONArray();
keyVal(props, "Symbolic Name", bundle.getSymbolicName());
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxConfigManagerAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxConfigManagerAction.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxConfigManagerAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/AjaxConfigManagerAction.java
Wed Dec 19 09:34:12 2007
@@ -279,15 +279,16 @@
} else {
Bundle bundle = this.getBundle(config.getBundleLocation());
- Dictionary headers = bundle.getHeaders(locale);
- String name = (String) headers.get(Constants.BUNDLE_NAME);
+ @SuppressWarnings("unchecked")
+ Dictionary<String, String> headers = bundle.getHeaders(locale);
+ String name = headers.get(Constants.BUNDLE_NAME);
if (name == null) {
location = bundle.getSymbolicName();
} else {
location = name + " (" + bundle.getSymbolicName() + ")";
}
- Version v = Version.parseVersion((String)
headers.get(Constants.BUNDLE_VERSION));
+ Version v =
Version.parseVersion(headers.get(Constants.BUNDLE_VERSION));
location += ", Version " + v.toString();
}
json.put("bundleLocation", location);
@@ -315,9 +316,10 @@
// add sling context into the configuration
if (request.getParameter("sling.context") != null) {
- Dictionary props = config.getProperties();
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> props = config.getProperties();
if (props == null) {
- props = new Hashtable();
+ props = new Hashtable<String, Object>();
}
props.put("sling.context",
request.getParameter("sling.context"));
config.update(props);
@@ -342,18 +344,19 @@
}
} else {
Configuration config = ca.getConfiguration(pid, null);
- Dictionary props = config.getProperties();
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> props = config.getProperties();
if (props == null) {
- props = new Hashtable();
+ props = new Hashtable<String, Object>();
}
- Map adMap = this.getAttributeDefinitionMap(config, null);
+ Map<String, AttributeDefinition> adMap =
this.getAttributeDefinitionMap(config, null);
if (adMap != null) {
StringTokenizer propTokens = new StringTokenizer(propertyList,
",");
while (propTokens.hasMoreTokens()) {
String propName = propTokens.nextToken();
- AttributeDefinition ad = (AttributeDefinition)
adMap.get(propName);
+ AttributeDefinition ad = adMap.get(propName);
if (ad == null
|| (ad.getCardinality() == 0 && ad.getType() ==
AttributeDefinition.STRING)) {
String prop = request.getParameter(propName);
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/BundleListRender.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/BundleListRender.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/BundleListRender.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/BundleListRender.java
Wed Dec 19 09:34:12 2007
@@ -272,8 +272,8 @@
Version bundleVersion = Version.parseVersion((String)
bundle.getHeaders().get(Constants.BUNDLE_VERSION));
- for (Iterator ri=this.repoAdmin.getResources(); ri.hasNext(); ) {
- Resource res = (Resource) ri.next();
+ for (Iterator<Resource> ri=this.repoAdmin.getResources();
ri.hasNext(); ) {
+ Resource res = ri.next();
if (bundle.getSymbolicName().equals(res.getSymbolicName())) {
if (res.getVersion().compareTo(bundleVersion) > 0) {
return true;
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ComponentRenderAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ComponentRenderAction.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ComponentRenderAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ComponentRenderAction.java
Wed Dec 19 09:34:12 2007
@@ -322,12 +322,13 @@
}
private void listProperties(JSONArray jsonProps, Component component) {
- Dictionary props = component.getProperties();
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> props = component.getProperties();
if (props != null) {
StringBuffer buf = new StringBuffer();
- TreeSet keys = new TreeSet(Collections.list(props.keys()));
- for (Iterator ki = keys.iterator(); ki.hasNext();) {
- Object key = ki.next();
+ TreeSet<String> keys = new
TreeSet<String>(Collections.list(props.keys()));
+ for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
+ String key = ki.next();
buf.append(key).append(" = ");
Object prop = props.get(key);
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ConfigManagerBase.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ConfigManagerBase.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ConfigManagerBase.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/ConfigManagerBase.java
Wed Dec 19 09:34:12 2007
@@ -146,12 +146,12 @@
return null;
}
- protected Map getAttributeDefinitionMap(Configuration config, String
locale) {
+ protected Map<String, AttributeDefinition>
getAttributeDefinitionMap(Configuration config, String locale) {
ObjectClassDefinition ocd = this.getObjectClassDefinition(config,
locale);
if (ocd != null) {
AttributeDefinition[] ad =
ocd.getAttributeDefinitions(ObjectClassDefinition.ALL);
if (ad != null) {
- Map adMap = new HashMap();
+ Map<String, AttributeDefinition> adMap = new HashMap<String,
AttributeDefinition>();
for (int i = 0; i < ad.length; i++) {
adMap.put(ad[i].getID(), ad[i]);
}
@@ -177,7 +177,7 @@
return null;
}
-
+
protected Locale getLocale(HttpServletRequest request) {
try {
return request.getLocale();
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
(original)
+++
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/InstallAction.java
Wed Dec 19 09:34:12 2007
@@ -74,7 +74,8 @@
HttpServletResponse response) throws ServletException {
// get the uploaded data
- Map params = (Map) request.getAttribute(Util.ATTR_FILEUPLOAD);
+ @SuppressWarnings("unchecked")
+ Map<String, FileItem[]> params = (Map<String, FileItem[]>)
request.getAttribute(Util.ATTR_FILEUPLOAD);
if (params == null) {
return true;
}
@@ -123,8 +124,8 @@
return true;
}
- private FileItem getFileItem(Map params, String name, boolean isFormField)
{
- FileItem[] items = (FileItem[]) params.get(name);
+ private FileItem getFileItem(Map<String, FileItem[]> params, String name,
boolean isFormField) {
+ FileItem[] items = params.get(name);
if (items != null) {
for (int i = 0; i < items.length; i++) {
if (items[i].isFormField() == isFormField) {
Modified:
incubator/sling/trunk/osgi/obr/src/main/java/org/apache/sling/osgi/obr/Resource.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/src/main/java/org/apache/sling/osgi/obr/Resource.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/osgi/obr/src/main/java/org/apache/sling/osgi/obr/Resource.java
(original)
+++
incubator/sling/trunk/osgi/obr/src/main/java/org/apache/sling/osgi/obr/Resource.java
Wed Dec 19 09:34:12 2007
@@ -48,7 +48,7 @@
* @author fmeschbe
* @version $Rev$, $Date: 2007-07-02 16:13:58 +0200 (Mon, 02 Jul 2007) $
*/
-public class Resource implements Serializable, Comparable {
+public class Resource implements Serializable, Comparable<Resource> {
/**
* The name of the bundle manifest header providing the specification(s) of
@@ -75,8 +75,8 @@
private String source;
private SortedSet<String> categories;
- private SortedMap capabilities;
- private SortedMap requirements;
+ private SortedMap<String, List<Object>> capabilities;
+ private SortedMap<String, List<Object>> requirements;
private BundleSpec[] bundleSpecs;
@@ -103,8 +103,8 @@
private Resource(URL resourceURL, Attributes attrs, long size)
throws IOException {
- this.capabilities = new TreeMap();
- this.requirements = new TreeMap();
+ this.capabilities = new TreeMap<String, List<Object>>();
+ this.requirements = new TreeMap<String, List<Object>>();
this.resourceURL = resourceURL;
this.name = this.getName(resourceURL.getPath());
@@ -162,7 +162,7 @@
this.addToMapList(this.capabilities, capability.getName(), capability);
}
- public Iterator getCapabilities() {
+ public Iterator<Object> getCapabilities() {
return this.getMapListIterator(this.capabilities);
}
@@ -170,11 +170,11 @@
this.addToMapList(this.requirements, requirement.getName(),
requirement);
}
- public Iterator getRequirements() {
+ public Iterator<Object> getRequirements() {
return this.getMapListIterator(this.requirements);
}
- public SortedSet getCategories() {
+ public SortedSet<String> getCategories() {
return this.categories;
}
@@ -341,8 +341,7 @@
this.printElement(out, childIndent, "license", this.license);
this.printElement(out, childIndent, "source", this.source);
- for (Iterator ci=this.getCategories().iterator(); ci.hasNext(); ) {
- String cat = (String) ci.next();
+ for (String cat : this.getCategories() ) {
out.print("<category");
this.printAttribute(out, "id", cat);
out.println("/>");
@@ -358,14 +357,13 @@
//---------- Comparable interface -----------------------------------------
/**
- * @throws ClassCastException if <code>obj</code> is not
<code>Resource</code>
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
*/
- public int compareTo(Object obj) {
- if (this.equals(obj)) {
+ public int compareTo(Resource other) {
+ if (this.equals(other)) {
return 0;
}
- Resource other = (Resource) obj;
if (this.getSymbolicName().equals(other.getSymbolicName())) {
// compare version
Version thisVersion = new Version(this.getVersion());
@@ -475,10 +473,10 @@
}
}
- private void addToMapList(Map map, String name, Object value) {
- List current = (List) map.get(name);
+ private void addToMapList(Map<String, List<Object>> map, String name,
Object value) {
+ List<Object> current = map.get(name);
if (current == null) {
- current = new ArrayList();
+ current = new ArrayList<Object>();
map.put(name, current);
}
current.add(value);
@@ -490,7 +488,7 @@
this.bundleSpecs = new BundleSpec[0];
} else {
spec = spec.trim();
- List specs = new ArrayList();
+ List<BundleSpec> specs = new ArrayList<BundleSpec>();
boolean quoted = false;
int start = 0;
for (int i = 0; i < spec.length(); i++) {
@@ -516,14 +514,14 @@
if (start < spec.length()) {
specs.add(new BundleSpec(spec.substring(start)));
}
- this.bundleSpecs = (BundleSpec[]) specs.toArray(new
BundleSpec[specs.size()]);
+ this.bundleSpecs = specs.toArray(new BundleSpec[specs.size()]);
}
}
- private Iterator getMapListIterator(final Map map) {
- return new Iterator() {
- private Iterator mapIter;
- private Iterator listIter;
+ private Iterator<Object> getMapListIterator(final Map<String,
List<Object>> map) {
+ return new Iterator<Object>() {
+ private Iterator<List<Object>> mapIter;
+ private Iterator<Object> listIter;
private Object next;
{
@@ -548,7 +546,7 @@
private Object seek() {
while (this.listIter == null || !this.listIter.hasNext()) {
if (this.mapIter.hasNext()) {
- List nextlist = (List) this.mapIter.next();
+ List<Object> nextlist = this.mapIter.next();
this.listIter = nextlist.iterator();
} else {
return null;
Modified:
incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
(original)
+++
incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
Wed Dec 19 09:34:12 2007
@@ -16,20 +16,13 @@
*/
package org.apache.sling.scripting.freemarker;
-import java.io.IOException;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.Writer;
-import javax.script.AbstractScriptEngine;
import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
@@ -60,7 +53,7 @@
if (helper == null) {
throw new ScriptException("SlingScriptHelper missing from
bindings");
}
-
+
// ensure GET request
if (!"GET".equals(helper.getRequest().getMethod())) {
throw new ScriptException(
@@ -68,7 +61,7 @@
}
String scriptName = helper.getScript().getScriptResource().getURI();
-
+
try {
Template tmpl = new Template(scriptName, reader, configuration);
tmpl.process(bindings, scriptContext.getWriter());
Modified:
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
(original)
+++
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
Wed Dec 19 09:34:12 2007
@@ -21,7 +21,6 @@
import javax.script.ScriptEngine;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
-import org.apache.sling.scripting.javascript.helper.SlingWrapFactory;
import org.apache.sling.scripting.javascript.wrapper.ScriptableNode;
import org.apache.sling.scripting.javascript.wrapper.ScriptableResource;
import org.mozilla.javascript.Context;
@@ -38,7 +37,7 @@
public final static String ESP_SCRIPT_EXTENSION = "esp";
private final String languageVersion;
-
+
private Scriptable rootScope;
public RhinoJavaScriptEngineFactory() {
@@ -71,7 +70,7 @@
if (rootScope == null) {
final Context rhinoContext = Context.enter();
rootScope = rhinoContext.initStandardObjects();
-
+
try {
ScriptableObject.defineClass(rootScope,
ScriptableResource.class);
ScriptableObject.defineClass(rootScope, ScriptableNode.class);
@@ -79,7 +78,7 @@
// TODO: log
}
}
-
+
return rootScope;
}
}
Modified:
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNode.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNode.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNode.java
(original)
+++
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNode.java
Wed Dec 19 09:34:12 2007
@@ -18,9 +18,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@@ -31,7 +29,6 @@
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
-import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeArray;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;
@@ -42,9 +39,9 @@
* as properties of a Javascript object.
*/
public class ScriptableNode extends ScriptableObject {
-
+
public static final String CLASSNAME = "Node";
-
+
private Node node;
public ScriptableNode() {
@@ -62,7 +59,7 @@
public String getClassName() {
return CLASSNAME;
}
-
+
/**
* Gets the value of a (Javascript) property. If there is a single
single-value
* JCR property of this node, return its string value. If there are
multiple properties
@@ -71,7 +68,7 @@
@Override
public Object get(String name, Scriptable start) {
List<Scriptable> items = new ArrayList<Scriptable>();
-
+
// add all matching nodes
try {
NodeIterator it = node.getNodes(name);
@@ -112,7 +109,7 @@
return result;
}
}
-
+
private Scriptable wrap(Value value, int type) throws
ValueFormatException, IllegalStateException, RepositoryException {
Object valObj;
if (type==PropertyType.BINARY) {
@@ -124,7 +121,7 @@
} else {
valObj = value.getString();
}
-
+
return ScriptRuntime.toObject(this, valObj);
}
Modified:
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
(original)
+++
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
Wed Dec 19 09:34:12 2007
@@ -18,15 +18,10 @@
import java.io.BufferedReader;
import java.io.Reader;
-import java.io.StringReader;
-import javax.script.AbstractScriptEngine;
import javax.script.Bindings;
import javax.script.ScriptContext;
-import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import javax.servlet.http.HttpServletRequest;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
Modified:
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngineFactory.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngineFactory.java
(original)
+++
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngineFactory.java
Wed Dec 19 09:34:12 2007
@@ -18,15 +18,10 @@
*/
package org.apache.sling.scripting.ruby;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
import org.jruby.runtime.Constants;
-import org.w3c.dom.views.AbstractView;
public class ErbScriptEngineFactory extends AbstractScriptEngineFactory {
Modified:
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
(original)
+++
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
Wed Dec 19 09:34:12 2007
@@ -17,20 +17,14 @@
package org.apache.sling.scripting.velocity;
import java.io.Reader;
-import java.io.StringReader;
import java.io.Writer;
import java.util.Map;
-import javax.jcr.Node;
-import javax.script.AbstractScriptEngine;
import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
@@ -63,7 +57,7 @@
if (helper == null) {
throw new ScriptException("SlingScriptHelper missing from
bindings");
}
-
+
// ensure GET request
if (!"GET".equals(helper.getRequest().getMethod())) {
throw new ScriptException(
@@ -89,7 +83,7 @@
throw new ScriptException("Failure running script " + scriptName
+ ": " + t);
}
-
+
return null;
}
Modified:
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngineFactory.java?rev=605630&r1=605629&r2=605630&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngineFactory.java
(original)
+++
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngineFactory.java
Wed Dec 19 09:34:12 2007
@@ -18,11 +18,7 @@
*/
package org.apache.sling.scripting.velocity;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
