Changeset 1553

Timestamp:

2010-06-10 15:33:17 (3 years ago)

Author:

freya

Message:

#173 alignment archetypes

Location:

Files:

trunk/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/META-INF/maven/archetype-metadata.xml

-                      r1058
+                      r1553
           </includes>
         </fileSet>
         <fileSet filtered="true">
+        <fileSet filtered="false">
           <directory>src/main/kauri</directory>
+          <includes>
+            <include>**</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="false">
+          <directory>src/main/resources</directory>
           <includes>
             <include>**</include>

r1058	r1553
14	14
15	15	<artifact id="module1" groupId="${groupId}" artifactId="module1" version="${version}">
16		<mount name="~~router~~" path=""/>
	16	<mount name="main" path=""/>
17	17	</artifact>
18	18

r1522	r1553
14	14	<artifactId>${parentArtifactId}</artifactId>
15	15	<version>${version}</version>
16		<relativePath>../</relativePath>
	16	<relativePath>../pom.xml</relativePath>
17	17	</parent>
18	18

-                      r748
+                      r1553
 builder.router {
+    /*
+     * Static resources.
+     */
+    directory(uri: "/static", root: "module:/static/")
     // The home page
      template(
 …
+    )
-    directory(uri: "/resources", root: "module:/resources/")
     jaxRs(uri: "") {
         jaxRsResource(scanPackages: "*")

-                      r1068
+                      r1553
   <kauri:import-service id="templateService" service="org.kauriproject.template.service.TemplateService"/>
   <kauri:export-restservice ref="router"/>
+  <kauri:export-restservice ref="main"/>
   <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"/>

-                      r304
+                      r1553
 <?xml version="1.0"?>
+<html>
+  <head>
+    <title>${artifactId} home page</title>
+  </head>
+<html t:inherit="module:/templates/layout.xml"
+      xmlns:t="http://kauriproject.org/template">
+  <body>
+  <t:block name="title">${artifactId} home page</t:block>
+  <t:block name="content">
     <h1>Welcome to ${artifactId}</h1>
 …
     <ul>
+      <li><a href="/resources/helloworld.html">A static hello world page</a></li>
+      <li><a href="/helloworld-from-java">A dynamic hello world page</a></li>
+    </ul>
+  </body>
+      <li><a href="${publicUri('service:/main/static/helloworld.html')}">A static hello world page</a></li>
+      <li><a href="${publicUri('service:/main/helloworld-from-java')}">A dynamic hello world page</a></li>
+    </ul>
+    <h2>Welcome</h2>
+  </t:block>
 </html>

Note: See TracChangeset for help on using the changeset viewer.