Changeset 1526


Ignore:
Timestamp:
2010-05-05 14:18:05 (3 years ago)
Author:
jgou
Message:

changes to kauri modules due to upgrade restlet; see #313

Location:
trunk/modules
Files:
35 edited

Legend:

Unmodified
Added
Removed

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

    r1358 r1526  
    2222import org.apache.commons.logging.Log; 
    2323import org.apache.commons.logging.LogFactory; 
     24import org.kauriproject.dbresources.DbRequest; 
    2425import org.kauriproject.dbresources.jpa.serialization.Serializer; 
    25 import org.kauriproject.dbresources.DbRequest; 
    2626import org.kauriproject.util.io.IOUtils; 
    2727import org.restlet.Context; 
    28 import org.restlet.data.*; 
     28import org.restlet.Request; 
     29import org.restlet.Response; 
     30import org.restlet.data.CharacterSet; 
     31import org.restlet.data.MediaType; 
     32import org.restlet.data.Status; 
    2933import org.restlet.ext.json.JsonRepresentation; 
    3034import org.restlet.ext.xml.DomRepresentation; 
    3135import org.restlet.representation.ObjectRepresentation; 
    3236import org.restlet.representation.Representation; 
    33 import org.restlet.resource.Resource; 
    3437import org.restlet.representation.StringRepresentation; 
    3538import org.restlet.representation.Variant; 
     39import org.restlet.resource.Resource; 
    3640import org.springframework.transaction.TransactionSystemException; 
    3741 

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

    r1327 r1526  
    1616package org.kauriproject.dbresources.jpa; 
    1717 
     18import org.kauriproject.dbresources.DbRequest; 
     19import org.kauriproject.dbresources.DbRequestBuilder; 
    1820import org.restlet.Context; 
     21import org.restlet.Request; 
     22import org.restlet.Response; 
     23import org.restlet.data.Form; 
     24import org.restlet.data.Method; 
     25import org.restlet.data.Status; 
    1926import org.restlet.resource.Finder; 
    2027import org.restlet.resource.Handler; 
    21 import org.restlet.data.*; 
    22 import org.kauriproject.dbresources.DbRequestBuilder; 
    23 import org.kauriproject.dbresources.DbRequest; 
    2428 
    2529/** 

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

    r908 r1526  
    1717 
    1818import org.restlet.Context; 
     19import org.restlet.Request; 
     20import org.restlet.Response; 
    1921import org.restlet.Restlet; 
    20 import org.restlet.data.Request; 
    21 import org.restlet.data.Response; 
    2222 
    2323public class JpaRestlet extends Restlet { 

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

    r1327 r1526  
    2020import java.util.List; 
    2121 
     22import javax.annotation.PreDestroy; 
     23 
    2224import net.sf.json.JSON; 
    2325 
    … …  
    2628import org.kauriproject.dbresources.DbRequest; 
    2729import org.kauriproject.dbresources.DbRequestBuilder; 
     30import org.kauriproject.dbresources.DbRequest.PathSegment; 
    2831import org.kauriproject.dbresources.DbRequest.QueryPart; 
    29 import org.kauriproject.dbresources.DbRequest.PathSegment; 
    3032import org.kauriproject.runtime.rapi.KauriModule; 
    3133import org.restlet.Context; 
     34import org.restlet.Request; 
     35import org.restlet.Response; 
     36import org.restlet.data.Form; 
    3237import org.restlet.resource.Finder; 
    3338import org.restlet.resource.Handler; 
    34 import org.restlet.data.Request; 
    35 import org.restlet.data.Response; 
    36 import org.restlet.data.Form; 
    37  
    38 import javax.annotation.PreDestroy; 
    3939 
    4040/** 

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

    r1512 r1526  
    3636import java.io.FileNotFoundException; 
    3737import java.io.IOException; 
    38 import java.io.Serializable; 
    3938import java.util.Iterator; 
    4039import java.util.List; 
    … …  
    5150import org.apache.commons.logging.Log; 
    5251import org.apache.commons.logging.LogFactory; 
     52import org.kauriproject.dbresources.DbRequest; 
    5353import org.restlet.Context; 
    54 import org.restlet.data.Request; 
    55 import org.restlet.data.Response; 
     54import org.restlet.Request; 
     55import org.restlet.Response; 
     56import org.restlet.data.Method; 
    5657import org.restlet.data.Status; 
    57 import org.restlet.data.Method; 
    5858import org.restlet.ext.json.JsonRepresentation; 
    5959import org.restlet.representation.Representation; 
    6060import org.restlet.resource.Resource; 
    61 import org.kauriproject.dbresources.DbRequest; 
    6261 
    6362/** 
    … …  
    309308 
    310309            if (uri != null) { 
    311                 Response response = owner.handle(new Request(Method.GET, uri)); 
     310                Request request = new Request(Method.GET, uri); 
     311                Response response = new Response(request); 
     312                owner.handle(request, response); 
    312313                if (response.getStatus().equals(Status.SUCCESS_OK)) { 
    313314                    Representation representation = response.getEntity(); 

  • trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/test/java/org/kauriproject/dbresources/test/JpaTest.java

    r1339 r1526  
    2424import org.json.JSONObject; 
    2525import org.kauriproject.dbresources.test.po.Dummy; 
    26 import org.kauriproject.runtime.model.*; 
     26import org.kauriproject.runtime.model.ClientConnectorDefinition; 
     27import org.kauriproject.runtime.model.KauriRuntimeModel; 
     28import org.kauriproject.runtime.model.ModuleDefinition; 
     29import org.kauriproject.runtime.model.ModuleSourceType; 
     30import org.kauriproject.runtime.model.MountDefinition; 
     31import org.kauriproject.runtime.model.ServerConnectorDefinition; 
    2732import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
    2833import org.restlet.Client; 
    2934import org.restlet.Context; 
     35import org.restlet.Request; 
     36import org.restlet.Response; 
    3037import org.restlet.data.ClientInfo; 
    3138import org.restlet.data.MediaType; 
    … …  
    3441import org.restlet.data.Protocol; 
    3542import org.restlet.data.Reference; 
    36 import org.restlet.data.Request; 
    37 import org.restlet.data.Response; 
    3843import org.restlet.data.Status; 
    3944import org.restlet.ext.json.JsonRepresentation; 
    … …  
    112117    public void testGet() throws Exception { 
    113118        // request to unknown entity 
    114         Response response = client.get(makeTestReference("/xyz")); 
     119        Response response = client.handle(new Request(Method.GET,makeTestReference("/xyz"))); 
    115120        assertNotNull("no response received", response); 
    116121        assertEquals("GET on unknown entity should give 404.", Status.CLIENT_ERROR_NOT_FOUND, response.getStatus()); 
    117122 
    118123        // request to known entity - list 
    119         response = client.get(makeTestReference("/dummy?media=json")); 
     124        response = client.handle(new Request(Method.GET,makeTestReference("/dummy?media=json"))); 
    120125        assertNotNull("no response received", response); 
    121126        assertFalse("Response for existing entity contains error", response.getStatus().isError()); 
    … …  
    125130 
    126131        // request to known, but non-existing, entity 
    127         response = client.get(makeTestReference("/dummy/1")); 
     132        response = client.handle(new Request(Method.GET,makeTestReference("/dummy/1"))); 
    128133        assertNotNull("no response received", response); 
    129134        assertEquals("Get on non-existant entity gives 404", Status.CLIENT_ERROR_NOT_FOUND, response.getStatus()); 
    … …  
    201206    public void testXML() throws Exception { 
    202207        loadStuff(); 
     208 
    203209        ClientInfo info = new ClientInfo(); 
    204210        Preference<MediaType> pref = new Preference<MediaType>(MediaType.APPLICATION_XML); 
    205211        info.getAcceptedMediaTypes().add(pref); 
    206  
    207212        // get XML 
    208213        Request request = new Request(); 
    … …  
    215220        assertTrue("expected an xmlrepresentation", MediaType.APPLICATION_XML.getName().equals( 
    216221                representation.getMediaType().getName())); 
    217         representation.release(); 
     222        //representation.release(); FIXME: bad idea, this makes restlet hang on the following request... 
    218223        // TODO: check some fields 
    219224 
    … …  
    346351        return dummy; 
    347352    } 
     353     
    348354} 

  • trunk/modules/kauri-i18n/kauri-i18n-impl/src/main/java/org/kauriproject/i18n/impl/I18nFilterFactory.java

    r1327 r1526  
    1616package org.kauriproject.i18n.impl; 
    1717 
    18 import org.kauriproject.runtime.rapi.FilterFactory; 
    1918import org.kauriproject.i18n.I18n; 
    2019import org.kauriproject.i18n.I18nManager; 
     20import org.kauriproject.runtime.rapi.FilterFactory; 
     21import org.restlet.Request; 
     22import org.restlet.Response; 
    2123import org.restlet.routing.Filter; 
    22 import org.restlet.data.Request; 
    23 import org.restlet.data.Response; 
    2424 
    2525public class I18nFilterFactory implements FilterFactory { 

  • trunk/modules/kauri-i18n/kauri-i18n-impl/src/main/java/org/kauriproject/i18n/impl/I18nResource.java

    r1340 r1526  
    1616package org.kauriproject.i18n.impl; 
    1717 
    18 import org.restlet.resource.*; 
    19 import org.restlet.data.*; 
     18import java.util.Locale; 
     19import java.util.Map; 
     20 
     21import net.sf.json.JSONObject; 
     22 
     23import org.kauriproject.i18n.I18nManager; 
     24import org.kauriproject.i18n.I18nMessage; 
     25import org.kauriproject.i18n.I18nMessageBundle; 
     26import org.kauriproject.i18n.LocaleHelper; 
     27import org.restlet.data.CharacterSet; 
     28import org.restlet.data.Language; 
     29import org.restlet.data.MediaType; 
    2030import org.restlet.representation.Representation; 
    2131import org.restlet.representation.StringRepresentation; 
    2232import org.restlet.representation.Variant; 
    23 import org.restlet.representation.RepresentationInfo; 
    24 import org.kauriproject.i18n.I18nManager; 
    25 import org.kauriproject.i18n.I18nMessageBundle; 
    26 import org.kauriproject.i18n.I18nMessage; 
    27 import org.kauriproject.i18n.LocaleHelper; 
    28  
    29 import java.util.*; 
    30  
    31 import net.sf.json.JSONObject; 
     33import org.restlet.resource.ResourceException; 
     34import org.restlet.resource.ServerResource; 
    3235 
    3336public class I18nResource extends ServerResource { 
    … …  
    3942        setAnnotated(false); 
    4043 
    41         Map<Method, Object> variants = new HashMap<Method, Object>(); 
    42         variants.put(Method.GET, new RepresentationInfo(MediaType.APPLICATION_JSON)); 
    43         setVariants(variants); 
     44        getVariants().clear(); 
     45        getVariants().add(new Variant(MediaType.APPLICATION_JSON)); 
    4446    } 
    4547 

  • trunk/modules/kauri-i18n/kauri-i18n-impl/src/main/java/org/kauriproject/i18n/impl/I18nRestlet.java

    r1340 r1526  
    1616package org.kauriproject.i18n.impl; 
    1717 
    18 import org.restlet.routing.Router; 
     18import org.kauriproject.i18n.I18nManager; 
    1919import org.restlet.Context; 
     20import org.restlet.Request; 
     21import org.restlet.Response; 
    2022import org.restlet.resource.Finder; 
    2123import org.restlet.resource.ServerResource; 
    22 import org.restlet.util.Template; 
    23 import org.restlet.data.Request; 
    24 import org.restlet.data.Response; 
    25 import org.kauriproject.i18n.I18nManager; 
     24import org.restlet.routing.Router; 
     25import org.restlet.routing.Template; 
    2626 
    2727public class I18nRestlet extends Router { 

  • trunk/modules/kauri-i18n/kauri-i18n-impl/src/test/java/org/kauriproject/i18n/impl/test/I18nTest.java

    r1156 r1526  
    1616package org.kauriproject.i18n.impl.test; 
    1717 
    18 import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
    19 import org.kauriproject.runtime.model.*; 
    20 import org.kauriproject.runtime.KauriRuntimeSettings; 
    21 import org.kauriproject.i18n.I18nManager; 
    22 import org.kauriproject.i18n.I18nMessage; 
    23 import org.kauriproject.util.xml.LocalDocumentBuilderFactory; 
    24 import org.kauriproject.util.xml.XPathUtils; 
    25 import org.restlet.data.*; 
    26 import org.w3c.dom.Document; 
    27  
    2818import java.io.File; 
    2919import java.util.Collections; 
    3020import java.util.Locale; 
    3121 
     22import net.sf.json.JSONArray; 
    3223import net.sf.json.JSONObject; 
    33 import net.sf.json.JSONArray; 
     24 
     25import org.kauriproject.i18n.I18nManager; 
     26import org.kauriproject.i18n.I18nMessage; 
     27import org.kauriproject.runtime.model.ClientConnectorDefinition; 
     28import org.kauriproject.runtime.model.KauriRuntimeModel; 
     29import org.kauriproject.runtime.model.ModuleDefinition; 
     30import org.kauriproject.runtime.model.ModuleSourceType; 
     31import org.kauriproject.runtime.model.MountDefinition; 
     32import org.kauriproject.runtime.model.ServerConnectorDefinition; 
     33import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
     34import org.kauriproject.util.xml.LocalDocumentBuilderFactory; 
     35import org.kauriproject.util.xml.XPathUtils; 
     36import org.restlet.Request; 
     37import org.restlet.Response; 
     38import org.restlet.data.Language; 
     39import org.restlet.data.Method; 
     40import org.restlet.data.Preference; 
     41import org.w3c.dom.Document; 
    3442 
    3543public class I18nTest extends AbstractRuntimeTest { 

  • trunk/modules/kauri-locale-assignment/src/main/java/org/kauriproject/i18n/locale_assignment/LocaleAssignmentFilter.java

    r1407 r1526  
    2424import org.restlet.data.Language; 
    2525import org.restlet.data.Preference; 
    26 import org.restlet.data.Request; 
    27 import org.restlet.data.Response; 
     26import org.restlet.Request; 
     27import org.restlet.Response; 
    2828import org.restlet.routing.Filter; 
    2929 

  • trunk/modules/kauri-representation/kauri-representationbuilder-api/src/main/java/org/kauriproject/representation/build/RepresentationFactory.java

    r1317 r1526  
    3636     *                           node itself, or in the KauriRepresentation object. 
    3737     * @param context extensible set of contextual data. At the time of this writing, contains the 
    38      *                following entires: {"restletResponse": org.restlet.data.Response, "kauriModule": 
     38     *                following entires: {"restletResponse": org.restlet.Response, "kauriModule": 
    3939     *                org.kauriproject.runtime.rapi.KauriModule}. Restlet's Context can be useful 
    4040     *                for retrieving resources via its client dispatcher. 

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

    r1342 r1526  
    1616package org.kauriproject.representation.build.impl; 
    1717 
    18 import org.kauriproject.runtime.rapi.FilterFactory; 
     18import java.io.IOException; 
     19import java.io.InputStream; 
     20import java.io.OutputStream; 
     21import java.io.Reader; 
     22import java.io.Writer; 
     23import java.nio.channels.ReadableByteChannel; 
     24import java.nio.channels.WritableByteChannel; 
     25import java.util.Date; 
     26import java.util.List; 
     27 
     28import org.apache.commons.logging.Log; 
     29import org.apache.commons.logging.LogFactory; 
    1930import org.kauriproject.representation.build.KauriRepresentation; 
    2031import org.kauriproject.representation.build.ReprBuilderExecException; 
    2132import org.kauriproject.representation.build.impl.model.RSContext; 
     33import org.kauriproject.runtime.rapi.FilterFactory; 
    2234import org.kauriproject.util.restlet.RestException; 
    23 import org.restlet.routing.Filter; 
     35import org.restlet.Request; 
     36import org.restlet.Response; 
     37import org.restlet.data.CharacterSet; 
     38import org.restlet.data.Encoding; 
     39import org.restlet.data.Form; 
     40import org.restlet.data.Language; 
     41import org.restlet.data.MediaType; 
     42import org.restlet.data.Reference; 
     43import org.restlet.data.Status; 
     44import org.restlet.data.Tag; 
    2445import org.restlet.representation.Representation; 
    2546import org.restlet.representation.StringRepresentation; 
    26 import org.restlet.data.*; 
    27 import org.apache.commons.logging.Log; 
    28 import org.apache.commons.logging.LogFactory; 
    29  
    30 import java.io.*; 
    31 import java.nio.channels.WritableByteChannel; 
    32 import java.nio.channels.ReadableByteChannel; 
    33 import java.util.Date; 
    34 import java.util.List; 
     47import org.restlet.routing.Filter; 
    3548 
    3649/** 

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

    r1332 r1526  
    1616package org.kauriproject.representation.build.impl; 
    1717 
     18import java.io.File; 
     19import java.io.IOException; 
     20import java.io.InputStream; 
     21import java.util.Collections; 
     22import java.util.Map; 
     23 
     24import org.apache.commons.jci.monitor.FilesystemAlterationListener; 
     25import org.apache.commons.jci.monitor.FilesystemAlterationObserver; 
     26import org.apache.commons.logging.Log; 
     27import org.apache.commons.logging.LogFactory; 
     28import org.kauriproject.representation.build.RepresentationFactory; 
     29import org.kauriproject.representation.build.impl.groovy.RSBuilder; 
     30import org.kauriproject.representation.build.impl.model.CaseNode; 
     31import org.kauriproject.representation.build.impl.model.ExceptionCaseNode; 
     32import org.kauriproject.representation.build.impl.model.ExceptionSelectNode; 
     33import org.kauriproject.representation.build.impl.model.RSContext; 
     34import org.kauriproject.representation.build.impl.model.RepresentationNode; 
     35import org.kauriproject.representation.build.impl.model.Representations; 
     36import org.kauriproject.representation.build.impl.model.SelectNode; 
    1837import org.kauriproject.runtime.rapi.KauriModule; 
    1938import org.kauriproject.runtime.rapi.ModuleSource; 
    20 import org.kauriproject.representation.build.impl.model.*; 
    21 import org.kauriproject.representation.build.impl.groovy.RSBuilder; 
    22 import org.kauriproject.representation.build.RepresentationFactory; 
    2339import org.kauriproject.util.io.IOUtils; 
     40import org.restlet.Response; 
     41import org.restlet.data.MediaType; 
     42import org.restlet.data.Status; 
    2443import org.restlet.representation.StringRepresentation; 
    25 import org.restlet.data.*; 
    26 import org.apache.commons.logging.Log; 
    27 import org.apache.commons.logging.LogFactory; 
    28 import org.apache.commons.jci.monitor.FilesystemAlterationListener; 
    29 import org.apache.commons.jci.monitor.FilesystemAlterationObserver; 
    30  
    31 import java.util.Map; 
    32 import java.util.Collections; 
    33 import java.io.InputStream; 
    34 import java.io.IOException; 
    35 import java.io.File; 
    3644 
    3745/** 

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

    r1317 r1526  
    1010import org.kauriproject.representation.build.impl.model.RepresentationNode; 
    1111import org.kauriproject.util.restlet.KauriUriTemplate; 
    12 import org.restlet.util.Template; 
     12import org.restlet.routing.Template; 
    1313import org.restlet.data.MediaType; 
    1414 

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

    r1014 r1526  
    1616package org.kauriproject.representation.build.impl.model; 
    1717 
    18 import org.restlet.util.Template; 
     18import org.restlet.routing.Template; 
    1919import org.kauriproject.util.restlet.KauriUriTemplate; 
    2020 

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

    r1317 r1526  
    1818import org.restlet.data.MediaType; 
    1919import org.restlet.representation.Representation; 
    20 import org.restlet.util.Template; 
     20import org.restlet.routing.Template; 
    2121import org.kauriproject.representation.build.RepresentationFactory; 
    2222 

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

    r1317 r1526  
    1818import org.kauriproject.runtime.rapi.KauriModule; 
    1919import org.restlet.representation.Representation; 
    20 import org.restlet.data.Response; 
     20import org.restlet.Response; 
    2121import org.restlet.data.Status; 
    2222import org.restlet.data.MediaType; 

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

    r1317 r1526  
    88import org.restlet.representation.Representation; 
    99import org.restlet.data.MediaType; 
    10 import org.restlet.data.Response; 
     10import org.restlet.data.Method; 
     11import org.restlet.Request; 
     12import org.restlet.Response; 
    1113import org.restlet.Context; 
    1214 
    … …  
    4749        Context restletContext = kauriModule.getRestletContext(); 
    4850 
    49         Response response = ResponseUtil.handleNotOkResponse(restletContext.getClientDispatcher().get(src)); 
     51        Response response = ResponseUtil.handleNotOkResponse(restletContext.getClientDispatcher().handle(new Request(Method.GET, src))); 
    5052        Representation representation = response.getEntity(); 
    5153        if (suggestedMediaType != null) { 

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

    r1317 r1526  
    88import org.restlet.representation.Representation; 
    99import org.restlet.data.MediaType; 
    10 import org.restlet.data.Response; 
     10import org.restlet.Response; 
    1111 
    1212import java.util.List; 

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

    r1327 r1526  
    1616package org.kauriproject.representation.test; 
    1717 
     18import java.io.InputStream; 
     19import java.util.Collections; 
     20import java.util.HashMap; 
     21import java.util.List; 
     22import java.util.Map; 
     23 
    1824import junit.framework.TestCase; 
     25 
     26import org.kauriproject.representation.build.RepresentationFactory; 
    1927import org.kauriproject.representation.build.impl.groovy.RSBuilder; 
     28import org.kauriproject.representation.build.impl.model.RSContext; 
    2029import org.kauriproject.representation.build.impl.model.Representations; 
    21 import org.kauriproject.representation.build.impl.model.RSContext; 
    22 import org.kauriproject.representation.build.RepresentationFactory; 
    2330import org.kauriproject.representation.build.representations.ResourceReprNodeFactory; 
    24 import org.kauriproject.runtime.rapi.*; 
    25 import org.restlet.Context; 
     31import org.kauriproject.runtime.rapi.ConfRegistry; 
     32import org.kauriproject.runtime.rapi.FilterFactory; 
     33import org.kauriproject.runtime.rapi.KauriModule; 
     34import org.kauriproject.runtime.rapi.Mode; 
     35import org.kauriproject.runtime.rapi.ModuleSource; 
     36import org.kauriproject.runtime.rapi.RestserviceInfo; 
    2637import org.restlet.Application; 
    2738import org.restlet.Client; 
     39import org.restlet.Context; 
     40import org.restlet.Request; 
     41import org.restlet.Response; 
     42import org.restlet.data.MediaType; 
     43import org.restlet.data.Protocol; 
     44import org.restlet.data.Status; 
    2845import org.restlet.representation.InputRepresentation; 
    29 import org.restlet.data.*; 
    3046import org.springframework.context.ApplicationContext; 
    31  
    32 import java.io.InputStream; 
    33 import java.util.List; 
    34 import java.util.Map; 
    35 import java.util.HashMap; 
    36 import java.util.Collections; 
    3747 
    3848public class BuilderTest extends TestCase { 

  • trunk/modules/kauri-template/kauri-template-service-api/src/main/java/org/kauriproject/template/service/TemplateService.java

    r1107 r1526  
    2222import org.restlet.representation.Representation; 
    2323import org.restlet.data.MediaType; 
    24 import org.restlet.data.Request; 
    25 import org.restlet.data.Response; 
     24import org.restlet.Request; 
     25import org.restlet.Response; 
    2626 
    2727/** 

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

    r1259 r1526  
    1616package org.kauriproject.template.service.impl; 
    1717 
    18 import org.kauriproject.runtime.rapi.KauriModule; 
    19 import org.kauriproject.template.source.SourceResolver; 
    20 import org.kauriproject.template.ExecutionContext; 
     18import java.util.Locale; 
     19 
     20import org.apache.commons.jxpath.JXPathContext; 
     21import org.apache.commons.logging.Log; 
     22import org.apache.commons.logging.LogFactory; 
     23import org.kauriproject.conf.Conf; 
    2124import org.kauriproject.i18n.I18nManager; 
    2225import org.kauriproject.i18n.I18nMessage; 
    2326import org.kauriproject.i18n.LocaleSettings; 
    24 import org.kauriproject.conf.Conf; 
    25 import org.apache.commons.logging.Log; 
    26 import org.apache.commons.logging.LogFactory; 
    27 import org.apache.commons.jxpath.JXPathContext; 
    28 import org.restlet.data.Request; 
    29  
    30 import java.util.Locale; 
     27import org.kauriproject.runtime.rapi.KauriModule; 
     28import org.kauriproject.template.ExecutionContext; 
     29import org.kauriproject.template.source.SourceResolver; 
     30import org.restlet.Request; 
    3131 
    3232/** 

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

    r1417 r1526  
    1616package org.kauriproject.template.service.impl; 
    1717 
     18import java.util.ArrayList; 
     19import java.util.Collections; 
     20import java.util.List; 
     21 
     22import org.kauriproject.runtime.rapi.KauriModule; 
    1823import org.kauriproject.template.source.Source; 
    1924import org.kauriproject.template.source.SourceResolver; 
    2025import org.kauriproject.util.restlet.ResponseUtil; 
    21 import org.kauriproject.runtime.rapi.KauriModule; 
    22 import org.restlet.data.*; 
    23  
    24 import java.util.List; 
    25 import java.util.Collections; 
    26 import java.util.ArrayList; 
     26import org.restlet.Request; 
     27import org.restlet.Response; 
     28import org.restlet.data.MediaType; 
     29import org.restlet.data.Method; 
     30import org.restlet.data.Preference; 
     31import org.restlet.data.Reference; 
    2732 
    2833/** 

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

    r1107 r1526  
    2323import org.restlet.Context; 
    2424import org.restlet.data.MediaType; 
    25 import org.restlet.data.Response; 
     25import org.restlet.Response; 
    2626import org.restlet.representation.OutputRepresentation; 
    2727 

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

    r1123 r1526  
    3434import org.restlet.Context; 
    3535import org.restlet.data.MediaType; 
    36 import org.restlet.data.Request; 
    37 import org.restlet.data.Response; 
     36import org.restlet.Request; 
     37import org.restlet.Response; 
    3838import org.restlet.representation.Representation; 
    3939import org.springframework.security.Authentication; 

  • trunk/modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/TemplateConfTest.java

    r1058 r1526  
    66import org.kauriproject.runtime.configuration.ConfManagerImpl; 
    77import org.kauriproject.util.xml.XPathUtils; 
    8 import org.restlet.data.Response; 
     8import org.restlet.Request; 
     9import org.restlet.Response; 
     10import org.restlet.data.Method; 
    911import org.w3c.dom.Document; 
    1012 
    … …  
    5557 
    5658    private Response testRequest(String path) throws Exception { 
    57         Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().get("http://localhost:" + HTTP_TEST_PORT + path); 
     59        Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().handle(new Request(Method.GET, "http://localhost:" + HTTP_TEST_PORT + path)); 
    5860        assertEquals(200, response.getStatus().getCode()); 
    5961        return response; 

  • trunk/modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/TemplateServiceHostIdentifierTest.java

    r1058 r1526  
    1818import org.kauriproject.runtime.model.*; 
    1919import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
    20 import org.restlet.data.Response; 
     20import org.restlet.Request; 
     21import org.restlet.Response; 
     22import org.restlet.data.Method; 
    2123import org.w3c.dom.Document; 
    2224import org.w3c.dom.Node; 
    … …  
    7274 
    7375    private Response testRequest(String path) throws Exception { 
    74         Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().get("http://localhost:" + HTTP_TEST_PORT + path); 
     76        Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().handle(new Request(Method.GET, "http://localhost:" + HTTP_TEST_PORT + path)); 
    7577        assertEquals(200, response.getStatus().getCode()); 
    7678        return response; 

  • trunk/modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/TemplateUriResolvingTest.java

    r1058 r1526  
    1616package org.kauriproject.template.service.test; 
    1717 
    18 import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
    19 import org.kauriproject.runtime.model.*; 
    20 import org.kauriproject.util.xml.XPathUtils; 
    21 import org.restlet.data.Response; 
    22 import org.w3c.dom.Document; 
    23 import org.w3c.dom.Node; 
    24 import org.xml.sax.SAXException; 
     18import java.io.File; 
     19import java.io.IOException; 
     20import java.util.Collections; 
    2521 
    2622import javax.xml.parsers.DocumentBuilderFactory; 
    2723import javax.xml.parsers.ParserConfigurationException; 
    28 import javax.xml.xpath.XPathFactory; 
    29 import javax.xml.xpath.XPath; 
    30 import javax.xml.xpath.XPathConstants; 
    31 import javax.xml.xpath.XPathExpressionException; 
    32 import java.io.File; 
    33 import java.io.IOException; 
    34 import java.util.Collections; 
     24 
     25import org.kauriproject.runtime.model.ClientConnectorDefinition; 
     26import org.kauriproject.runtime.model.KauriRuntimeModel; 
     27import org.kauriproject.runtime.model.ModuleDefinition; 
     28import org.kauriproject.runtime.model.ModuleSourceType; 
     29import org.kauriproject.runtime.model.MountDefinition; 
     30import org.kauriproject.runtime.model.RestserviceInjectDefinition; 
     31import org.kauriproject.runtime.model.ServerConnectorDefinition; 
     32import org.kauriproject.runtime.testfw.AbstractRuntimeTest; 
     33import org.kauriproject.util.xml.XPathUtils; 
     34import org.restlet.Request; 
     35import org.restlet.Response; 
     36import org.restlet.data.Method; 
     37import org.w3c.dom.Document; 
     38import org.xml.sax.SAXException; 
    3539 
    3640public class TemplateUriResolvingTest extends AbstractRuntimeTest { 
    … …  
    143147 
    144148    private Response testRequest(String path) throws Exception { 
    145         Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().get("http://localhost:" + HTTP_TEST_PORT + path); 
     149        Response response = runtime.getRestserviceManager().getComponent().getContext().getClientDispatcher().handle(new Request(Method.GET, "http://localhost:" + HTTP_TEST_PORT + path)); 
    146150        assertEquals(200, response.getStatus().getCode()); 
    147151        return response; 

  • trunk/modules/kauri-template/kauri-template-service-impl/src/test/java/org/kauriproject/template/service/test/testmodules/common/Templates.java

    r1020 r1526  
    1818import org.restlet.Restlet; 
    1919import org.restlet.Context; 
    20 import org.restlet.data.Request; 
    21 import org.restlet.data.Response; 
     20import org.restlet.Request; 
     21import org.restlet.Response; 
    2222import org.restlet.data.MediaType; 
    2323import org.restlet.data.Status; 

  • trunk/modules/kauri-tmprsrc/src/main/java/org/kauriproject/rsrc/store/BasicRepresentationStore.java

    r1389 r1526  
    33import org.restlet.Client; 
    44import org.restlet.Context; 
     5import org.restlet.Request; 
     6import org.restlet.data.Method; 
    57import org.restlet.data.Reference; 
    6 import org.restlet.data.Response; 
     8import org.restlet.Response; 
    79import org.restlet.representation.Representation; 
    810 
    … …  
    3234    public String create(final Representation item) { 
    3335        final Reference ref = new Reference(serviceRoot); 
    34         final Response response = service().post(ref, item); 
     36        final Response response = service().handle(new Request(Method.POST, ref, item)); 
    3537        if (!response.getStatus().isSuccess()) 
    3638        throw new RuntimeException( "POST to store at " + ref.toString() + " failed with status " + response.getStatus().getCode(),  
    … …  
    5153    public Representation get(final String key) { 
    5254        final Reference ref = key2serviceReference(key); 
    53         final Response response = service().get(ref); 
     55        final Response response = service().handle(new Request(Method.GET, ref)); 
    5456        if (!response.getStatus().isSuccess()) 
    5557            return null; //TODO we might want to take a closer look into the actual errors! 
    … …  
    5961    public Representation delete(final String key) { 
    6062        final Reference ref = key2serviceReference(key); 
    61         final Response response = service().delete(ref); 
     63        final Response response = service().handle(new Request(Method.DELETE, ref)); 
    6264        if (!response.getStatus().isSuccess()) 
    6365            return null; //TODO we might want to take a closer look into the actual errors! 
    … …  
    6769    public Representation put(final String key, final Representation item) { 
    6870        final Reference ref = key2serviceReference(key); 
    69         final Response response = service().put(ref, item); 
     71        final Response response = service().handle(new Request(Method.PUT, ref, item)); 
    7072        if (!response.getStatus().isSuccess()) 
    7173            throw new RuntimeException(response.getStatus().getDescription()); 

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

    r1398 r1526  
    55import org.kauriproject.rsrc.lease.LeaseExpiryException; 
    66import org.restlet.Context; 
    7 import org.restlet.data.Request; 
    8 import org.restlet.data.Response; 
     7import org.restlet.Request; 
     8import org.restlet.Response; 
    99import org.restlet.data.Status; 
    1010import org.restlet.representation.Representation; 

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

    r1391 r1526  
    33import org.kauriproject.rsrc.lease.LeaseExpiryException; 
    44import org.restlet.Context; 
    5 import org.restlet.data.Request; 
    6 import org.restlet.data.Response; 
     5import org.restlet.Request; 
     6import org.restlet.Response; 
    77import org.restlet.data.Status; 
    88import org.restlet.representation.Representation; 

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

    r1492 r1526  
    33import org.kauriproject.rsrc.lease.LeaseExpiryException; 
    44import org.restlet.Context; 
    5 import org.restlet.data.Request; 
    6 import org.restlet.data.Response; 
     5import org.restlet.Request; 
     6import org.restlet.Response; 
    77import org.restlet.data.Status; 
    88import org.restlet.representation.Representation; 

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

    r1402 r1526  
    1212import org.restlet.data.CharacterSet; 
    1313import org.restlet.data.MediaType; 
    14 import org.restlet.data.Request; 
    15 import org.restlet.data.Response; 
     14import org.restlet.Request; 
     15import org.restlet.Response; 
    1616import org.restlet.data.Status; 
    1717import org.restlet.ext.fileupload.RestletFileUpload; 
Note: See TracChangeset for help on using the changeset viewer.