Author: reto
Date: Tue Nov 23 10:01:53 2010
New Revision: 1038032
URL: http://svn.apache.org/viewvc?rev=1038032&view=rev
Log:
CLEREZZA-362: added support for uriInfo
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.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/AbstractRenderlet.scala?rev=1038032&r1=1038031&r2=1038032&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
Tue Nov 23 10:01:53 2010
@@ -64,7 +64,8 @@ abstract class AbstractRenderlet extends
val modeOption = if (mode != null) {Some(mode)} else
{None}
renderedPage(
RenderedPage.Arguments(res, context,
sharedRenderingValues, renderer,
-
renderingSpecificationOption, modeOption, mediaType, os));
+
renderingSpecificationOption, modeOption,
+ mediaType,
requestProperties, os));
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.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/RenderedPage.scala?rev=1038032&r1=1038031&r2=1038032&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Tue Nov 23 10:01:53 2010
@@ -6,6 +6,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import scala.xml._
import org.apache.clerezza.platform.typerendering._
+import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
@@ -27,12 +28,15 @@ abstract class RenderedPage(arguments: R
renderingSpecificationOption:
Option[URI],
modeOption: Option[String],
mediaType: MediaType,
+ requestProperties: RequestProperties,
os: OutputStream) = arguments;
val mode = modeOption match {
case Some(x) => x
case None => null
}
+ val uriInfo = requestProperties.getUriInfo
+
def render(resource : GraphNode) : Seq[Node] = {
modeOption match {
case Some(m) => render(resource, m)
@@ -81,5 +85,6 @@ object RenderedPage {
renderingSpecificationOption:
Option[URI],
modeOption: Option[String],
mediaType: MediaType,
+ requestProperties: RequestProperties,
os: OutputStream);
}
\ No newline at end of file
