Changeset 2953

Show
Ignore:
Timestamp:
02/08/07 22:16:23 (5 years ago)
Author:
michael
Message:

Upgrade to Restlet 1.0.4.
Fix bug passing the converter instead of the resource to the context.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ivy.xml

    r2915 r2953  
    1616    <dependency org="de.odysseus.juel" name="juel" rev="2.1.0" conf="default"/> 
    1717    <dependency org="sarugo" name="restlet-jpa" rev="latest.${project.status}" conf="restlet,compile->default"/> 
    18     <dependency org="org.restlet" name="org.restlet" rev="1.0.3" conf="restlet,compile->default"/> 
    19     <dependency org="com.noelios.restlet" name="com.noelios.restlet.ext.simple" rev="1.0.3" conf="compile->default"/> 
    20     <dependency org="com.noelios.restlet" name="com.noelios.restlet.ext.net" rev="1.0.3" conf="test->default"/> 
     18    <dependency org="org.restlet" name="org.restlet" rev="1.0.4" conf="restlet,compile->default"/> 
     19    <dependency org="com.noelios.restlet" name="com.noelios.restlet.ext.simple" rev="1.0.4" conf="compile->default"/> 
     20    <dependency org="com.noelios.restlet" name="com.noelios.restlet.ext.net" rev="1.0.4" conf="test->default"/> 
    2121    <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> 
    2222    <dependency org="xmlunit" name="xmlunit" rev="1.0" conf="test->default"/> 

  • trunk/src/main/java/org/sarugo/xtc/restlet/jpa/TemplateConverter.java

    r2946 r2953  
    7676                                        template, mediaType); 
    7777                        templateRepresentation.setVariable("entity", resource.getEntity()); 
    78                         templateRepresentation.setVariable("resource", this); 
     78                        templateRepresentation.setVariable("resource", resource); 
    7979                        return templateRepresentation; 
    8080                } 
    …… 
    9797                        templateRepresentation.setVariable("entities", resource 
    9898                                        .getEntities()); 
    99                         templateRepresentation.setVariable("resource", this); 
     99                        templateRepresentation.setVariable("resource", resource); 
    100100                        return templateRepresentation; 
    101101                }