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 2015/03/23 17:43:03 UTC
[3/5] clerezza git commit: CLEREZZA-979: unfinished port of
typerendering gui
CLEREZZA-979: unfinished port of typerendering gui
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/cff1c952
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/cff1c952
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/cff1c952
Branch: refs/heads/rdf-commons
Commit: cff1c952416db1b7cb06c5cee666e8e25fab9812
Parents: 68a0597
Author: Reto Gmuer <re...@apache.org>
Authored: Mon Mar 23 16:42:25 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Mon Mar 23 16:42:25 2015 +0000
----------------------------------------------------------------------
platform/platform.typerendering.gui/pom.xml | 19 ++++++++++++-------
.../src/main/scala/Activator.scala | 12 ++++++------
.../src/main/scala/Ontology.scala | 4 ++--
.../scala/RenderletDescriptionRenderlet.scala | 3 +--
4 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/cff1c952/platform/platform.typerendering.gui/pom.xml
----------------------------------------------------------------------
diff --git a/platform/platform.typerendering.gui/pom.xml b/platform/platform.typerendering.gui/pom.xml
index b3e0367..7ab17c3 100644
--- a/platform/platform.typerendering.gui/pom.xml
+++ b/platform/platform.typerendering.gui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
+ <version>7-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>platform.typerendering.gui</artifactId>
@@ -43,32 +43,32 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.core</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scala</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.globalmenu.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.12</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -80,6 +80,11 @@
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/cff1c952/platform/platform.typerendering.gui/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/platform/platform.typerendering.gui/src/main/scala/Activator.scala b/platform/platform.typerendering.gui/src/main/scala/Activator.scala
index 23b7402..ef4dc2f 100644
--- a/platform/platform.typerendering.gui/src/main/scala/Activator.scala
+++ b/platform/platform.typerendering.gui/src/main/scala/Activator.scala
@@ -21,8 +21,8 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.clerezza.rdf.core.BNode
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph
+import org.apache.commons.rdf.BlankNode
+import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
import scala.collection.JavaConversions._
import org.apache.clerezza.platform.globalmenu.GlobalMenuItem
@@ -51,17 +51,17 @@ class Activator extends BundleActivator {
@Path(path)
object RenderletsOverview {
@GET def get() = {
- val resultMGraph = new SimpleMGraph();
- val preamble = new Preamble(resultMGraph)
+ val resultGraph = new SimpleGraph();
+ val preamble = new Preamble(resultGraph)
import preamble._
- val resultNode = new GraphNode(new BNode(), resultMGraph);
+ val resultNode = new GraphNode(new BlankNode(), resultGraph);
resultNode.addProperty(RDF.`type` , Ontology.RenderletOverviewPage);
resultNode.addProperty(RDF.`type` , PLATFORM.HeadedPage);
resultNode.addProperty(RDF.`type` , RDF.List);
val renderletList = resultNode.asList;
for (sr <- bundleContext.getServiceReferences(classOf[TypeRenderlet].getName, null)) {
val renderlet = bundleContext.getService(sr).asInstanceOf[TypeRenderlet]
- val rendRes = new BNode()
+ val rendRes = new BlankNode()
rendRes.addProperty(RDF.`type`, Ontology.Renderlet);
rendRes.addPropertyValue(Ontology.mediaType,
renderlet.getMediaType.toString)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/cff1c952/platform/platform.typerendering.gui/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/platform/platform.typerendering.gui/src/main/scala/Ontology.scala b/platform/platform.typerendering.gui/src/main/scala/Ontology.scala
index 209d4c4..bdbb4ac 100644
--- a/platform/platform.typerendering.gui/src/main/scala/Ontology.scala
+++ b/platform/platform.typerendering.gui/src/main/scala/Ontology.scala
@@ -21,11 +21,11 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
object Ontology {
- private def p(s: String) = new UriRef("http://clerezza.org/2011/25/renderletgui#"+s)
+ private def p(s: String) = new Iri("http://clerezza.org/2011/25/renderletgui#"+s)
val RenderletOverviewPage = p("RenderletOverviewPage")
val Renderlet = p("Renderlet")
http://git-wip-us.apache.org/repos/asf/clerezza/blob/cff1c952/platform/platform.typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/platform.typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala b/platform/platform.typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
index afd20dc..931ed45 100644
--- a/platform/platform.typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
+++ b/platform/platform.typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.typerendering.gui
import javax.ws.rs.core.MediaType
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.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
@@ -31,7 +31,6 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import org.apache.clerezza.platform.typerendering.scala._
import org.apache.clerezza.rdf.ontologies.DC
-
/**
* A Renderlet for the descriptions of RenderletDescription
*/