You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/09/19 18:37:34 UTC
svn commit: r1172691 [2/2] - in /incubator/isis/trunk/framework/viewer/json:
json-applib/src/main/java/org/apache/isis/viewer/json/applib/
json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/
json-tck/src/test/java/org/apache/isi...
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java?rev=1172691&r1=1172690&r2=1172691&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceServerside.java Mon Sep 19 16:37:33 2011
@@ -23,7 +23,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.applib.RestfulResponse;
import org.apache.isis.viewer.json.applib.user.UserResource;
import org.apache.isis.viewer.json.viewer.ResourceContext;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
@@ -38,13 +37,7 @@ public class UserResourceServerside exte
ResourceContext resourceContext = getResourceContext();
UserRepBuilder builder = UserRepBuilder.newBuilder(resourceContext).withAuthenticationSession(getAuthenticationSession());
- return Response.ok()
- .entity(jsonFrom(builder))
- .cacheControl(CACHE_ONE_HOUR)
- .header(RestfulResponse.Header.X_REPRESENTATION_TYPE.getName(), RepresentationType.USER.getName())
- .type(MediaType.APPLICATION_JSON_TYPE).build();
+ return responseOfOk(RepresentationType.USER, builder, Caching.ONE_HOUR).build();
}
-
-
}