Changeset 438


Ignore:
Timestamp:
2008-06-27 11:55:59 (5 years ago)
Author:
bruno
Message:

Rename KauriJaxRsRouter? to JaxRsRestlet? to follow rename in restlet codebase (it doesn't only do routing, but also response formatting).
Rename routing config element 'jaxRsRouter' to simply 'jaxRs'.

Location:
trunk
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r437 r438  
    5151 * 
    5252 */ 
    53 public class KauriJaxRsRouter extends Restlet implements DisposableRoutingComponent { 
     53public class KauriJaxRsRestlet extends Restlet implements DisposableRoutingComponent { 
    5454    private String groovyPath; 
    5555    private Set<String> resourcePackages = new HashSet<String>(); 
    … …  
    7171    private final Log log = LogFactory.getLog(getClass().getName()); 
    7272 
    73     public KauriJaxRsRouter(Context context, KauriModule module) { 
     73    public KauriJaxRsRestlet(Context context, KauriModule module) { 
    7474        this.context = context; 
    7575        this.module = module; 

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

    r243 r438  
    4141 
    4242        // Our own factories 
    43         restletBuilder.registerFactory(JaxRsRouterFactory.METHOD_NAME, new JaxRsRouterFactory(context, module, buildContext)); 
     43        restletBuilder.registerFactory(JaxRsRestletFactory.METHOD_NAME, new JaxRsRestletFactory(context, module, buildContext)); 
    4444        restletBuilder.registerFactory(JaxRsClassFactory.JaxRsResourceFactory.METHOD_NAME, new JaxRsClassFactory.JaxRsResourceFactory()); 
    4545        restletBuilder.registerFactory(JaxRsClassFactory.JaxRsProviderFactory.METHOD_NAME, new JaxRsClassFactory.JaxRsProviderFactory()); 

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

    r240 r438  
    22 
    33import org.lpny.groovyrestlet.builder.factory.AbstractFactory; 
    4 import org.kauriproject.routing.impl.components.KauriJaxRsRouter; 
     4import org.kauriproject.routing.impl.components.KauriJaxRsRestlet; 
    55import org.kauriproject.routing.impl.routing.RoutingConfigurationException; 
    66import groovy.util.FactoryBuilderSupport; 
    … …  
    2121        filterAttributes(builder.getContext(), attributes); 
    2222        Object parent = builder.getCurrent(); 
    23         if (parent instanceof KauriJaxRsRouter) { 
    24             KauriJaxRsRouter router = (KauriJaxRsRouter)parent; 
     23        if (parent instanceof KauriJaxRsRestlet) { 
     24            KauriJaxRsRestlet jaxRsRestlet = (KauriJaxRsRestlet)parent; 
    2525            String ofClass = (String)builder.getContext().get(OF_CLASS); 
    2626            if (ofClass != null) 
    27                 addClass(router, ofClass); 
     27                addClass(jaxRsRestlet, ofClass); 
    2828 
    2929            Object scanPackages = builder.getContext().get(SCAN_PACKAGES); 
    3030            if (scanPackages != null) { 
    3131                if (scanPackages instanceof String) { 
    32                     addPackage(router, (String)scanPackages); 
     32                    addPackage(jaxRsRestlet, (String)scanPackages); 
    3333                } else if (scanPackages instanceof List) { 
    3434                    for (Object object : (List)scanPackages) { 
    35                         addPackage(router, object.toString()); 
     35                        addPackage(jaxRsRestlet, object.toString()); 
    3636                    } 
    3737                } else { 
    … …  
    4040            } 
    4141        } else { 
    42             throw new RoutingConfigurationException(getName() + " must be nested inside " + JaxRsRouterFactory.METHOD_NAME); 
     42            throw new RoutingConfigurationException(getName() + " must be nested inside " + JaxRsRestletFactory.METHOD_NAME); 
    4343        } 
    4444 
    … …  
    5656    } 
    5757 
    58     protected abstract void addClass(KauriJaxRsRouter router, String className); 
     58    protected abstract void addClass(KauriJaxRsRestlet jaxRsRestlet, String className); 
    5959 
    60     protected abstract void addPackage(KauriJaxRsRouter router, String packageName); 
     60    protected abstract void addPackage(KauriJaxRsRestlet jaxRsRestlet, String packageName); 
    6161 
    6262    public static class JaxRsResourceFactory extends JaxRsClassFactory { 
    … …  
    6767        } 
    6868 
    69         protected void addClass(KauriJaxRsRouter router, String className) { 
    70             router.addResourceClass(className); 
     69        protected void addClass(KauriJaxRsRestlet jaxRsRestlet, String className) { 
     70            jaxRsRestlet.addResourceClass(className); 
    7171        } 
    7272 
    73         protected void addPackage(KauriJaxRsRouter router, String packageName) { 
    74             router.addResourcePackage(packageName); 
     73        protected void addPackage(KauriJaxRsRestlet jaxRsRestlet, String packageName) { 
     74            jaxRsRestlet.addResourcePackage(packageName); 
    7575        } 
    7676    } 
    … …  
    8383        } 
    8484 
    85         protected void addClass(KauriJaxRsRouter router, String className) { 
    86             router.addProviderClass(className); 
     85        protected void addClass(KauriJaxRsRestlet jaxRsRestlet, String className) { 
     86            jaxRsRestlet.addProviderClass(className); 
    8787        } 
    8888 
    89         protected void addPackage(KauriJaxRsRouter router, String packageName) { 
    90             router.addProviderPackage(packageName); 
     89        protected void addPackage(KauriJaxRsRestlet jaxRsRestlet, String packageName) { 
     90            jaxRsRestlet.addProviderPackage(packageName); 
    9191        } 
    9292    } 

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

    r240 r438  
    22 
    33import org.lpny.groovyrestlet.builder.factory.AbstractFactory; 
    4 import org.kauriproject.routing.impl.components.KauriJaxRsRouter; 
     4import org.kauriproject.routing.impl.components.KauriJaxRsRestlet; 
    55import org.kauriproject.routing.impl.routing.RoutingConfigurationException; 
    66import groovy.util.FactoryBuilderSupport; 
    … …  
    2222        filterAttributes(builder.getContext(), attributes); 
    2323        Object parent = builder.getCurrent(); 
    24         if (parent instanceof KauriJaxRsRouter) { 
    25             KauriJaxRsRouter router = (KauriJaxRsRouter)parent; 
     24        if (parent instanceof KauriJaxRsRestlet) { 
     25            KauriJaxRsRestlet jaxRsRestlet = (KauriJaxRsRestlet)parent; 
    2626            String path = (String)builder.getContext().get(PATH); 
    27             router.setGroovyPath(path); 
     27            jaxRsRestlet.setGroovyPath(path); 
    2828        } else { 
    29             throw new RoutingConfigurationException(getName() + " must be nested inside " + JaxRsRouterFactory.METHOD_NAME); 
     29            throw new RoutingConfigurationException(getName() + " must be nested inside " + JaxRsRestletFactory.METHOD_NAME); 
    3030        } 
    3131 

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

    r436 r438  
    77import org.restlet.Context; 
    88import org.kauriproject.runtime.rapi.KauriModule; 
    9 import org.kauriproject.routing.impl.components.KauriJaxRsRouter; 
     9import org.kauriproject.routing.impl.components.KauriJaxRsRestlet; 
    1010import org.kauriproject.routing.impl.routing.RouterBuildContext; 
    1111import org.lpny.groovyrestlet.builder.factory.RestletFactory; 
    1212 
    13 public class JaxRsRouterFactory extends RestletFactory { 
    14     public static final String METHOD_NAME = "jaxRsRouter"; 
     13public class JaxRsRestletFactory extends RestletFactory { 
     14    public static final String METHOD_NAME = "jaxRs"; 
    1515 
    1616    private Context context; 
    … …  
    1818    private RouterBuildContext buildContext; 
    1919 
    20     public JaxRsRouterFactory(Context context, KauriModule kauriModule, RouterBuildContext buildContext) { 
     20    public JaxRsRestletFactory(Context context, KauriModule kauriModule, RouterBuildContext buildContext) { 
    2121        super(); 
    2222        this.context = context; 
    … …  
    2828            final Object value, final Map attributes) throws InstantiationException, IllegalAccessException 
    2929    { 
    30         KauriJaxRsRouter router = new KauriJaxRsRouter(context, kauriModule); 
    31         buildContext.addDisposable(router); 
    32         return router; 
     30        KauriJaxRsRestlet jaxRsRestlet = new KauriJaxRsRestlet(context, kauriModule); 
     31        buildContext.addDisposable(jaxRsRestlet); 
     32        return jaxRsRestlet; 
    3333    } 
    3434 

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

    r246 r438  
    44    directory(uri: "/resources", root: "kms:/resources/") 
    55 
    6     jaxRsRouter(uri: "") { 
     6    jaxRs(uri: "") { 
    77        jaxRsResource(scanPackages: "*") 
    88        jaxRsProvider(scanPackages: "*") 

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

    r341 r438  
    4545 
    4646                router { 
    47                     jaxRsRouter(uri: "/jaxrs") { 
     47                    jaxRs(uri: "/jaxrs") { 
    4848                        /* Classes can be specified manually like this: 
    4949                        jaxRsResource(ofClass: "boebieba") 

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

    r348 r438  
    1212    directory(uri: "/resources", root: "kms:/resources/") 
    1313 
    14     jaxRsRouter(uri: "") { 
     14    jaxRs(uri: "") { 
    1515        jaxRsResource(scanPackages: "*") 
    1616        jaxRsProvider(scanPackages: "*") 
Note: See TracChangeset for help on using the changeset viewer.