Changeset 913

Timestamp:

2008-12-02 15:58:53 (4 years ago)

Author:

bruno

Message:

representation builder:

• adjust to common sample structure, introduce pages, common-samples, etc
• error page styling is now customised to fit in the common-samples layout

Location:

trunk/samples/kauri-representationbuilder-sample

Files:

• kauri.xml (modified) (1 diff)
• src/main/kauri/pages (added)
• src/main/kauri/pages/about..xml (added)
• src/main/kauri/pages/index.html.xml (added)
• src/main/kauri/representations.groovy (modified) (2 diffs)
• src/main/kauri/router.groovy (modified) (1 diff)
• src/main/kauri/spring/services.xml (moved) (moved from trunk/samples/kauri-representationbuilder-sample/src/main/kauri/spring/representationbuilder-sample-beans.xml) (1 diff)
• src/main/kauri/templates/errorpage.xml (added)
• src/main/kauri/templates/helloworld.xml (modified) (1 diff)
• src/main/kauri/templates/index.xml (deleted)
• src/main/kauri/templates/layout (added)
• src/main/kauri/templates/layout/layout.xml (added)
• src/main/kauri/templates/layout/menu.xml (added)

trunk/samples/kauri-representationbuilder-sample/kauri.xml

@@ -19 +19 @@
   <modules>
 
-    <artifact id="templateModule" groupId="org.kauriproject" artifactId="kauri-template-service-impl">
+    <artifact id="templateModule" groupId="org.kauriproject" artifactId="kauri-template-service-impl"/>
+
+    <artifact id="routingModule" groupId="org.kauriproject" artifactId="kauri-routing-impl"/>
+
+    <artifact id="representationModule" groupId="org.kauriproject" artifactId="kauri-representationbuilder-impl"/>
+
+    <artifact id="blueprintcss" groupId="org.kauriproject" artifactId="kauri-blueprintcss">
+      <mount name="main" path="/kauri/blueprintcss"/>
     </artifact>
 
-    <artifact id="routingModule" groupId="org.kauriproject" artifactId="kauri-routing-impl">
-    </artifact>
+    <artifact id="samples.common" groupId="org.kauriproject" artifactId="kauri-samples-common">
+      <inject-restservice name="blueprintcss" ref="blueprintcss:main"/>
 
-    <artifact id="representationModule" groupId="org.kauriproject" artifactId="kauri-representationbuilder-impl">
+      <mount name="main" path="/samples/common"/>
     </artifact>
 
     <artifact id="representationSample" groupId="org.kauriproject" artifactId="kauri-representationbuilder-sample">
-      <mount name="router" path=""/>
+      <inject-restservice name="samples-common" ref="samples.common:main"/>
+
+      <mount name="main" path=""/>
     </artifact>
 

trunk/samples/kauri-representationbuilder-sample/src/main/kauri/representations.groovy

@@ -48 +48 @@
 
         exception (classes: ["org.kauriproject.representation.build.sample.SampleNotFoundException"]) {
-            template(src: "clap://thread/org/kauriproject/representation/defaulterrorpage.xml", statusCode: 404)
+            template(src: "module:/templates/errorpage.xml", statusCode: 404)
         }
 
@@ -56 +56 @@
          */
         exception {
-            template(src: "clap://thread/org/kauriproject/representation/defaulterrorpage.xml", statusCode: 500)
+            template(src: "module:/templates/errorpage.xml", statusCode: 500)
         }
     }

trunk/samples/kauri-representationbuilder-sample/src/main/kauri/router.groovy

@@ -1 +1 @@
 builder.router {
-    template(uri: "/", match: "equals", template: "module:/templates/index.xml", mediaType: "text/html")
+
+    directory(uri: "/static", root: "module:/static")
 
     resource(uri: "/exception", match: "equals", ofClass: "org.kauriproject.representation.build.sample.ExceptionResource")
 
-    directory(uri: "/resources", root: "module:/resources/")
-
-    jaxRs(uri: "") {
+    jaxRs(uri: "", passThrough: true) {
         jaxRsResource(scanPackages: "*")
         jaxRsProvider(scanPackages: "*")
         jaxRsGroovyScripts(path: "groovy-jax-rs")
     }
+
+    pages(uri: "", root: "pages")
+
 }

trunk/samples/kauri-representationbuilder-sample/src/main/kauri/spring/services.xml

@@ -16 +16 @@
 
   <kauri:import-service id="templateService" service="org.kauriproject.template.service.TemplateService" />
+  <kauri:import-service id="representationBuilder" service="org.kauriproject.representation.build.RepresentationBuilder"/>
+  <kauri:import-service id="routingService" service="org.kauriproject.routing.RoutingService"/>
 
-  <kauri:import-service id="representationBuilder" service="org.kauriproject.representation.build.RepresentationBuilder"/>
+  <kauri:import-restservice name="samples-common"/> 
+
+  <kauri:export-restservice ref="main"/>
+
   <bean factory-bean="representationBuilder" factory-method="install">
     <constructor-arg ref="module"/>
   </bean>
 
-  <kauri:import-service id="routingService" service="org.kauriproject.routing.RoutingService"/>
 
-  <kauri:export-restservice ref="router"/>
-
-  <bean id="router" factory-bean="routingService" factory-method="createRouter">
+  <bean id="main" factory-bean="routingService" factory-method="createRouter">
     <constructor-arg ref="restletContext"/>
     <constructor-arg ref="module"/>

trunk/samples/kauri-representationbuilder-sample/src/main/kauri/templates/helloworld.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<html>
-  <head>
-    <title>Sample</title>
-  </head>
-  <body>
+<html t:inherit="module:/templates/layout/layout.xml"
+      xmlns:t="http://kauriproject.org/template">
+
+  <t:block name="main">
     I got this message for you: ${message}
-  </body>
+  </t:block>
+  
 </html>