Author: reto
Date: Sun Mar 20 01:03:15 2011
New Revision: 1083355
URL: http://svn.apache.org/viewvc?rev=1083355&view=rev
Log:
CLEREZZA-465: working skeleton with root resource and renderlet
Added:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
Modified:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/
(props changed)
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/Activator.scala
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/DevDsl.scala
Propchange:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 20 01:03:15 2011
@@ -0,0 +1 @@
+target
Added:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css?rev=1083355&view=auto
==============================================================================
---
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
(added)
+++
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/resources/CLEREZZA-INF/web-resources/styles/hello-world/style.css
Sun Mar 20 01:03:15 2011
@@ -0,0 +1,4 @@
+.message {
+ color: green
+}
+
Modified:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/Activator.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/Activator.scala?rev=1083355&r1=1083354&r2=1083355&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/Activator.scala
(original)
+++
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/Activator.scala
Sun Mar 20 01:03:15 2011
@@ -2,7 +2,7 @@ package skeleton
import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
import scala.collection.JavaConversions.asJavaDictionary
-import org.apache.clerezza.platform.typerendering.{Renderlet, RenderletManager}
+import org.apache.clerezza.platform.typerendering.{TypeRenderlet,
RenderletManager}
/**
* Activator for a bundle using Apache Clerezza.
@@ -24,11 +24,9 @@ class Activator extends BundleActivator
new HelloWorld(), args)
val renderlet = new HelloWorldMessageRenderlet
val serviceReference =
context.getServiceReference(classOf[RenderletManager].getName)
- renderlet bindRenderletManager
context.getService(serviceReference).asInstanceOf[RenderletManager]
-
- renderletRegistration =
context.registerService(classOf[Renderlet].getName,
+ renderletRegistration =
context.registerService(classOf[TypeRenderlet].getName,
renderlet, null)
- println("enjoy!")
+ println("enjoy it!")
}
/**
Modified:
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala?rev=1083355&r1=1083354&r2=1083355&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
(original)
+++
incubator/clerezza/trunk/parent/sourcebundle/src/main/resources/org/apache/clerezza/sourcebundle/skeletons/scala_with_activator/src/main/scala/HelloWorldMessageRenderlet.scala
Sun Mar 20 01:03:15 2011
@@ -13,17 +13,19 @@ import org.apache.clerezza.platform.type
/**
* A Renderlet for HelloWorldMessage
*/
-class HelloWorldMessageRenderlet extends PageRenderlet {
+class HelloWorldMessageRenderlet extends SRenderlet {
- val rdfType = Ontology.HelloWordMessageType
- override def mode = "naked"
+ val getRdfType = Ontology.HelloWordMessageType
- override def renderedPage(arguments: RenderedPage.Arguments):
RenderedPage = {
- new RenderedPage(arguments) {
+ override def getModePattern = "naked"
+
+ override def renderedPage(arguments: XmlResult.Arguments) = {
+ new XmlResult(arguments) {
override def content = {
-
resultDocModifier.addStyleSheet("/styles/wall/wall.css")
+
resultDocModifier.addStyleSheet("/styles/hello-world/style.css")
<div xmlns="http://www.w3.org/1999/xhtml";
id="tx-content">
- <h2>Wall</h2>
+ <h2>A Message</h2>
+ <div class="message">foo!</div>
</div>
}
}
Modified:
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/DevDsl.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/DevDsl.scala?rev=1083355&r1=1083354&r2=1083355&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/DevDsl.scala
(original)
+++
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/DevDsl.scala
Sun Mar 20 01:03:15 2011
@@ -46,6 +46,15 @@ class DevDsl(outputStream: OutputStream,
}
}
}
+
+ def load(location: String) {
+ val dir = new File(location)
+ if (!dir.isDirectory) {
+ out println "No directory "+location+" found"
+ } else {
+ $[BundleRoot].addSourceBundle(dir)
+ }
+ }
}
}
