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 2013/03/20 14:22:28 UTC

svn commit: r1458819 - in /clerezza/trunk/site: pom.xml readme.txt src/main/scala/Activator.scala

Author: reto
Date: Wed Mar 20 13:22:27 2013
New Revision: 1458819

URL: http://svn.apache.org/r1458819
Log:
CLEREZZA-753: work in progress (see note in Readme)

Modified:
    clerezza/trunk/site/pom.xml
    clerezza/trunk/site/readme.txt
    clerezza/trunk/site/src/main/scala/Activator.scala

Modified: clerezza/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/site/pom.xml?rev=1458819&r1=1458818&r2=1458819&view=diff
==============================================================================
--- clerezza/trunk/site/pom.xml (original)
+++ clerezza/trunk/site/pom.xml Wed Mar 20 13:22:27 2013
@@ -3,10 +3,11 @@
 	<parent>
 		<groupId>org.apache.clerezza</groupId>
 		<artifactId>clerezza</artifactId>
-		<version>0.2-incubating</version>
+		<version>0.3-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
 	</parent>
 	<artifactId>website</artifactId>
-	<version>0.1-incubating-SNAPSHOT</version>
+	<version>0.2-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>Clerezza - Website</name>
 	<dependencies>
@@ -21,26 +22,32 @@
         <dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>platform.typerendering.core</artifactId>
+            <version>0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>platform.typerendering.scala</artifactId>
+            <version>0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>rdf.ontologies</artifactId>
+            <version>0.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>rdf.utils</artifactId>
+            <version>0.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>rdf.scala.utils</artifactId>
+            <version>0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>osgi.services</artifactId>
+            <version>0.2-SNAPSHOT</version>
 		</dependency>
         <dependency>
 			<groupId>org.scala-lang</groupId>

Modified: clerezza/trunk/site/readme.txt
URL: http://svn.apache.org/viewvc/clerezza/trunk/site/readme.txt?rev=1458819&r1=1458818&r2=1458819&view=diff
==============================================================================
--- clerezza/trunk/site/readme.txt (original)
+++ clerezza/trunk/site/readme.txt Wed Mar 20 13:22:27 2013
@@ -1,8 +1,18 @@
+*****************************
+WARNING
+
+This is an unfinished version designed to work with the trunk version of clerezza for the current version of the site use
+
+https://svn.apache.org/repos/asf/clerezza/site/trunk/
+
+******************************
+
+
 Editing and deploying the clerezza website
 
 - start clerezza on localhost:8080
 
-- install the directory with the site project (the directory containing this readme) with: Dev load LocationSpec("/path/to/apache/clerezza/site/trunk", noFastUpdate)
+- install the directory with the site project (the directory containing this readme) with: Dev load LocationSpec("/path/to/apache/clerezza/trunk/site", noFastUpdate)
 
 - you'll now see the contents of the clerezza site on your local instance, the content-graph is regularly written to the graph.nt file
 

Modified: clerezza/trunk/site/src/main/scala/Activator.scala
URL: http://svn.apache.org/viewvc/clerezza/trunk/site/src/main/scala/Activator.scala?rev=1458819&r1=1458818&r2=1458819&view=diff
==============================================================================
--- clerezza/trunk/site/src/main/scala/Activator.scala (original)
+++ clerezza/trunk/site/src/main/scala/Activator.scala Wed Mar 20 13:22:27 2013
@@ -18,7 +18,7 @@ class Activator extends BundleActivator 
 
 	var renderletRegistration, 
 	titledContentRenderletRegistration,
-	globalMenuRenderletRegistration: ServiceRegistration = null
+	globalMenuRenderletRegistration: ServiceRegistration[TypeRenderlet] = null
 	var graphListenerOption: Option[GraphListener] = null
 
 	/**
@@ -29,11 +29,11 @@ class Activator extends BundleActivator 
 		import servicesDsl._
 
 		val renderlet = new HeadedPageRenderlet
-		renderletRegistration = context.registerService(classOf[TypeRenderlet].getName,
+		renderletRegistration = context.registerService(classOf[TypeRenderlet],
 												  renderlet, null)
-		titledContentRenderletRegistration = context.registerService(classOf[TypeRenderlet].getName,
+		titledContentRenderletRegistration = context.registerService(classOf[TypeRenderlet],
 												  new TitledContentRenderlet, null)
-		globalMenuRenderletRegistration = context.registerService(classOf[TypeRenderlet].getName,
+		globalMenuRenderletRegistration = context.registerService(classOf[TypeRenderlet],
 												  new GlobalMenuRenderlet, null)
 		context.installBundle("mvn:org.apache.clerezza/rdf.stable.serializer").start();
 		context.installBundle("mvn:org.apache.clerezza/tools.offline").start();