Changeset 1932

Timestamp:

2011-08-18 12:20:05 (9 months ago)

Author:

mpo

Message:

upgrading to current restlet ​revision 7909
and making the necessary changes to our code base to comply

This change should get our ci-build happy again, and fixes #461

Location:

trunk

Files:

• core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/restservice/RestserviceFacet.java (modified) (4 diffs)
• modules/kauri-representation/kauri-representationbuilder-impl/src/main/java/org/kauriproject/representation/build/impl/RepresentationFilterFactory.java (modified) (2 diffs)
• pom.xml (modified) (1 diff)

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

@@ -33 +33 @@
 import org.kauriproject.runtime.module.Module;
 import org.kauriproject.runtime.rapi.FilterFactory;
-import org.kauriproject.runtime.rapi.KauriModule;
 import org.kauriproject.runtime.rapi.ModuleSource;
 import org.kauriproject.runtime.rapi_impl.KauriModuleImpl;
@@ -41 +40 @@
 import org.restlet.Response;
 import org.restlet.Restlet;
-import org.restlet.data.Form;
 import org.restlet.data.MediaType;
 import org.restlet.data.Protocol;
@@ -47 +45 @@
 import org.restlet.data.ReferenceList;
 import org.restlet.data.Status;
+import org.restlet.engine.header.Header;
 import org.restlet.routing.TemplateRoute;
 import org.restlet.service.MetadataService;
+import org.restlet.util.Series;
 
 /**
@@ -136 +136 @@
 
     private void addModuleInfoHeader(Response response) {
-        Form responseHeaders = (Form) response.getAttributes().get("org.restlet.http.headers");  
+        Series<Header> responseHeaders = (Series<Header>) response.getAttributes().get("org.restlet.http.headers");  
         if (responseHeaders == null) {  
-            responseHeaders = new Form();  
+            responseHeaders = new Series<Header>(Header.class) ;  
             response.getAttributes().put("org.restlet.http.headers", responseHeaders);  
         }  

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

@@ -44 +44 @@
 import org.restlet.data.Status;
 import org.restlet.data.Tag;
+import org.restlet.engine.header.Header;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.routing.Filter;
+import org.restlet.util.Series;
 
 /**
@@ -170 +172 @@
             return media;
 
-        Form headers = (Form)request.getAttributes().get("org.restlet.http.headers");
+        Series<Header> headers = (Series<Header>)request.getAttributes().get("org.restlet.http.headers");
         if (headers != null)
             media = headers.getFirstValue("X-Kauri-Error-Media");

trunk/pom.xml

@@ -8 +8 @@
     <version.springframework>2.5.6</version.springframework>
     <version.springsecurity>2.0.3</version.springsecurity>
-    <version.restlet>svn7592</version.restlet>
+    <version.restlet>svn7909</version.restlet>
     <version.slf4j>1.6.1</version.slf4j>
     <version.jaxrs>1.0</version.jaxrs>