Changeset 748


Ignore:
Timestamp:
2008-11-07 17:04:47 (5 years ago)
Author:
bruno
Message:

The kauri protocol reanme: km -> service, kms -> module

Location:
trunk
Files:
85 edited
5 copied
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/core/kauri-runtime-rapi/src/main/java/org/kauriproject/runtime/rapi/KauriModule.java

    r671 r748  
    77public interface KauriModule { 
    88    /** 
    9      * Converts URIs in km scheme to 'public URIs' based on the mounting information 
     9     * Converts URIs in service scheme to 'public URIs' based on the mounting information 
    1010     * of the restservices. 
    1111     * 
    … …  
    1717     * path part will always stay absolute. 
    1818     */ 
    19     String publicUri(String kmUri, Reference hostRef); 
     19    String publicUri(String serviceProtocolUri, Reference hostRef); 
    2020 
    2121    ModuleSource getSource(); 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/HelloWorldTest.java

    r252 r748  
    3030        assertEquals("Hello World!", response.getEntity().getText()); 
    3131 
    32         response = runtime.getModuleById("hw").getRestserviceFacet().getRestletContext().getClientDispatcher().get("km:/helloWorldRestlet"); 
     32        response = runtime.getModuleById("hw").getRestserviceFacet().getRestletContext().getClientDispatcher().get("service:/helloWorldRestlet"); 
    3333        assertEquals(200, response.getStatus().getCode()); 
    3434        assertEquals("Hello World!", response.getEntity().getText()); 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/ServiceProtocolRemainingPartTest.java

    r746 r748  
    1010 
    1111/** 
    12  * Tests the remaing part for 'km:' requests is correctly set. 
     12 * Tests the remaing part for 'service:' requests is correctly set. 
    1313 */ 
    14 public class KmRemainingPartTest extends AbstractRuntimeTest { 
     14public class ServiceProtocolRemainingPartTest extends AbstractRuntimeTest { 
    1515    protected KauriRuntimeConfig getRuntimeConfig() throws Exception { 
    16         File moduleDir = createModule("org.kauriproject.runtime.test.testmodules.kmrp"); 
     16        File moduleDir = createModule("org.kauriproject.runtime.test.testmodules.sprp"); // sprp = service protocol remaining part 
    1717 
    1818        KauriRuntimeConfig config = new KauriRuntimeConfig(); 
    1919        config.setRepository(dummyRepository); 
    2020 
    21         ModuleDefinition module = new ModuleDefinition("kmrp", moduleDir, ModuleSourceType.EXPANDED_JAR); 
     21        ModuleDefinition module = new ModuleDefinition("sprp", moduleDir, ModuleSourceType.EXPANDED_JAR); 
    2222        module.addMount(new MountDefinition("proxyRestlet", "", null, true)); 
    2323        config.addModule(module); 
    … …  
    2929    } 
    3030 
    31     public void testKm() throws IOException { 
     31    public void testServiceProtocol() throws IOException { 
    3232        Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().get("http://localhost:" + HTTP_TEST_PORT + "/"); 
    3333        assertEquals(200, response.getStatus().getCode()); 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/ServiceProtocolToPublicTest.java

    r746 r748  
    1010 
    1111/** 
    12  * Tests the conversion of 'km:' URLs to public URLs. 
     12 * Tests the conversion of 'service:' URLs to public URLs. 
    1313 */ 
    14 public class KmToPublicTest extends AbstractRuntimeTest { 
    15     public void testKmToPublic() throws Exception { 
    16         // The km-to-public URI conversion needs to be tested for the following kinds of 
     14public class ServiceProtocolToPublicTest extends AbstractRuntimeTest { 
     15    public void testServiceProtocolToPublic() throws Exception { 
     16        // The -to-public URI conversion needs to be tested for the following kinds of 
    1717        // restservice registry entries: 
    1818        //    - exported restservice 
    … …  
    2626 
    2727        { 
    28             File moduleDir2 = createModule("org.kauriproject.runtime.test.testmodules.kmtopublic2"); 
    29             ModuleDefinition module2 = new ModuleDefinition("kmtopublic2", moduleDir2, ModuleSourceType.EXPANDED_JAR); 
     28            File moduleDir2 = createModule("org.kauriproject.runtime.test.testmodules.sptopublic2"); 
     29            ModuleDefinition module2 = new ModuleDefinition("sptopublic2", moduleDir2, ModuleSourceType.EXPANDED_JAR); 
    3030            module2.addMount(new MountDefinition("dummy", "/public2", null, true)); 
    3131            config.addModule(module2); 
    … …  
    3333 
    3434        { 
    35             File moduleDir1 = createModule("org.kauriproject.runtime.test.testmodules.kmtopublic1"); 
    36             ModuleDefinition module1 = new ModuleDefinition("kmtopublic1", moduleDir1, ModuleSourceType.EXPANDED_JAR); 
     35            File moduleDir1 = createModule("org.kauriproject.runtime.test.testmodules.sptopublic1"); 
     36            ModuleDefinition module1 = new ModuleDefinition("sptopublic1", moduleDir1, ModuleSourceType.EXPANDED_JAR); 
    3737            module1.addMount(new MountDefinition("dummy", "/public1", null, true)); 
    3838            module1.addInject(new RestserviceInjectDefinition("dummy2", "file:///tmp")); 
    39             module1.addInject(new RestserviceInjectDefinition("dummy3", "kmtopublic2", "dummy")); 
     39            module1.addInject(new RestserviceInjectDefinition("dummy3", "sptopublic2", "dummy")); 
    4040 
    4141            config.addModule(module1); 
    … …  
    4848 
    4949        { 
    50             RestserviceFacet rsf = runtime.getModuleById("kmtopublic1").getRestserviceFacet(); 
     50            RestserviceFacet rsf = runtime.getModuleById("sptopublic1").getRestserviceFacet(); 
    5151 
    52             assertEquals("/public1", rsf.getPublicPath("km:/dummy", hostRef)); 
    53             assertEquals("/public1/boe/bie/ba.txt", rsf.getPublicPath("km:/dummy/boe/bie/ba.txt", hostRef)); 
    54             assertEquals("file:///tmp", rsf.getPublicPath("km:/dummy2", hostRef)); 
    55             assertEquals("file:///tmp/yes/no", rsf.getPublicPath("km:/dummy2/yes/no", hostRef)); 
    56             assertEquals("/public2/yes/no", rsf.getPublicPath("km:/dummy3/yes/no", hostRef)); 
     52            assertEquals("/public1", rsf.getPublicPath("service:/dummy", hostRef)); 
     53            assertEquals("/public1/boe/bie/ba.txt", rsf.getPublicPath("service:/dummy/boe/bie/ba.txt", hostRef)); 
     54            assertEquals("file:///tmp", rsf.getPublicPath("service:/dummy2", hostRef)); 
     55            assertEquals("file:///tmp/yes/no", rsf.getPublicPath("service:/dummy2/yes/no", hostRef)); 
     56            assertEquals("/public2/yes/no", rsf.getPublicPath("service:/dummy3/yes/no", hostRef)); 
    5757        } 
    5858 
    5959        { 
    60             RestserviceFacet rsf = runtime.getModuleById("kmtopublic2").getRestserviceFacet(); 
    61             assertEquals("/public2", rsf.getPublicPath("km:/dummy", hostRef)); 
     60            RestserviceFacet rsf = runtime.getModuleById("sptopublic2").getRestserviceFacet(); 
     61            assertEquals("/public2", rsf.getPublicPath("service:/dummy", hostRef)); 
    6262        } 
    6363 
    … …  
    7878 
    7979        { 
    80             ModuleDefinition module2 = config.getModuleById("kmtopublic2"); 
     80            ModuleDefinition module2 = config.getModuleById("sptopublic2"); 
    8181            module2.getMounts().clear(); 
    8282            module2.addMount(new MountDefinition("dummy", "/public2", "host2", true)); 
    … …  
    8888 
    8989        { 
    90             RestserviceFacet rsf = runtime.getModuleById("kmtopublic1").getRestserviceFacet(); 
     90            RestserviceFacet rsf = runtime.getModuleById("sptopublic1").getRestserviceFacet(); 
    9191 
    9292            // host is same as hostref, host should not be part of result 
    93             assertEquals("/public1", rsf.getPublicPath("km:/dummy", hostRef)); 
     93            assertEquals("/public1", rsf.getPublicPath("service:/dummy", hostRef)); 
    9494 
    9595            // host is different, host should be part of result 
    96             assertEquals("http://otherhost:8888/public2/yes/no", rsf.getPublicPath("km:/dummy3/yes/no", hostRef)); 
     96            assertEquals("http://otherhost:8888/public2/yes/no", rsf.getPublicPath("service:/dummy3/yes/no", hostRef)); 
    9797        } 
    9898 
    9999        { 
    100             RestserviceFacet rsf = runtime.getModuleById("kmtopublic2").getRestserviceFacet(); 
    101             assertEquals("http://otherhost:8888/public2", rsf.getPublicPath("km:/dummy", hostRef)); 
     100            RestserviceFacet rsf = runtime.getModuleById("sptopublic2").getRestserviceFacet(); 
     101            assertEquals("http://otherhost:8888/public2", rsf.getPublicPath("service:/dummy", hostRef)); 
    102102        } 
    103103 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/testmodules/common/InternalRequestRestlet.java

    r703 r748  
    1919        String service = request.getResourceRef().getQueryAsForm().getFirstValue("service"); 
    2020 
    21         Request newReq = new Request(Method.GET, "km:/" + service + request.getResourceRef().getRemainingPart()); 
     21        Request newReq = new Request(Method.GET, "service:/" + service + request.getResourceRef().getRemainingPart()); 
    2222        newReq.setChallengeResponse(request.getChallengeResponse()); 
    2323 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/testmodules/sprp/ProxyRestlet.java

    r747 r748  
    1 package org.kauriproject.runtime.test.testmodules.kmrp; 
     1package org.kauriproject.runtime.test.testmodules.sprp; 
    22 
    33import org.restlet.Restlet; 

  • trunk/core/kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/testmodules/sprp/RpRestlet.java

    r747 r748  
    1 package org.kauriproject.runtime.test.testmodules.kmrp; 
     1package org.kauriproject.runtime.test.testmodules.sprp; 
    22 
    33import org.restlet.Restlet; 

  • trunk/core/kauri-runtime-tests/src/test/modulesrc/org/kauriproject/runtime/test/testmodules/sprp/KAURI-INF/spring/kmrp-beans.xml

    r306 r748  
    1919  <kauri:export-restservice ref="proxyRestlet"/> 
    2020 
    21   <bean id="rpRestlet" class="org.kauriproject.runtime.test.testmodules.kmrp.RpRestlet"> 
     21  <bean id="rpRestlet" class="org.kauriproject.runtime.test.testmodules.sprp.RpRestlet"> 
    2222    <constructor-arg ref="restletContext"/> 
    2323  </bean> 
    2424 
    25   <bean id="proxyRestlet" class="org.kauriproject.runtime.test.testmodules.kmrp.ProxyRestlet"> 
     25  <bean id="proxyRestlet" class="org.kauriproject.runtime.test.testmodules.sprp.ProxyRestlet"> 
    2626    <constructor-arg ref="restletContext"/> 
    27     <constructor-arg value="km:/rpRestlet/foo/bar"/> 
     27    <constructor-arg value="service:/rpRestlet/foo/bar"/> 
    2828  </bean> 
    2929 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/Constants.java

    r280 r748  
    66 
    77    /** 
    8      * km-request path syntax: everything from first slash till second slash, query string 
     8     * -request path syntax: everything from first slash till second slash, query string 
    99     * or fragment identifier (if any of those is present) identifies the restservice. 
    1010     */ 
    … …  
    1313    public static final Pattern MODULE_PATH_PATTERN = Pattern.compile("^" + MODULE_PATH_EXPR + "$"); 
    1414 
    15     public static final Pattern MODULE_URI_PATTERN = Pattern.compile("^km:" + MODULE_PATH_EXPR + "$"); 
     15    public static final Pattern MODULE_URI_PATTERN = Pattern.compile("^service:" + MODULE_PATH_EXPR + "$"); 
    1616} 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/build/ModuleBuilder.java

    r684 r748  
    5252 
    5353            // Note: before loading any beans in the spring container: 
    54             //   * the spring build context needs access to the module, for possible injection & kms resolving during bean initialization 
     54            //   * the spring build context needs access to the module, for possible injection & module-protocol resolving during bean initialization 
    5555            //   * the module also needs to have the reference to the applicationcontext, as there might be beans trying to get while initializing 
    5656            ModuleImpl module = new ModuleImpl(classLoader, applicationContext, restserviceFacet, cfg.getDefinition(), cfg.getModuleSource()); 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/restservice/ModuleClientDispatcher.java

    r649 r748  
    3232 
    3333        if (RestserviceManager.MODULE_PROTOCOL.equals(protocol) /* protocol can be null, do reverse compare */ ) { 
    34             String kmUri = request.getResourceRef().toString(); 
    35             Matcher matcher = Constants.MODULE_URI_PATTERN.matcher(kmUri); 
     34            String serviceUri = request.getResourceRef().toString(); 
     35            Matcher matcher = Constants.MODULE_URI_PATTERN.matcher(serviceUri); 
    3636            if (!matcher.matches()) { 
    3737                throw new KauriRTException("Invalid uri for " 
    38                         + RestserviceManager.MODULE_PROTOCOL.getSchemeName() + " scheme: " + kmUri); 
     38                        + RestserviceManager.MODULE_PROTOCOL.getSchemeName() + " scheme: " + serviceUri); 
    3939            } 
    4040 
    … …  
    4646                response.setStatus(Status.CLIENT_ERROR_NOT_FOUND); 
    4747            } else { 
    48                 request.getResourceRef().setBaseRef("km:/" + restserviceName); 
     48                request.getResourceRef().setBaseRef("service:/" + restserviceName); 
    4949                boolean interApplicationRequest = target.getType() == RestserviceRegistryEntry.Type.IMPORT; 
    5050                target.getHandle().handle(request, response, remainder, parentContext, interApplicationRequest); 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/restservice/RestserviceFacet.java

    r630 r748  
    2424 * 
    2525 * <p>It manages the registry of named restservices (imported or exported) for the current 
    26  * module and the ModuleContext, which provides the 'km:' and 'kms:' protocols. 
     26 * module and the ModuleContext, which provides the 'service:' and 'module:' protocols. 
    2727 * 
    2828 * <h3>The Module-Application relationship</h3> 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/restservice/RestserviceHandle.java

    r471 r748  
    6868                    } else { 
    6969                        if (log.isInfoEnabled()) 
    70                             log.info("Response handling of km-protocol backed by injected uri: directory listing base-uri translation: reference in response does not begin with requested uri: " + refString + " and " + uri); 
     70                            log.info("Response handling of -protocol backed by injected uri: directory listing base-uri translation: reference in response does not begin with requested uri: " + refString + " and " + uri); 
    7171                        newRef = ref; 
    7272                    } 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/restservice/RestserviceManager.java

    r515 r748  
    1919    private KauriMetadataService metadataService; 
    2020 
    21     public static final Protocol MODULE_PROTOCOL = new Protocol("km", "KM", "Kauri module protocol", -1); 
    22     public static final Protocol MODULE_SOURCE_PROTOCOL = new Protocol("kms", "KMS", "Kauri module source protocol", -1); 
     21    public static final Protocol MODULE_PROTOCOL = new Protocol("service", "SERVICE", "Kauri service protocol", -1); 
     22    public static final Protocol MODULE_SOURCE_PROTOCOL = new Protocol("module", "MODULE", "Kauri module protocol", -1); 
    2323 
    2424    public RestserviceManager(KauriRuntime runtime) { 

  • trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/rapi_impl/KauriModuleImpl.java

    r671 r748  
    2020    } 
    2121 
    22     public String publicUri(String kmUri, Reference hostRef) { 
    23         return module.getRestserviceFacet().getPublicPath(kmUri, hostRef); 
     22    public String publicUri(String serviceProtocolUri, Reference hostRef) { 
     23        return module.getRestserviceFacet().getPublicPath(serviceProtocolUri, hostRef); 
    2424    } 
    2525 

  • trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbresources/DatabaseResource.java

    r603 r748  
    227227        } else if (MediaType.APPLICATION_JAVA_OBJECT.equals(representation.getMediaType())) { 
    228228            if (representation instanceof ObjectRepresentation) { 
    229                 // when called locally via km protocol 
     229                // when called locally via protocol 
    230230                try { 
    231231                    entity = ((ObjectRepresentation<Serializable>) representation).getObject(); 

  • trunk/modules/kauri-forms/kauri-forms-datejs/src/main/kauri/router.groovy

    r589 r748  
    2727        }) 
    2828     
    29     directory(uri: "/js", root: "kms:/js/") 
     29    directory(uri: "/js", root: "module:/js/") 
    3030} 

  • trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/router.groovy

    r443 r748  
    11builder.router { 
    2     directory(uri: "/", root: "kms:/public/") 
     2    directory(uri: "/", root: "module:/public/") 
    33} 

  • trunk/modules/kauri-forms/kauri-forms-jquery-ui/src/main/kauri/router.groovy

    r494 r748  
    11builder.router { 
    2     directory(uri: "/", root: "kms:/js/jquery.ui-1.5.2") 
     2    directory(uri: "/", root: "module:/js/jquery.ui-1.5.2") 
    33} 

  • trunk/modules/kauri-forms/kauri-forms-jquery/src/main/kauri/router.groovy

    r494 r748  
    44               targetTemplate: "jquery-1.2.6.pack.js") 
    55     
    6     directory(uri: "/", root: "kms:/js/") 
     6    directory(uri: "/", root: "module:/js/") 
    77} 

  • trunk/modules/kauri-representation/kauri-representationbuilder-impl/src/main/java/org/kauriproject/representation/build/impl/RepresentationResolver.java

    r514 r748  
    113113        ModuleSource.Resource reprConfigResource = kauriModule.getSource().getResource(configPath); 
    114114        if (reprConfigResource == null && !fallBackToDefault) { 
    115             throw new RepresentationConfigurationException("Representations config does not exist at \"kms:/" + configPath + "\""); 
     115            throw new RepresentationConfigurationException("Representations config does not exist at \"module:/" + configPath + "\""); 
    116116        } 
    117117 
    … …  
    122122            representations = RSBuilder.build(is, kauriModule); 
    123123        } catch (IOException e) { 
    124             throw new RepresentationConfigurationException("Error creating representation configuration from \"kms:/" + configPath + "\".", e); 
     124            throw new RepresentationConfigurationException("Error creating representation configuration from \"module:/" + configPath + "\".", e); 
    125125        } finally { 
    126126            if (is != null) { 

  • trunk/modules/kauri-representation/kauri-representationbuilder-impl/src/main/resources/org/kauriproject/representation/build/impl/defaultrepresentations.groovy

    r514 r748  
    44    select { 
    55        when(name: "{name:**}") { 
    6             template(src: "kms:/templates/{name}.xml") 
     6            template(src: "module:/templates/{name}.xml") 
    77        } 
    88    } 

  • trunk/modules/kauri-representation/kauri-representationbuilder-impl/src/test/java/org/kauriproject/representation/test/BuilderTest.java

    r671 r748  
    2121        // Mocked KauriModule implementation 
    2222        KauriModule kauriModule = new KauriModule() { 
    23             public String publicUri(String kmUri, Reference hostRef) { 
     23            public String publicUri(String serviceProtocolUri, Reference hostRef) { 
    2424                return null; 
    2525            } 

  • trunk/modules/kauri-routing/kauri-routing-impl/src/main/java/org/kauriproject/routing/impl/components/PagesRestlet.java

    r687 r748  
    155155 
    156156    private void createPages(String filePath, Collection<Page> pages) { 
    157         String templatePath = "kms:/" + this.root + filePath; 
     157        String templatePath = "module:/" + this.root + filePath; 
    158158        Matcher matcher = DOUBLE_EXT.matcher(filePath); 
    159159        Page page; 

  • trunk/modules/kauri-routing/kauri-routing-impl/src/main/java/org/kauriproject/routing/impl/groovybuild/GroovyKauriRouterBuilder.java

    r678 r748  
    6666            routingRestlet = groovyRestlet.build(userDefinedContext, is); 
    6767        } catch (IOException e) { 
    68             throw new RoutingConfigurationException("Error creating router configuration from \"kms:/" + routingConfig.getConfigPath() + "\".", e); 
     68            throw new RoutingConfigurationException("Error creating router configuration from \"module:/" + routingConfig.getConfigPath() + "\".", e); 
    6969        } finally { 
    7070            if (is != null) { 

  • trunk/modules/kauri-routing/kauri-routing-impl/src/main/java/org/kauriproject/routing/impl/routing/KauriRouter.java

    r676 r748  
    5151            ModuleSource.Resource routerConfigResource = moduleSource.getResource(routingConfig.getConfigPath()); 
    5252            if (routerConfigResource == null && !routingConfig.getFallBackToDefault()) { 
    53                 throw new RuntimeException("Router config does not exist at \"kms:/" + routingConfig.getConfigPath() + "\""); 
     53                throw new RuntimeException("Router config does not exist at \"module:/" + routingConfig.getConfigPath() + "\""); 
    5454            } 
    5555 

  • trunk/modules/kauri-routing/kauri-routing-impl/src/main/resources/org/kauriproject/routing/impl/groovybuild/defaultrouter.groovy

    r443 r748  
    22// the router configuration file does not exit 
    33builder.router { 
    4     directory(uri: "/resources", root: "kms:/resources/") 
     4    directory(uri: "/resources", root: "module:/resources/") 
    55 
    66    jaxRs(uri: "") { 

  • trunk/modules/kauri-routing/kauri-routing-impl/src/test/modulesrc/org/kauriproject/routing/test/testmodules/routing1/KAURI-INF/router.groovy

    r671 r748  
    1919    restlet(uri: "/wiringtest", ofClass: "org.kauriproject.routing.test.testmodules.routing1.MessageUsingRestlet") 
    2020 
    21     read(uri: "/readtest/{path}", source: "kms:/{path}", 
     21    read(uri: "/readtest/{path}", source: "module:/{path}", 
    2222            postAttach : { route -> 
    2323                Variable variable = new Variable(Variable.TYPE_URI_PATH, "", true, false) 

  • trunk/modules/kauri-security/kauri-security-impl/src/test/java/org/kauriproject/security/test/KauriSecurityTest.java

    r712 r748  
    6262     
    6363            // to test the internal restlet, we use a restlet that delegates the request to  
    64             // km:/{service}/{remainingPath} (where {service} is determined by a query parameter)  
     64            // service:/{service}/{remainingPath} (where {service} is determined by a query parameter) 
    6565            module.addMount(new MountDefinition("internalRestlet", "/internal", null, true)); 
    6666             

  • trunk/modules/kauri-security/kauri-security-impl/src/test/java/org/kauriproject/security/test/common/InternalRequestRestlet.java

    r712 r748  
    1919        String service = request.getResourceRef().getQueryAsForm().getFirstValue("service"); 
    2020 
    21         Request newReq = new Request(Method.GET, "km:/" + service + request.getResourceRef().getRemainingPart()); 
     21        Request newReq = new Request(Method.GET, "service:/" + service + request.getResourceRef().getRemainingPart()); 
    2222        newReq.setChallengeResponse(request.getChallengeResponse()); 
    2323 

  • trunk/modules/kauri-security/kauri-security-impl/src/test/modulesrc/org/kauriproject/security/test/testmodules/security/KAURI-INF/spring/security-beans.xml

    r712 r748  
    8383    <constructor-arg ref="restletContext"/> 
    8484    <property name="preAuthTokenStore" ref="preAuthTokenStore"/> 
    85     <property name="forbidReference" value="km:/template/forbidden.xml"/> 
     85    <property name="forbidReference" value="service:/template/forbidden.xml"/> 
    8686  </bean> 
    8787   

  • trunk/modules/kauri-template/kauri-template-service-impl/src/main/java/org/kauriproject/template/service/impl/KauriFunctions.java

    r174 r748  
    2626    private static final String KAURIMODULE = "org.kauriproject.runtime.rapi.KauriModule"; 
    2727 
    28     public static String publicUri(String kmUri) { 
    29         String uriString = null; 
     28    public static String publicUri(String serviceProtocolUri) { 
     29        String uriString; 
    3030        try { 
    3131            KauriModule kauriModule = (KauriModule) KauriHelper.getContext().getAttributes().get(KAURIMODULE); 
    32             uriString = kauriModule.publicUri(kmUri, KauriHelper.getRequest().getHostRef()); 
     32            uriString = kauriModule.publicUri(serviceProtocolUri, KauriHelper.getRequest().getHostRef()); 
    3333        } catch (Exception ex) { 
    3434            // TODO: log error 

  • trunk/modules/kauri-template/kauri-template-service-impl/src/test/modulesrc/org/kauriproject/template/service/test/testmodules/template_ext/KAURI-INF/router.groovy

    r443 r748  
    11builder.router { 
    22 
    3     template(uri: "/template/{templateId}", template: "kms:/templates/{templateId}.xml", 
    4             mediaType: "text/html", data: "kms:/templates/{templateId}.json") 
     3    template(uri: "/template/{templateId}", template: "module:/templates/{templateId}.xml", 
     4            mediaType: "text/html", data: "module:/templates/{templateId}.json") 
    55 
    66} 

  • trunk/modules/kauri-upload/src/main/java/org/kauriproject/upload/UploadRestlet.java

    r729 r748  
    7979        Map<String, Object> templateParams = new HashMap<String, Object>(); 
    8080        templateParams.put("uploadInfos", allInfo); 
    81         Representation rep = this.templateService.getTemplateRepresentation(MediaType.TEXT_HTML, this.getContext(), request, "kms:/templates/listing.xml", templateParams); 
     81        Representation rep = this.templateService.getTemplateRepresentation(MediaType.TEXT_HTML, this.getContext(), request, "module:/templates/listing.xml", templateParams); 
    8282                     
    8383        response.setStatus(Status.SUCCESS_OK); 

  • trunk/modules/kauri-upload/src/main/kauri/router.groovy

    r729 r748  
    1313      
    1414    template ( uri : "/ui/{name}.xhtml",  
    15         template : "kms:/ui/{name}.xhtml", 
     15        template : "module:/ui/{name}.xhtml", 
    1616        mediaType : "text/html" 
    1717    ); 
    … …  
    1919    redirector ( uri : "",  
    2020        mode : redirectorMode.MODE_CLIENT_PERMANENT, 
    21         targetTemplate : "km:/ui/menu.xhtml" 
     21        targetTemplate : "service:/ui/menu.xhtml" 
    2222    ); 
    2323    */ 

  • trunk/modules/kauri-upload/src/main/kauri/spring/upload-app-context.xml

    r729 r748  
    4545  <kauri:import-restservice name="store" /><!--  when @type is omitted value ##ANY is assumed --> 
    4646  <bean id="store" class="org.restlet.data.Reference" > 
    47     <constructor-arg><value>km:/store/</value></constructor-arg> 
     47    <constructor-arg><value>service:/store/</value></constructor-arg> 
    4848  </bean> 
    4949   

  • trunk/pom.xml

    r746 r748  
    410410    <module>samples/kauri-dbforms-sample</module> 
    411411    <module>samples/kauri-representationbuilder-sample</module> 
     412    <module>samples/kauri-jqgrid-sample</module> 
    412413  </modules> 
    413414 

  • trunk/samples/kauri-dbforms-sample/src/main/java/org/kauriproject/samples/dbforms/AddressValidationRestService.java

    r522 r748  
    2929public class AddressValidationRestService extends Restlet { 
    3030 
    31     private static final String ROOT_URI = "km:/jpaRestlet/address/"; 
     31    private static final String ROOT_URI = "service:/jpaRestlet/address/"; 
    3232 
    3333    public AddressValidationRestService(Context context) { 

  • trunk/samples/kauri-dbforms-sample/src/main/java/org/kauriproject/samples/dbforms/BusinessRestlet.java

    r603 r748  
    4949    private static final Pattern GENERIC_PATTERN = Pattern.compile("^/([^/?]+)/(?:([\\d]+))?(?:\\?.*)?$"); 
    5050 
    51     private static final String rootURI = "km:/jpaRestlet/"; 
     51    private static final String rootURI = "service:/jpaRestlet/"; 
    5252 
    5353    private final Log log = LogFactory.getLog(BusinessRestlet.class); 
    … …  
    183183                    map.put("addressList", object); 
    184184                } 
    185                 templateLocation = "kms:/public/addresses.xml"; 
     185                templateLocation = "module:/public/addresses.xml"; 
    186186            } else if (path.equals("/persons")) { 
    187187                Object object = doInnerRequest("person", MediaType.APPLICATION_JAVA_OBJECT); 
    … …  
    189189                    map.put("personList", object); 
    190190                } 
    191                 templateLocation = "kms:/public/persons.xml"; 
     191                templateLocation = "module:/public/persons.xml"; 
    192192            } else if (matcher.matches()) { 
    193193                String uri = matcher.group(1) + "/" + matcher.group(2); 
    194194                JSONObject jso = (JSONObject) doInnerRequest(uri, MediaType.APPLICATION_JSON); 
    195195                map.put("jsondata", jso); 
    196                 templateLocation = "kms:/public/" + matcher.group(1) + ".xml"; 
     196                templateLocation = "module:/public/" + matcher.group(1) + ".xml"; 
    197197            } else { 
    198198                map.put("jsondata", null); 
    199                 templateLocation = "kms:/public/" + path + ".xml"; 
     199                templateLocation = "module:/public/" + path + ".xml"; 
    200200            } 
    201201 

  • trunk/samples/kauri-dbforms-sample/src/main/java/org/kauriproject/samples/dbforms/CrudRestlet.java

    r410 r748  
    8181        // TODO: use riap ? 
    8282        Uniform rest = getContext().getClientDispatcher(); 
    83         String rootURI = "km:/jpaRestlet/"; 
     83        String rootURI = "service:/jpaRestlet/"; 
    8484        rest.post(rootURI + "address", new ObjectRepresentation<Serializable>(address1)); 
    8585        rest.post(rootURI + "address", new ObjectRepresentation<Serializable>(address2)); 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/public/address.xml

    r522 r748  
    33    <title>Address Form</title> 
    44 
    5     <script type="text/javascript" src="${publicUri('km:/jquery/jquery-1.2.6.js')}"></script> 
    6     <script type="text/javascript" src="${publicUri('km:/forms/kauri-forms.js')}"></script> 
     5    <script type="text/javascript" src="${publicUri('service:/jquery/jquery-1.2.6.js')}"></script> 
     6    <script type="text/javascript" src="${publicUri('service:/forms/kauri-forms.js')}"></script> 
    77 
    88    <script type="text/javascript"> 
    99      jQuery(document).ready(function() { 
    1010        var fconf = { 
    11           dataURI: '${publicUri('km:/dbformsRestlet/address/{id}')}', 
     11          dataURI: '${publicUri('service:/dbformsRestlet/address/{id}')}', 
    1212          type: ['composite', { 
    1313            members: { 
    … …  
    163163    <br/> 
    164164     
    165     <form method="link" action="${publicUri('km:/dbformsRestlet/addresses')}" style="background-color: white"> 
     165    <form method="link" action="${publicUri('service:/dbformsRestlet/addresses')}" style="background-color: white"> 
    166166      <input type="submit" value="return to list"/> 
    167167    </form> 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/public/addresses.xml

    r420 r748  
    2121            <td>${address.street} ${address.number} ${address.bus} ${address.postalCode} ${address.city}</td> 
    2222            <td style="text-align: center;"> 
    23               <form method="get" action="${publicUri('km:/dbformsRestlet/address/')}${address.id}"> 
     23              <form method="get" action="${publicUri('service:/dbformsRestlet/address/')}${address.id}"> 
    2424                <input type="submit" value="edit"/> 
    2525              </form> 
    2626            </td> 
    2727            <td style="text-align: center;"> 
    28               <form method="post" action="${publicUri('km:/dbformsRestlet/address/')}${address.id}?method=DELETE"> 
     28              <form method="post" action="${publicUri('service:/dbformsRestlet/address/')}${address.id}?method=DELETE"> 
    2929                <input type="submit" value="delete"/> 
    3030              </form> 
    … …  
    3636     
    3737    <div style="width: 75%; text-align: right;"> 
    38       <form method="get" action="${publicUri('km:/dbformsRestlet/address')}"> 
     38      <form method="get" action="${publicUri('service:/dbformsRestlet/address')}"> 
    3939        <input type="submit" value="add address"/> 
    4040      </form> 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/public/index.xml

    r389 r748  
    1414      <li> 
    1515        <p> 
    16           <a href="${publicUri('km:/dbformsRestlet/addresses')}">list of addresses</a> 
     16          <a href="${publicUri('service:/dbformsRestlet/addresses')}">list of addresses</a> 
    1717        </p> 
    1818      </li> 
    1919      <li> 
    2020        <p> 
    21           <a href="${publicUri('km:/dbformsRestlet/persons')}">list of persons</a> 
     21          <a href="${publicUri('service:/dbformsRestlet/persons')}">list of persons</a> 
    2222        </p> 
    2323      </li> 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/public/person.xml

    r609 r748  
    33    <title>Person Form</title> 
    44 
    5     <script type="text/javascript" src="${publicUri('km:/jquery/jquery-1.2.6.js')}"></script> 
    6     <script type="text/javascript" src="${publicUri('km:/forms/kauri-forms.js')}"></script> 
     5    <script type="text/javascript" src="${publicUri('service:/jquery/jquery-1.2.6.js')}"></script> 
     6    <script type="text/javascript" src="${publicUri('service:/forms/kauri-forms.js')}"></script> 
    77 
    88    <script type="text/javascript"> 
    99      jQuery(document).ready(function() { 
    1010        var fconf = { 
    11           dataURI: '${publicUri('km:/dbformsRestlet/person/{id}')}', 
     11          dataURI: '${publicUri('service:/dbformsRestlet/person/{id}')}', 
    1212          type: ['composite', { 
    1313            members: { 
    … …  
    4343                                '@validators' : { 
    4444                                   'required' : {}, 
    45                                    'remote' : { location: '${publicUri('km:/addressValidationRestlet')}' } 
     45                                   'remote' : { location: '${publicUri('service:/addressValidationRestlet')}' } 
    4646                                },  
    4747                                control: 'address-control' 
    … …  
    5757                base: 'selection-control', 
    5858                options: { 
    59                     uri: '${publicUri('km:/dbformsRestlet/jsonaddresslist')}', 
     59                    uri: '${publicUri('service:/dbformsRestlet/jsonaddresslist')}', 
    6060                    valueTemplate: '{id}', 
    6161                    labelTemplate: '{street} {number} IN {city}' 
    … …  
    155155    <br/> 
    156156     
    157     <form method="link" action="${publicUri('km:/dbformsRestlet/persons')}" style="background-color: white"> 
     157    <form method="link" action="${publicUri('service:/dbformsRestlet/persons')}" style="background-color: white"> 
    158158      <input type="submit" value="return to list"/> 
    159159    </form> 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/public/persons.xml

    r420 r748  
    2121            <td>${pers.name} ${pers.first} (${pers.persnr})</td> 
    2222            <td style="text-align: center;"> 
    23               <form method="get" action="${publicUri('km:/dbformsRestlet/person/')}${pers.id}"> 
     23              <form method="get" action="${publicUri('service:/dbformsRestlet/person/')}${pers.id}"> 
    2424                <input type="submit" value="edit"/> 
    2525              </form> 
    2626            </td> 
    2727            <td style="text-align: center;"> 
    28               <form method="post" action="${publicUri('km:/dbformsRestlet/person/')}${pers.id}?method=DELETE"> 
     28              <form method="post" action="${publicUri('service:/dbformsRestlet/person/')}${pers.id}?method=DELETE"> 
    2929                <input type="submit" value="delete"/> 
    3030              </form> 
    … …  
    3636     
    3737    <div style="width: 75%; text-align: right;"> 
    38       <form method="get" action="${publicUri('km:/dbformsRestlet/person')}"> 
     38      <form method="get" action="${publicUri('service:/dbformsRestlet/person')}"> 
    3939        <input type="submit" value="add person"/> 
    4040      </form> 

  • trunk/samples/kauri-dbforms-sample/src/main/kauri/router.groovy

    r443 r748  
    22 
    33builder.router { 
    4     template(uri: "/", template: "kms:/public/index.xml", 
     4    template(uri: "/", template: "module:/public/index.xml", 
    55            mediaType: "text/html", postAttach : { route -> route.getTemplate().setMatchingMode(Template.MODE_STARTS_WITH) }) 
    66     
    7     /* template(uri: "/template/{templateId}", template: "kms:/public/{templateId}.xml", 
     7    /* template(uri: "/template/{templateId}", template: "module:/public/{templateId}.xml", 
    88            mediaType: "text/html") */ 
    99 
    10     directory(uri: "/resources", root: "kms:/resources/") 
     10    directory(uri: "/resources", root: "module:/resources/") 
    1111} 

  • trunk/samples/kauri-dbresources-sample/src/main/java/org/kauriproject/samples/dbresources/CrudRestlet.java

    r410 r748  
    4444public class CrudRestlet extends Restlet { 
    4545 
    46     private static final String ROOT_URI = "km:/jpaRestlet/"; 
     46    private static final String ROOT_URI = "service:/jpaRestlet/"; 
    4747 
    4848    private static final Pattern REQ_SRC_PATTERN = Pattern.compile("^/([^\\?]*)(.*)$"); 

  • trunk/samples/kauri-dbresources-sample/src/main/java/org/kauriproject/samples/dbresources/IndexRestlet.java

    r296 r748  
    3838    public void handle(Request request, Response response) { 
    3939        Representation representation = templateService.getTemplateRepresentation(MediaType.TEXT_HTML, 
    40                 getContext(), request, "kms:/public/index.xml", Collections.<String, Object> emptyMap()); 
     40                getContext(), request, "module:/public/index.xml", Collections.<String, Object> emptyMap()); 
    4141        response.setEntity(representation); 
    4242    } 

  • trunk/samples/kauri-dbresources-sample/src/main/kauri/public/index.xml

    r417 r748  
    131131      <li> 
    132132        <p> 
    133           <a href="${publicUri('km:/jpaRestlet/person/1')}">person with id = 1</a> 
     133          <a href="${publicUri('service:/jpaRestlet/person/1')}">person with id = 1</a> 
    134134        </p> 
    135135      </li> 
    136136      <li> 
    137137        <p> 
    138           <a href="${publicUri('km:/jpaRestlet/person/2/address')}">list of addresses for person with id = 2</a> 
     138          <a href="${publicUri('service:/jpaRestlet/person/2/address')}">list of addresses for person with id = 2</a> 
    139139        </p> 
    140140      </li> 
    141141      <li> 
    142142        <p> 
    143           <a href="${publicUri('km:/jpaRestlet/person?address=1')}">list of persons which have an address with id = 1</a> 
     143          <a href="${publicUri('service:/jpaRestlet/person?address=1')}">list of persons which have an address with id = 1</a> 
    144144        </p> 
    145145      </li> 

  • trunk/samples/kauri-forms-sample/src/main/java/org/kauriproject/samples/forms/DataFormRestService.java

    r685 r748  
    6666                 
    6767                ent = templateService.getTemplateRepresentation(MediaType.TEXT_HTML, 
    68                         getContext(), request, "kms:/templates/data/" + type + "-detail.xml", map); 
     68                        getContext(), request, "module:/templates/data/" + type + "-detail.xml", map); 
    6969                 
    7070                if (ent != null) 
    … …  
    101101                 
    102102                ent = templateService.getTemplateRepresentation(MediaType.TEXT_HTML, 
    103                         getContext(), request, "kms:/templates/data/" + type + "-form.xml", map); 
     103                        getContext(), request, "module:/templates/data/" + type + "-form.xml", map); 
    104104                if (ent != null) 
    105105                    response.setEntity(ent); 
    … …  
    133133                 
    134134                ent = templateService.getTemplateRepresentation(MediaType.TEXT_HTML, 
    135                         getContext(), request, "kms:/templates/data/" + type + "-list.xml", map); 
     135                        getContext(), request, "module:/templates/data/" + type + "-list.xml", map); 
    136136                 
    137137                if (ent != null) 
    … …  
    142142 
    143143    //TODO use this template 
    144     private String formUriTemplate = "kms:/templates/data/{type}-{formOrList}.xml"; 
     144    private String formUriTemplate = "module:/templates/data/{type}-{formOrList}.xml"; 
    145145    public void setFormUriTemplate(String template) { 
    146146        this.formUriTemplate = template; 

  • trunk/samples/kauri-forms-sample/src/main/kauri/router.groovy

    r706 r748  
    1717    template(uri: "/", 
    1818        match: "equals", 
    19         template: "kms:/templates/index.xml", 
     19        template: "module:/templates/index.xml", 
    2020        mediaType: "text/html", 
    2121    ); 
    2222 
    2323    directory(uri: "/resources",  
    24         root: "kms:/resources" 
     24        root: "module:/resources" 
    2525    ); 
    2626     
    … …  
    3131             
    3232            if (method == Method.POST) { 
    33                 def dataRef = "km:/sample-data"; 
     33                def dataRef = "service:/sample-data"; 
    3434                def status = "<br/>status:<ol>";  
    3535                def rand = new Random(); 

  • trunk/samples/kauri-forms-sample/src/main/kauri/spring/forms-sample-beans.xml

    r651 r748  
    4747    <constructor-arg ref="restletContext" /> 
    4848    <property name="templateService" ref="templateService" /> 
    49     <property name="formUriTemplate" value="kms:/resources/forms/{type}-form.xml" /> 
     49    <property name="formUriTemplate" value="module:/resources/forms/{type}-form.xml" /> 
    5050    <property name="dataService" ref="sample-data" /> 
    5151  </bean> 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/css.xml

    r697 r748  
    77   
    88  <!-- datepicker css --> 
    9   <link rel="stylesheet" type="text/css" href="${publicUri('km:/jquery-ui/themes/flora/flora.all.css')}"></link> 
    10   <link rel="stylesheet" type="text/css" href="${publicUri('km:/forms/css/datepicker.css')}"></link> 
     9  <link rel="stylesheet" type="text/css" href="${publicUri('service:/jquery-ui/themes/flora/flora.all.css')}"></link> 
     10  <link rel="stylesheet" type="text/css" href="${publicUri('service:/forms/css/datepicker.css')}"></link> 
    1111  <style type="text/css"> 
    1212    table.ui-datepicker td { 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/data/sample-detail.xml

    r685 r748  
    88    <title>Sample Data List</title>     
    99     
    10     <ktl:include src="kms:/templates/css.xml"/> 
     10    <ktl:include src="module:/templates/css.xml"/> 
    1111     
    12     <script type="text/javascript" src="${publicUri('km:/jquery/jquery.js')}"></script> 
    13     <script type="text/javascript" src="${publicUri('km:/jquery-ui/ui/jquery.ui.all.js')}"></script> 
    14     <script type="text/javascript" src="${publicUri('km:/forms/kauri-forms.js')}"></script>         
     12    <script type="text/javascript" src="${publicUri('service:/jquery/jquery.js')}"></script> 
     13    <script type="text/javascript" src="${publicUri('service:/jquery-ui/ui/jquery.ui.all.js')}"></script> 
     14    <script type="text/javascript" src="${publicUri('service:/forms/kauri-forms.js')}"></script> 
    1515     
    1616    <script type="text/javascript"> 
    17       var fconf = <ktl:include src="kms:/templates/data/sample-form-config.xml" mode="txt" /> 
     17      var fconf = <ktl:include src="module:/templates/data/sample-form-config.xml" mode="txt" /> 
    1818       
    1919      <![CDATA[ 
    … …  
    144144          <td colspan="2"></td> 
    145145          <td> 
    146           <form method="get" action="${publicUri('km:/sample-ui/sample/new')}"> 
     146          <form method="get" action="${publicUri('service:/sample-ui/sample/new')}"> 
    147147          <input type="submit" value="add"/> 
    148148          </form> 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/data/sample-form-config.xml

    r705 r748  
    11<ktl:if test="true" xmlns:ktl="http://kauriproject.org/template"> 
    22  { 
    3     dataURI: '${publicUri('km:/sample-data/')}${type}/{id}',       
     3    dataURI: '${publicUri('service:/sample-data/')}${type}/{id}', 
    44    type: ['composite', { 
    55      members: { 
    … …  
    2828            '@validators': {  
    2929              'remote': { 
    30                 location: "${publicUri('km:/pi-validation')}" 
     30                location: "${publicUri('service:/pi-validation')}" 
    3131              } 
    3232            }, 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/data/sample-form.xml

    r697 r748  
    33    <title>Sample Data Form</title> 
    44     
    5     <ktl:include src="kms:/templates/css.xml"/> 
     5    <ktl:include src="module:/templates/css.xml"/> 
    66 
    7     <script type="text/javascript" src="${publicUri('km:/jquery/jquery.js')}"></script> 
    8     <script type="text/javascript" src="${publicUri('km:/jquery-ui/ui/jquery.ui.all.js')}"></script> 
    9     <script type="text/javascript" src="${publicUri('km:/forms/kauri-forms.js')}"></script>         
     7    <script type="text/javascript" src="${publicUri('service:/jquery/jquery.js')}"></script> 
     8    <script type="text/javascript" src="${publicUri('service:/jquery-ui/ui/jquery.ui.all.js')}"></script> 
     9    <script type="text/javascript" src="${publicUri('service:/forms/kauri-forms.js')}"></script> 
    1010     
    1111    <!-- think about externalized form-models later  
    … …  
    1515    <script type="text/javascript"> 
    1616    <!-- alternative form-model inclusion  
    17       var fconf = <ktl:include src="kms:/templates/data/sample-form.js" mode="txt" />  
     17      var fconf = <ktl:include src="module:/templates/data/sample-form.js" mode="txt" /> 
    1818    --> 
    1919       
    2020      jQuery(document).ready(function() { 
    21           var fconf = <ktl:include src="kms:/templates/data/sample-form-config.xml" mode="txt" />  
     21          var fconf = <ktl:include src="module:/templates/data/sample-form-config.xml" mode="txt" /> 
    2222           
    2323          var testForm = new jQuery.org.kauriproject.forms.Form("sample-form", fconf); 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/data/sample-list.xml

    r685 r748  
    44    <title>Sample Data List</title>     
    55     
    6     <ktl:include src="kms:/templates/css.xml"/> 
     6    <ktl:include src="module:/templates/css.xml"/> 
    77     
    88  </head> 
    … …  
    2626            <td>${item.email}, ${item.mondaysok}, ${item.friendscount}, ${item.pi}, ${item.birthdate}, ${item.contact.case}</td> 
    2727            <td style="text-align: center;"> 
    28               <form method="get" action="${publicUri('km:/sample-ui/sample/')}${item.id}"> 
     28              <form method="get" action="${publicUri('service:/sample-ui/sample/')}${item.id}"> 
    2929                <input type="submit" value="edit"/> 
    3030              </form> 
    3131            </td> 
    3232            <td style="text-align: center;"> 
    33               <form method="post" action="${publicUri('km:/sample-data/sample/')}${item.id}?method=DELETE"> 
     33              <form method="post" action="${publicUri('service:/sample-data/sample/')}${item.id}?method=DELETE"> 
    3434                <input type="submit" value="delete"/> 
    3535              </form> 
    … …  
    4040          <td colspan="2"></td> 
    4141          <td> 
    42             <form method="get" action="${publicUri('km:/sample-ui/sample/new')}"> 
     42            <form method="get" action="${publicUri('service:/sample-ui/sample/new')}"> 
    4343              <input type="submit" value="add"/> 
    4444            </form> 

  • trunk/samples/kauri-forms-sample/src/main/kauri/templates/index.xml

    r685 r748  
    44    <title>Kauri forms samples</title> 
    55    <!-- 
    6     <script type="text/javascript" src="${publicUri('km:/jquery/jquery.js')}" ></script> 
     6    <script type="text/javascript" src="${publicUri('service:/jquery/jquery.js')}" ></script> 
    77    --> 
    88     
    9     <ktl:include src="kms:/templates/css.xml"/> 
     9    <ktl:include src="module:/templates/css.xml"/> 
    1010     
    11     <script type="text/javascript" src="${publicUri('km:/jquery/jquery.js')}" ></script> 
     11    <script type="text/javascript" src="${publicUri('service:/jquery/jquery.js')}" ></script> 
    1212    <script type="text/javascript"> 
    1313 
    … …  
    4343      <li>Data Resources (JSON) @ data/sample/** 
    4444        <ul> 
    45           <li><a href="${publicUri('km:/sample-data')}/sample">List of resources</a></li> 
     45          <li><a href="${publicUri('service:/sample-data')}/sample">List of resources</a></li> 
    4646          <li>Specific resources: data/sample/{id}</li> 
    47           <li><form method="POST" action="${publicUri('km:/sample-router/load-data')}">Tip: we provide a simple resource that will <input type="submit" value="load"/> some fake data.</form></li>           
     47          <li><form method="POST" action="${publicUri('service:/sample-router/load-data')}">Tip: we provide a simple resource that will <input type="submit" value="load"/> some fake data.</form></li> 
    4848        </ul> 
    4949      </li> 
    … …  
    5151        <ul> 
    5252          <li>&#x03A0; validation @ validate/pi POST value as entity:   
    53             <a href="javascript:testValidate('${publicUri('km:/pi-validation')}', ${22/7})">${22/7}</a> -   
    54             <a href="javascript:testValidate('${publicUri('km:/pi-validation')}', ${math:pi()})">${math:pi()}</a>  
     53            <a href="javascript:testValidate('${publicUri('service:/pi-validation')}', ${22/7})">${22/7}</a> - 
     54            <a href="javascript:testValidate('${publicUri('service:/pi-validation')}', ${math:pi()})">${math:pi()}</a> 
    5555          </li>           
    5656        </ul> 
    … …  
    5858      <li>UI Interaction Resources @ ui/sample/** 
    5959        <ul> 
    60           <li><a href="${publicUri('km:/sample-ui/sample')}">List of resources</a></li>           
    61           <li>Form with specific resources data: ${publicUri('km:/sample-ui')}/sample/{id}</li> 
    62           <li><a href="${publicUri('km:/sample-ui/sample/detail')}">Detailed list of resources</a></li> 
     60          <li><a href="${publicUri('service:/sample-ui/sample')}">List of resources</a></li> 
     61          <li>Form with specific resources data: ${publicUri('service:/sample-ui')}/sample/{id}</li> 
     62          <li><a href="${publicUri('service:/sample-ui/sample/detail')}">Detailed list of resources</a></li> 
    6363          <!-- 
    64           <li><a href="${publicUri('km:/sample-ui/sample/new')}">Empty form</a> (new entity)</li> 
     64          <li><a href="${publicUri('service:/sample-ui/sample/new')}">Empty form</a> (new entity)</li> 
    6565          --> 
    6666        </ul> 

  • trunk/samples/kauri-jqgrid-sample/src/main/java/org/kauriproject/samples/grid/GridRestlet.java

    r700 r748  
    3232    private static final Pattern GENERIC_PATTERN = Pattern.compile("^/([^/?]+)(?:\\?(.*))?$"); 
    3333 
    34     private static final String rootURI = "km:/jpaRestlet/"; 
     34    private static final String rootURI = "service:/jpaRestlet/"; 
    3535 
    3636    public GridRestlet(Context context) { 

  • trunk/samples/kauri-jqgrid-sample/src/main/java/org/kauriproject/samples/grid/TemplateRestlet.java

    r700 r748  
    3636    private static final Pattern REQ_SRC_PATTERN = Pattern.compile("^/([^\\?.]*)(\\.[^\\?]*)?(.*)$"); 
    3737 
    38     private static final String TEMPLATE_BASE = "kms:/public/"; 
     38    private static final String TEMPLATE_BASE = "module:/public/"; 
    3939    private static final String TEMPLATE_EXT = ".xml"; 
    4040 

  • trunk/samples/kauri-jqgrid-sample/src/main/kauri/public/grid.xml

    r700 r748  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <html xmlns:t="http://kauriproject.org/template" t:inherit="kms:/public/skeleton.xml"> 
     2<html xmlns:t="http://kauriproject.org/template" t:inherit="module:/public/skeleton.xml"> 
    33    <head> 
    44     <title>child inheriting from base</title> 

  • trunk/samples/kauri-jqgrid-sample/src/main/kauri/public/grid_edit.xml

    r700 r748  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <html xmlns:t="http://kauriproject.org/template" t:inherit="kms:/public/skeleton.xml"> 
     2<html xmlns:t="http://kauriproject.org/template" t:inherit="module:/public/skeleton.xml"> 
    33    <head> 
    44     <title>child inheriting from base ${width}</title> 

  • trunk/samples/kauri-jqgrid-sample/src/main/kauri/public/grid_local.xml

    r700 r748  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <html xmlns:t="http://kauriproject.org/template" t:inherit="kms:/public/skeleton.xml"> 
     2<html xmlns:t="http://kauriproject.org/template" t:inherit="module:/public/skeleton.xml"> 
    33    <head> 
    44     <title>child inheriting from base ${width}</title> 

  • trunk/samples/kauri-jqgrid-sample/src/main/kauri/public/index.xml

    r700 r748  
    88    <h1>jqgrid sample</h1> 
    99 
    10     <p><a href="${publicUri('km:/templateRestlet/skeleton')}">Base template</a></p> 
     10    <p><a href="${publicUri('service:/templateRestlet/skeleton')}">Base template</a></p> 
    1111     
    12     <p><a href="${publicUri('km:/templateRestlet/grid')}">grid showcase</a></p> 
     12    <p><a href="${publicUri('service:/templateRestlet/grid')}">grid showcase</a></p> 
    1313     
    14     <p><a href="${publicUri('km:/templateRestlet/grid_local')}">inline editing : local</a></p> 
     14    <p><a href="${publicUri('service:/templateRestlet/grid_local')}">inline editing : local</a></p> 
    1515     
    16     <p><a href="${publicUri('km:/templateRestlet/grid_edit')}">inline editing : dbresources</a></p> 
     16    <p><a href="${publicUri('service:/templateRestlet/grid_edit')}">inline editing : dbresources</a></p> 
    1717     
    1818  </body> 

  • trunk/samples/kauri-jqgrid-sample/src/main/kauri/router.groovy

    r700 r748  
    22 
    33builder.router { 
    4     directory(uri: "/resources", root: "kms:/resources/") 
     4    directory(uri: "/resources", root: "module:/resources/") 
    55     
    6     template(uri: "/", template: "kms:/public/index.xml", 
     6    template(uri: "/", template: "module:/public/index.xml", 
    77            mediaType: "text/html", postAttach : { route -> route.getTemplate().setMatchingMode(Template.MODE_STARTS_WITH) }) 
    88     

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

    r475 r748  
    3535             * substitution. 
    3636             */ 
    37             template(src: "kms:/templates/{name}.xml") 
     37            template(src: "module:/templates/{name}.xml") 
    3838        } 
    3939    } 

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

    r474 r748  
    11builder.router { 
    2     template(uri: "/", match: "equals", template: "kms:/templates/index.xml", mediaType: "text/html") 
     2    template(uri: "/", match: "equals", template: "module:/templates/index.xml", mediaType: "text/html") 
    33 
    44    resource(uri: "/exception", match: "equals", ofClass: "org.kauriproject.representation.build.sample.ExceptionResource") 
    55 
    6     directory(uri: "/resources", root: "kms:/resources/") 
     6    directory(uri: "/resources", root: "module:/resources/") 
    77 
    88    jaxRs(uri: "") { 

  • trunk/samples/kauri-routing-sample/src/main/kauri/router.groovy

    r482 r748  
    2121// which ensures proper resolving of context-related things. 
    2222builder.router(match: "equals") { 
    23     template(uri: "/", template: "kms:/templates/index.xml", 
     23    template(uri: "/", template: "module:/templates/index.xml", 
    2424            mediaType: "text/html") 
    2525 
    26     read (uri: "/router-groovy.txt", source: "kms:/router.groovy", mediaType: mediaType.TEXT_PLAIN) 
     26    read (uri: "/router-groovy.txt", source: "module:/router.groovy", mediaType: mediaType.TEXT_PLAIN) 
    2727 
    2828 
    … …  
    5353                    } 
    5454 
    55                     directory(uri: "/resources", match: "start", root: "kms:/resources/") 
     55                    directory(uri: "/resources", match: "start", root: "module:/resources/") 
    5656 
    57                     read(uri: "/resources_alt/{path}", source: "kms:/resources/{path}", 
     57                    read(uri: "/resources_alt/{path}", source: "module:/resources/{path}", 
    5858                            postAttach : { route -> 
    5959                                Variable variable = new Variable(Variable.TYPE_URI_PATH, "", true, false) 
    … …  
    6161                    }) 
    6262 
    63                     template(uri: "/template/{templateId}", template: "kms:/templates/{templateId}.xml", 
    64                             mediaType: "text/html", data: "kms:/templates/{templateId}.json") 
     63                    template(uri: "/template/{templateId}", template: "module:/templates/{templateId}.xml", 
     64                            mediaType: "text/html", data: "module:/templates/{templateId}.json") 
    6565 
    6666                    resource(uri: "/user/{name}", ofClass: "org.kauriproject.samples.routingmodule.UserResource") 

  • trunk/samples/kauri-routing-sample/src/main/kauri/templates/index.xml

    r482 r748  
    1313 
    1414    <p>The actual routing configuration can be found in the source of this sample 
    15     at src/main/kauri/<a href="${publicUri('km:/router/router-groovy.txt')}">router.groovy</a>. 
     15    at src/main/kauri/<a href="${publicUri('service:/router/router-groovy.txt')}">router.groovy</a>. 
    1616    This particular sample can be overwhelming because it combines a variety of features.</p> 
    1717 
    1818    <h2>Restlet samples</h2> 
    1919 
    20     <p><a href="${publicUri('km:/router/helloworld-router')}">Hello world closure</a> -- this sample 
     20    <p><a href="${publicUri('service:/router/helloworld-router')}">Hello world closure</a> -- this sample 
    2121    demonstrates a plain Restlet, but implemented as a closure within the Groovy-based 
    2222    routing configuration.</p> 
    2323 
    24     <p><a href="${publicUri('km:/router/user/Steven')}">User resource</a> -- this sample 
     24    <p><a href="${publicUri('service:/router/user/Steven')}">User resource</a> -- this sample 
    2525    demonstrates implementing a ReST resource using Restlet's Resource API.</p> 
    2626 
    27     <p><a href="${publicUri('km:/router/path/this/are/multiple/path/segments')}">URI 
     27    <p><a href="${publicUri('service:/router/path/this/are/multiple/path/segments')}">URI 
    2828      template</a> -- the router uses URI templates as syntax for expressing the URIs to 
    2929      match. This sample illustrates setting options for the variable parts within 
    … …  
    3333    <h2>JAX-RS samples</h2> 
    3434 
    35     <p><a href="${publicUri('km:/router/jaxrs/helloworld-java')}">Hello world JAX-RS resource 
     35    <p><a href="${publicUri('service:/router/jaxrs/helloworld-java')}">Hello world JAX-RS resource 
    3636      implemented in Java.</a></p> 
    3737 
    38     <p><a href="${publicUri('km:/router/jaxrs/helloworld-groovy')}">Hello world JAX-RS resource 
     38    <p><a href="${publicUri('service:/router/jaxrs/helloworld-groovy')}">Hello world JAX-RS resource 
    3939      implemented in Groovy.</a></p> 
    4040 
    41     <p><a href="${publicUri('km:/router/jaxrs/vegetable')}">Vegetables list.</a> -- this sample 
     41    <p><a href="${publicUri('service:/router/jaxrs/vegetable')}">Vegetables list.</a> -- this sample 
    4242    demonstrates the use of a custom JAX-RS MessageBodyWriter.</p> 
    4343 
    44     <p><a href="${publicUri('km:/router/jaxrs/user/Steven')}">User resource.</a> -- this sample 
     44    <p><a href="${publicUri('service:/router/jaxrs/user/Steven')}">User resource.</a> -- this sample 
    4545    demonstrates the ability to inject path parts as method parameters (see source code).</p> 
    4646 
    47     <p><a href="${publicUri('km:/router/jaxrs/message')}">Message resource.</a> -- this sample 
     47    <p><a href="${publicUri('service:/router/jaxrs/message')}">Message resource.</a> -- this sample 
    4848    is a JAX-RS class with an inject MessageService object, autowired by the module's Spring 
    4949    container.</p> 
    … …  
    5151    <h2>template sample</h2> 
    5252 
    53     <p><a href="${publicUri('km:/router/template/person')}">Template sample</a> -- this sample 
     53    <p><a href="${publicUri('service:/router/template/person')}">Template sample</a> -- this sample 
    5454    illustrates the 'template' instruction available in the router configuration. It is a shortcut 
    5555    for creating a restlet which executes a template, with the ability to provide it data from 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-index/src/main/kauri/router.groovy

    r443 r748  
    55builder.router { 
    66 
    7   template(uri: "/", match: "equals", template: "kms:/templates/index.xml", mediaType: "text/html") 
     7  template(uri: "/", match: "equals", template: "module:/templates/index.xml", mediaType: "text/html") 
    88 
    99} 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-index/src/main/kauri/templates/index.xml

    r288 r748  
    2626    <h3>Rest-services provided by sample module 1</h3> 
    2727 
    28     <p><a href="${publicUri('km:/firstRestlet')}">First restlet</a></p> 
     28    <p><a href="${publicUri('service:/firstRestlet')}">First restlet</a></p> 
    2929 
    30     <p><a href="${publicUri('km:/secondRestlet')}">Second restlet</a> -- shows how to 
     30    <p><a href="${publicUri('service:/secondRestlet')}">Second restlet</a> -- shows how to 
    3131      perform an internal request to retrieve the content produced by the first restlet.</p> 
    3232 
    33     <p><a href="${publicUri('km:/thirdRestlet')}">Third restlet</a> -- shows how to use 
    34       the 'kms' (kauri module source) protocol to retrieve a file contained within 
    35       a module.</p> 
     33    <p><a href="${publicUri('service:/thirdRestlet')}">Third restlet</a> -- shows how to use 
     34      the module-protocol to retrieve a file contained within a module.</p> 
    3635 
    3736    <h3>Rest-services provided by sample module 2</h3> 
    3837 
    39     <p><a href="${publicUri('km:/depTestRestlet1')}">depTestRestlet1</a> -- gets data from 
     38    <p><a href="${publicUri('service:/depTestRestlet1')}">depTestRestlet1</a> -- gets data from 
    4039    an injected rest-service, in this case the 'firstRestlet' from sample module 1.</p> 
    4140 
    42     <p><a href="${publicUri('km:/depTestRestlet2')}">depTestRestlet2</a> -- gets data from 
     41    <p><a href="${publicUri('service:/depTestRestlet2')}">depTestRestlet2</a> -- gets data from 
    4342    an injected rest-service, in this case the XML specification in XML format. This illustrates 
    4443    that injected rest-services can be arbitrary URIs, not only rest-services implemented 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-module1/src/main/java/org/kauriproject/samples/samplemodule1/MySecondRestlet.java

    r279 r748  
    1717 
    1818    public void handle(Request request, Response response) { 
    19         Reference reference = new Reference("km:/firstRestlet"); 
     19        Reference reference = new Reference("service:/firstRestlet"); 
    2020        Response otherResponse = getContext().getClientDispatcher().get(reference); 
    2121        String text; 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-module1/src/main/java/org/kauriproject/samples/samplemodule1/MyThirdRestlet.java

    r279 r748  
    1616 
    1717    public void handle(Request request, Response response) { 
    18         Reference reference = new Reference("kms:/resources/helloworld.txt"); 
     18        Reference reference = new Reference("module:/resources/helloworld.txt"); 
    1919        Response otherResponse = getContext().getClientDispatcher().get(reference); 
    2020        Representation representation = otherResponse.getEntity(); 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-module2/src/main/kauri/spring/runtime-sample-module2-beans.xml

    r279 r748  
    2424  <bean id="depTestRestlet1" class="org.kauriproject.samples.samplemodule2.DependencyTestRestlet"> 
    2525    <constructor-arg ref="restletContext"/> 
    26     <constructor-arg value="km:/testdep1"/> 
     26    <constructor-arg value="service:/testdep1"/> 
    2727  </bean> 
    2828 
    2929  <bean id="depTestRestlet2" class="org.kauriproject.samples.samplemodule2.DependencyTestRestlet"> 
    3030    <constructor-arg ref="restletContext"/> 
    31     <constructor-arg value="km:/testdep2"/> 
     31    <constructor-arg value="service:/testdep2"/> 
    3232  </bean> 
    3333 

  • trunk/samples/kauri-template-sample/src/main/java/org/kauriproject/samples/template/TemplateRestlet.java

    r645 r748  
    3333public class TemplateRestlet extends Restlet { 
    3434 
    35     private static final String SAMPLE_TEMPLATE_LOC = "kms:/public/helloworld.xml"; 
     35    private static final String SAMPLE_TEMPLATE_LOC = "module:/public/helloworld.xml"; 
    3636 
    3737    private TemplateService templateService; 

  • trunk/samples/kauri-template-sample/src/main/java/org/kauriproject/samples/template/TemplateRestlet2.java

    r281 r748  
    3636    private static final Pattern REQ_SRC_PATTERN = Pattern.compile("^/([^\\?.]*)(\\.[^\\?]*)?(.*)$"); 
    3737 
    38     private static final String TEMPLATE_BASE = "kms:/public/"; 
     38    private static final String TEMPLATE_BASE = "module:/public/"; 
    3939    private static final String TEMPLATE_EXT = ".xml"; 
    4040 

  • trunk/samples/kauri-template-sample/src/main/kauri/public/helloworld.xml

    r696 r748  
    1010  </head> 
    1111  <body> 
    12     <ktl:include src="kms:/public/header.xml"/> 
     12    <ktl:include src="module:/public/header.xml"/> 
    1313    <h1>Hello World</h1> 
    1414    <p> 
    … …  
    2626    </div> 
    2727    <ktl:insert src="snip.xml"/> 
    28     <ktl:insert src="kms:/public/snip2.xml" /> 
     28    <ktl:insert src="module:/public/snip2.xml" /> 
    2929    <ktl:insert src="snip.txt" /> 
    30     <p><b>The publicUri of km:/templateRestlet2/helloworld is  
    31     ${publicUri("km:/templateRestlet2/helloworld")} !</b></p> 
     30    <p><b>The publicUri of service:/templateRestlet2/helloworld is 
     31    ${publicUri("service:/templateRestlet2/helloworld")} !</b></p> 
    3232    <!--  
    3333    <div> 

  • trunk/samples/kauri-template-sample/src/main/kauri/public/index.xml

    r695 r748  
    3131      catches the response to return it to Restlet.</p> 
    3232 
    33     <p><a href="${publicUri('km:/templateRestlet')}">A template</a>. Look at the <a href="${publicUri('km:/templateRestlet?_raw=true')}">template source code</a>.</p> 
     33    <p><a href="${publicUri('service:/templateRestlet')}">A template</a>. Look at the <a href="${publicUri('service:/templateRestlet?_raw=true')}">template source code</a>.</p> 
    3434 
    3535    <h2>TemplateRestlet2</h2> 
    … …  
    3939      generation. This is the more common approach.</p> 
    4040 
    41     <p><a href="${publicUri('km:/templateRestlet2/helloworld')}">Template helloworld</a></p> 
     41    <p><a href="${publicUri('service:/templateRestlet2/helloworld')}">Template helloworld</a></p> 
    4242 
    43     <p><a href="${publicUri('km:/templateRestlet2/request.xml')}">Template request</a></p> 
     43    <p><a href="${publicUri('service:/templateRestlet2/request.xml')}">Template request</a></p> 
    4444 
    45     <p><a href="${publicUri('km:/templateRestlet2/response.xml')}">Template response</a></p> 
     45    <p><a href="${publicUri('service:/templateRestlet2/response.xml')}">Template response</a></p> 
    4646     
    4747    <h3>Template inheritance</h3> 
    4848     
    49     <p><a href="${publicUri('km:/templateRestlet2/skeleton')}">Base template</a></p> 
     49    <p><a href="${publicUri('service:/templateRestlet2/skeleton')}">Base template</a></p> 
    5050     
    51     <p><a href="${publicUri('km:/templateRestlet2/page')}">Page inheriting from base</a></p> 
     51    <p><a href="${publicUri('service:/templateRestlet2/page')}">Page inheriting from base</a></p> 
    5252     
    53     <p><a href="${publicUri('km:/templateRestlet2/page_with_notes')}">multiple inheritance: adding notes to previous page</a></p> 
     53    <p><a href="${publicUri('service:/templateRestlet2/page_with_notes')}">multiple inheritance: adding notes to previous page</a></p> 
    5454 
    5555    <h3>Sample of a template using data from request parameters</h3> 
    5656    <p>This is a very plain HTML form, not a demo of Kauri's Ajax form features!</p> 
    5757    <p> 
    58       <form action="${publicUri('km:/templateRestlet2/person.xml')}" method="GET"> 
     58      <form action="${publicUri('service:/templateRestlet2/person.xml')}" method="GET"> 
    5959        <fieldset> 
    6060          <legend>Personal information</legend> 

  • trunk/samples/kauri-template-sample/src/main/kauri/public/page.xml

    r695 r748  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <html xmlns:ktl="http://kauriproject.org/template" ktl:inherit="kms:/public/skeleton.xml"> 
     2<html xmlns:ktl="http://kauriproject.org/template" ktl:inherit="module:/public/skeleton.xml"> 
    33    <head> 
    44        <title>child inheriting from base</title> 

  • trunk/samples/kauri-template-sample/src/main/kauri/public/page_with_notes.xml

    r695 r748  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <html xmlns:ktl="http://kauriproject.org/template" ktl:inherit="kms:/public/page.xml"> 
     2<html xmlns:ktl="http://kauriproject.org/template" ktl:inherit="module:/public/page.xml"> 
    33    <head> 
    44        <title>adding notes to existing page</title> 

  • trunk/samples/kauri-template-sample/src/main/kauri/router.groovy

    r692 r748  
    22 
    33builder.router { 
    4     directory(uri: "/resources", root: "kms:/resources/") 
     4    directory(uri: "/resources", root: "module:/resources/") 
    55     
    6     template(uri: "/", template: "kms:/public/index.xml", 
     6    template(uri: "/", template: "module:/public/index.xml", 
    77            mediaType: "text/html", postAttach : { route -> route.getTemplate().setMatchingMode(Template.MODE_STARTS_WITH) }) 
    88     

  • trunk/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/archetype-resources/module1/src/main/kauri/representations.groovy

    r475 r748  
    1414    select { 
    1515        when(name: "{name:**}") { 
    16             template(src: "kms:/templates/{name}.xml") 
     16            template(src: "module:/templates/{name}.xml") 
    1717        } 
    1818    } 

  • trunk/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/archetype-resources/module1/src/main/kauri/router.groovy

    r443 r748  
    44            uri: "/", 
    55            match: "equals", 
    6             template: "kms:/templates/index.xml", 
     6            template: "module:/templates/index.xml", 
    77            mediaType: "text/html"             
    88    ) 
    99 
    10     directory(uri: "/resources", root: "kms:/resources/") 
     10    directory(uri: "/resources", root: "module:/resources/") 
    1111 
    1212    jaxRs(uri: "") { 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/pages/index.html.xml

    r689 r748  
    1616         useful when linking to other modules. 
    1717    --> 
    18     <p><a href="${publicUri('km:/router/persons/1.html')}">View person</a></p> 
     18    <p><a href="${publicUri('service:/router/persons/1.html')}">View person</a></p> 
    1919  </body> 
    2020</html> 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/pages/persons/{id}.html.xml

    r689 r748  
    55       supplied from the resource class (PersonResource). 
    66       --> 
    7   <t:variable name="person" src="km:/data/persons/${request.attributes.id}.json" overwrite="false"/> 
     7  <t:variable name="person" src="service:/data/persons/${request.attributes.id}.json" overwrite="false"/> 
    88 
    99  <head> 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/representations.groovy

    r689 r748  
    1414    select { 
    1515        when(name: "{name:**}") { 
    16             template(src: "kms:/pages/{name}.html.xml") 
     16            template(src: "module:/pages/{name}.html.xml") 
    1717        } 
    1818    } 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/router.groovy

    r689 r748  
    33     * Static resources. 
    44     */ 
    5     directory(uri: "/resources", root: "kms:/resources/") 
     5    directory(uri: "/resources", root: "module:/resources/") 
    66 
    77    /* 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/spring/production/module1-production-beans.xml

    r689 r748  
    1919  <bean id="data" class="org.restlet.Directory"> 
    2020    <constructor-arg ref="restletContext"/> 
    21     <constructor-arg value="kms:/mockdata/"/> 
     21    <constructor-arg value="module:/mockdata/"/> 
    2222  </bean> 
    2323  <kauri:export-restservice ref="data"/> 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/src/main/kauri/spring/prototype/module1-prototype-beans.xml

    r689 r748  
    1717  <bean id="data" class="org.restlet.Directory"> 
    1818    <constructor-arg ref="restletContext"/> 
    19     <constructor-arg value="kms:/mockdata/"/> 
     19    <constructor-arg value="module:/mockdata/"/> 
    2020  </bean> 
    2121  <kauri:export-restservice ref="data"/> 
Note: See TracChangeset for help on using the changeset viewer.