Changeset 653


Ignore:
Timestamp:
2008-10-01 17:22:45 (5 years ago)
Author:
bruno
Message:

Tupper: merging contacts and planning modules into the main module. Make use of directory-based routing.
Left the router.groovy's of the original modules in place for reference, until fully migrated to new prototyping support.
Still need to declare variables with @src for the planning templates to work.

Location:
tupper
Files:
26 added
19 deleted
6 edited
5 copied

Legend:

Unmodified
Added
Removed

  • tupper/kauri.xml

    r640 r653  
    3333    </artifact> 
    3434 
    35     <artifact id="contact" groupId="org.kauriproject" artifactId="kauri-tupper-contact" version="1.0-SNAPSHOT"> 
    36       <mount name="router" path="/contacts"/> 
     35    <artifact id="main" groupId="org.kauriproject" artifactId="kauri-tupper-main" version="1.0-SNAPSHOT"> 
     36      <mount name="router" path=""/> 
    3737 
    3838      <inject-restservice name="jquery"        ref="jqueryModule:resources" /> 
    … …  
    4141    </artifact> 
    4242 
    43     <artifact id="planning" groupId="org.kauriproject" artifactId="kauri-tupper-planning" version="1.0-SNAPSHOT"> 
    44       <mount name="router" path="/planning"/> 
    45  
    46       <inject-restservice name="jquery"        ref="jqueryModule:resources" /> 
    47       <inject-restservice name="jquery-ui"     ref="jqueryUIModule:resources" /> 
    48       <inject-restservice name="forms"         ref="formsModule:resources" /> 
    49     </artifact> 
    50  
    51  
    52  
    53     <artifact id="main" groupId="org.kauriproject" artifactId="kauri-tupper-main" version="1.0-SNAPSHOT"> 
    54       <mount name="router" path=""/> 
    55     </artifact> 
    56  
    5743  </modules> 
    5844 

  • tupper/main/pom.xml

    r620 r653  
    3434      <artifactId>kauri-representationbuilder-api</artifactId> 
    3535    </dependency> 
     36    <dependency> 
     37      <groupId>net.sf.json-lib</groupId> 
     38      <artifactId>json-lib</artifactId> 
     39      <version>2.2.2</version> 
     40      <classifier>jdk15</classifier> 
     41    </dependency> 
    3642  </dependencies> 
    3743 

  • tupper/main/src/main/java/org/kauriproject/samples/tupper/GenericPageRestlet.java

    r650 r653  
    1 package org.kauriproject.samples.tupper.contact; 
     1package org.kauriproject.samples.tupper; 
    22 
    33import org.restlet.data.*; 

  • tupper/main/src/main/kauri/router.groovy

    r620 r653  
     1import org.restlet.util.Variable 
     2 
    13builder.router { 
    24    // The home page 
    … …  
    1012    directory(uri: "/resources", root: "kms:/resources/") 
    1113 
    12     jaxRs(uri: "") { 
    13         jaxRsResource(scanPackages: "*") 
    14         jaxRsProvider(scanPackages: "*") 
    15         jaxRsGroovyScripts(path: "groovy-jax-rs") 
    16     } 
     14    read( 
     15            uri: "/data/{path}.json", 
     16            match: "equals", 
     17            source: "kms:/site/entities/{path}.json", 
     18            postAttach : { route -> 
     19                 Variable variable = new Variable(Variable.TYPE_URI_PATH, "", true, false) 
     20                 route.getTemplate().getVariables().put("path", variable) 
     21            } 
     22   ) 
     23 
     24    directoryRouter(uri: "", root: "site/pages") 
     25 
    1726} 

  • tupper/main/src/main/kauri/spring/main-beans.xml

    r652 r653  
    1414 
    1515  <kauri:module restletContextBeanId="restletContext" classLoaderBeanId="moduleClassLoader" rapiBeanId="module"/> 
     16 
     17  <kauri:import-restservice name="jquery"/> 
     18  <kauri:import-restservice name="jquery-ui"/> 
     19  <kauri:import-restservice name="forms"/> 
    1620 
    1721  <kauri:import-service id="representationBuilder" service="org.kauriproject.representation.build.RepresentationBuilder"/> 

  • tupper/main/src/main/kauri/templates/index.xml

    r636 r653  
    77   <p>Welcome to tupper.</p> 
    88 
    9     <p><a href="contacts.html">Contacts</a></p> 
     9    <h1>Contacts</h1> 
    1010 
    11     <p><a href="planning/">Planning</a></p> 
     11    <p><a href="contacts.html">Browse contacts</a></p> 
     12 
     13    <p><a href="contacts/1.html">View contact with ID 1</a></p> 
     14    <p><a href="contacts/1-edit.html">Edit contact with ID 1</a></p> 
     15 
     16 
     17    <h1>Tasks and planning</h1> 
     18 
     19    <p><a href="planning/tasks/1.html">View task with ID 1</a></p> 
     20    <p><a href="planning/tasks/1-edit.html">Edit task with ID 1</a></p> 
     21 
    1222  </body> 
    1323</html> 

  • tupper/pom.xml

    r638 r653  
    1818 
    1919  <modules> 
    20     <module>contact</module> 
    21     <module>planning</module> 
    2220    <module>main</module> 
    2321  </modules> 
Note: See TracChangeset for help on using the changeset viewer.