clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [53/87] [abbrv] clerezza git commit: CLEREZZA-979: ported typerendering.scala
Date Tue, 14 Apr 2015 13:13:28 GMT
CLEREZZA-979: ported typerendering.scala

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f69f4e18
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f69f4e18
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f69f4e18

Branch: refs/heads/master
Commit: f69f4e1840ca491026ca9fa23f09c61fb516a44f
Parents: 0e20979
Author: Reto Gmuer <reto@apache.org>
Authored: Mon Mar 23 19:33:06 2015 +0000
Committer: Reto Gmuer <reto@apache.org>
Committed: Mon Mar 23 19:33:06 2015 +0000

----------------------------------------------------------------------
 platform/typerendering.scala/pom.xml                           | 6 +++++-
 .../platform/typerendering/scala/AbstractRenderlet.scala       | 2 +-
 .../clerezza/platform/typerendering/scala/PageRenderlet.scala  | 4 ++--
 .../clerezza/platform/typerendering/scala/RenderedPage.scala   | 5 +++--
 .../clerezza/platform/typerendering/scala/SRenderlet.scala     | 2 +-
 .../clerezza/platform/typerendering/scala/XmlResult.scala      | 5 +++--
 6 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/pom.xml b/platform/typerendering.scala/pom.xml
index e559ed7..4eb63b5 100644
--- a/platform/typerendering.scala/pom.xml
+++ b/platform/typerendering.scala/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>platform</artifactId>
-            <version>0.2</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
@@ -53,6 +53,10 @@
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-xml_2.11</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
index 84a4221..6214a86 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
 import javax.ws.rs.core.MediaType
 import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
 import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
 import org.apache.clerezza.rdf.utils.GraphNode
 import org.osgi.service.component.ComponentContext
 import org.apache.clerezza.rdf.ontologies._

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
index df8335f..ba4c556 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
 import javax.ws.rs.core.MediaType
 import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
 import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
 import org.apache.clerezza.rdf.utils.GraphNode
 import org.osgi.service.component.ComponentContext
 import org.apache.clerezza.rdf.ontologies._
@@ -40,7 +40,7 @@ import org.apache.clerezza.rdf.scala.utils.Preamble._
 abstract class PageRenderlet extends AbstractRenderlet {
 
   def renderedPage(renderingArguments: RenderedPage.Arguments): RenderedPage
-  def rdfType: UriRef
+  def rdfType: Iri
   def mode = "naked"
 
   var renderletManager: RenderletManager = null;

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
index 76d835e..dc75f76 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
@@ -32,6 +32,7 @@ import org.apache.clerezza.rdf.core._
 import org.apache.clerezza.rdf.utils._
 import org.apache.clerezza.rdf.scala.utils.Preamble._
 import java.security.{PrivilegedAction, AccessController}
+import org.apache.commons.rdf.Iri
 import org.osgi.framework.{BundleContext, ServiceReference}
 import org.apache.clerezza.rdf.scala.utils.RichGraphNode
 
@@ -82,7 +83,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
    * renders the specified resource without using the base-graph from resource
    * rendered by the caller but getting a new context using the GraphNodeProvider
    */
-  def render(resource: UriRef): Seq[Node] = {
+  def render(resource: Iri): Seq[Node] = {
     modeOption match {
       case Some(m) => render(resource, m)
       case None => render(resource, "naked")
@@ -93,7 +94,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
    * renders the specified resource without using the base-graph from resource
    * rendered by the caller but getting a new context using the GraphNodeProvider
    */
-  def render(resource: UriRef, mode: String) = {
+  def render(resource: Iri, mode: String) = {
     def parseNodeSeq(string: String) = {
       _root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
     }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
index ad082bb..5ea0819 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
 import javax.ws.rs.core.MediaType
 import org.apache.clerezza.platform.typerendering.TypeRenderlet.RequestProperties
 import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
 import org.apache.clerezza.rdf.utils.GraphNode
 import org.osgi.service.component.ComponentContext
 import org.apache.clerezza.rdf.ontologies._

http://git-wip-us.apache.org/repos/asf/clerezza/blob/f69f4e18/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
index e920bf0..de29e51 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
@@ -34,6 +34,7 @@ import org.apache.clerezza.rdf.utils._
 import org.apache.clerezza.rdf.scala.utils.Preamble._
 import java.nio.charset.Charset
 import java.security.{PrivilegedAction, AccessController}
+import org.apache.commons.rdf.Iri
 import org.osgi.framework.{BundleContext, ServiceReference}
 import org.apache.clerezza.rdf.scala.utils.RichGraphNode
 
@@ -84,7 +85,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
    * renders the specified resource without using the base-graph from resource
    * rendered by the caller but getting a new context using the GraphNodeProvider
    */
-  def render(resource: UriRef): Seq[Node] = {
+  def render(resource: Iri): Seq[Node] = {
     modeOption match {
       case Some(m) => render(resource, m)
       case None => render(resource, "naked")
@@ -95,7 +96,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
    * renders the specified resource without using the base-graph from resource
    * rendered by the caller but getting a new context using the GraphNodeProvider
    */
-  def render(resource: UriRef, mode: String) = {
+  def render(resource: Iri, mode: String) = {
     def parseNodeSeq(string: String) = {
       _root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
     }


Mime
View raw message