You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/09/08 15:41:20 UTC
svn commit: r995055 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent:
org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/
org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/...
Author: reto
Date: Wed Sep 8 13:41:19 2010
New Revision: 995055
URL: http://svn.apache.org/viewvc?rev=995055&view=rev
Log:
CLEREZZA-271: added support for sharedRenderingValues on renderlets
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java Wed Sep 8 13:41:19 2010
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.ws.rs.core.MediaType;
@@ -60,7 +61,7 @@ public class TitledContentRenderlet impl
};
@Override
- public void render(GraphNode res, GraphNode context,
+ public void render(GraphNode res, GraphNode context, Map<String, Object> sharedRenderingValues,
CallbackRenderer callbackRenderer,
URI renderingSpecification,
String mode,
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala Wed Sep 8 13:41:19 2010
@@ -57,6 +57,7 @@ abstract class PageRenderlet extends Ren
@throws(classOf[IOException])
override def render(res: GraphNode, context: GraphNode,
+ sharedRenderingValues: java.util.Map[String, Object] ,
renderer: CallbackRenderer ,
renderingSpecification: URI,
mode: String,
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java Wed Sep 8 13:41:19 2010
@@ -34,16 +34,13 @@ import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
-import java.util.logging.Level;
import javax.script.Compilable;
import javax.script.CompiledScript;
-import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
@@ -119,7 +116,7 @@ public class ScalaServerPagesRenderlet i
private Map<String, CompiledScript> compiledScripts = new HashMap<String, CompiledScript>();
@Override
- public void render(GraphNode res, GraphNode context,
+ public void render(GraphNode res, GraphNode context, Map<String, Object> sharedRenderingValues,
CallbackRenderer callbackRenderer, URI renderingSpecification,
String mode, MediaType mediaType,
RequestProperties requestProperties, OutputStream os) throws IOException {
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java Wed Sep 8 13:41:19 2010
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URI;
+import java.util.Map;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
@@ -47,7 +48,7 @@ public class SeedsnipeRenderlet implemen
}
@Override
- public void render(GraphNode res, GraphNode context,
+ public void render(GraphNode res, GraphNode context, Map<String, Object> sharedRenderingValues,
CallbackRenderer callbackRenderer,
URI renderingSpecification,
String mode,
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java Wed Sep 8 13:41:19 2010
@@ -60,7 +60,7 @@ public class GenericTest {
"text/turtle");
GraphNode res = new GraphNode(root, tc);
ByteArrayOutputStream baosRendered = new ByteArrayOutputStream();
- renderlet.render(res, null, null,
+ renderlet.render(res, null, null, null,
getClass().getResource(template).toURI(),
null, null, null, baosRendered);
ByteArrayOutputStream baosExpected = new ByteArrayOutputStream();
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java Wed Sep 8 13:41:19 2010
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -86,10 +88,11 @@ class RendererImpl implements Renderer,
public void render(GraphNode resource, GraphNode context, UriInfo uriInfo,
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException {
+ Map<String, Object> sharedRenderingValues = new HashMap<String, Object>();
CallbackRenderer callbackRenderer =
new CallbackRendererImpl(renderletRendererFactoryImpl,
uriInfo, httpHeaders, mediaType);
- renderlet.render(resource, context, callbackRenderer,
+ renderlet.render(resource, context, sharedRenderingValues, callbackRenderer,
renderSpecUri, mode, mediaType,
new Renderlet.RequestProperties(uriInfo, httpHeaders),
entityStream);
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java Wed Sep 8 13:41:19 2010
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
+import java.util.Map;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
@@ -65,6 +66,8 @@ public interface Renderlet {
*
* @param res RDF resource to be rendered with the template.
* @param context RDF resource providing a redering context.
+ * @param sharedRenderingValues a map that can be used for sharing values
+ * across the different renderlets involved in a rendering process
* @param callbackRenderer renderer for call backs.
* @param renderingSpecification the rendering specification
* @param mediaType the media type this media produces (a part of)
@@ -75,6 +78,7 @@ public interface Renderlet {
*/
public void render(GraphNode res,
GraphNode context,
+ Map<String, Object> sharedRenderingValues,
CallbackRenderer callbackRenderer,
URI renderingSpecification,
String mode,
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java?rev=995055&r1=995054&r2=995055&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java Wed Sep 8 13:41:19 2010
@@ -27,6 +27,7 @@ import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -75,7 +76,7 @@ public abstract class RendereringTest {
}
@Override
- public void render(GraphNode res, GraphNode context,
+ public void render(GraphNode res, GraphNode context, Map<String, Object> sharedRenderingValues,
CallbackRenderer callbackRenderer, URI renderingSpecification,
String mode, MediaType mediaType,
Renderlet.RequestProperties requestProperties, OutputStream os) {