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 2012/01/14 13:04:51 UTC

svn commit: r1231484 [1/4] - in /incubator/isis/trunk/framework: core/commons/src/main/java/org/apache/isis/core/commons/matchers/ core/testsupport/src/main/java/org/jmock/integration/junit4/ viewer/json/json-applib/ viewer/json/json-applib/src/main/ja...

Author: danhaywood
Date: Sat Jan 14 12:04:47 2012
New Revision: 1231484

URL: http://svn.apache.org/viewvc?rev=1231484&view=rev
Log:
ISIS-109: version resource, querystring handling

Added:
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod2.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Method.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/ErrorRepresentation.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ErrorRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/LinkRepresentation.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java
      - copied, changed from r1229928, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Rel.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/Parser.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Parser.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/PathNode.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/PathNode.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/HttpMethodTest_setUp.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/MethodTest_setUp.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonFixture.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonUtils.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulRequestRequestParameterTest_valueOf.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulRequestQueryParameterTest_valueOf.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulResponse_HttpStatusCodeTest.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/HttpStatusCodeTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/links/
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/links/LinkRepresentationTest_equals.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/util/EnumsTest.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/EnumsTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/util/ParserTest.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/util/PathNodeTest_equalsHashcode.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/PathNodeTest_equalsHashcode.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/util/PathNodeTest_parse.java
      - copied, changed from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/PathNodeTest_parse.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/capabilities/VersionResourceTest_representationAndHeaders.java
      - copied, changed from r1229928, incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/capabilities/CapabilitiesResourceTest_representationAndHeaders.java
Removed:
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ErrorRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Parser.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/PathNode.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Rel.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/capabilities/
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/EnumsTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/HttpStatusCodeTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonUtils.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/PathNodeTest_equalsHashcode.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/PathNodeTest_parse.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulRequestQueryParameterTest_valueOf.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/MethodTest_setUp.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/home/
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/capabilities/CapabilitiesResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/services/
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/user/
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/
Modified:
    incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
    incubator/isis/trunk/framework/core/testsupport/src/main/java/org/jmock/integration/junit4/JUnitRuleMockery.java
    incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/JsonRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationWalker.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClient.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulRequest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulResponse.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/AbstractObjectMemberRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainObjectResource.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainServiceResource.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/ObjectActionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/TransientDomainObjectRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/homepage/HomePageRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/version/VersionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/DomainObjectRepresentationTest.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_arrayIterator.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_asInputStream.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getArray.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getBigInteger.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getBoolean.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getDouble.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getInt.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getLink_isLink.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getLong.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getNull_isNull.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_getString_isString.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_isArray_isMap_isValue.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_mapHas.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_mapIterable.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_size.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/JsonRepresentationTest_urlEncoding.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_parser.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulClientTest_follow.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RestfulRequestDomainModelTest_parser.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/web.xml
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/IsisWebServerRule.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_exceptionHandling.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/capabilities/VersionResourceTest_accept.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_accept.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_notFound.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_xrofollowlinks.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_accept.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_accept.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/stories/UserStoryTest.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/pom.xml
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/GraphUtil.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkFollower.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkTo.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceLinkTo.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/MemberType.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/MutatorSpec.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionResultReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeListReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/version/VersionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/ResourceContextTest_ensureCompatibleAcceptHeader.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/ResourceContextTest_getArg.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/GraphTest_asGraph.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/LinkFollowerTest_follow.java

Modified: incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java Sat Jan 14 12:04:47 2012
@@ -240,4 +240,19 @@ public final class IsisMatchers {
         };
     }
 
+    public static <T> Matcher<List<T>> sameContentsAs(final List<T> expected) {
+        return new TypeSafeMatcher<List<T>>() {
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("same sequence as " + expected);
+            }
+
+            @Override
+            public boolean matchesSafely(List<T> actual) {
+                return actual.containsAll(expected) && expected.containsAll(actual);
+            }
+        };
+    }
+
 }

Modified: incubator/isis/trunk/framework/core/testsupport/src/main/java/org/jmock/integration/junit4/JUnitRuleMockery.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/testsupport/src/main/java/org/jmock/integration/junit4/JUnitRuleMockery.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/testsupport/src/main/java/org/jmock/integration/junit4/JUnitRuleMockery.java (original)
+++ incubator/isis/trunk/framework/core/testsupport/src/main/java/org/jmock/integration/junit4/JUnitRuleMockery.java Sat Jan 14 12:04:47 2012
@@ -27,18 +27,17 @@ DAMAGE.
  */
 package org.jmock.integration.junit4;
 
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
 import org.jmock.auto.internal.AllDeclaredFields;
 import org.jmock.auto.internal.Mockomatic;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.rules.MethodRule;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 
-import java.lang.reflect.Field;
-import java.util.List;
-
-import static org.junit.Assert.fail;
-
 /**
  * A <code>JUnitRuleMockery</code> is a JUnit Rule that manages JMock expectations
  * and allowances, and asserts that expectations have been met after each test

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml Sat Jan 14 12:04:47 2012
@@ -66,6 +66,18 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>commons</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
+        </dependency>
 	    	
 	</dependencies>
 

Added: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java?rev=1231484&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java Sat Jan 14 12:04:47 2012
@@ -0,0 +1,168 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.viewer.json.applib;
+
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriBuilder;
+
+import org.apache.isis.viewer.json.applib.RestfulRequest.RequestParameter;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.util.UrlEncodingUtils;
+import org.jboss.resteasy.client.ClientExecutor;
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.specimpl.UriBuilderImpl;
+
+
+/**
+ * Configures the body, query string etc of a {@link ClientRequest}.
+ * 
+ * <p>
+ * Needed because, unfortunately, {@link ClientRequest} does not seem to allow the
+ * query string to be set directly (only {@link ClientRequest#getQueryParameters() query parameters}).
+ * Instead, it is necessary to {@link UriBuilderImpl#replaceQuery(String) use} its underlying 
+ * {@link UriBuilderImpl}.  
+ */
+public class ClientRequestConfigurer {
+    
+    public static ClientRequestConfigurer create(ClientExecutor executor, String uriTemplate) {
+        final UriBuilder uriBuilder = new UriBuilderImpl().uriTemplate(uriTemplate);
+        final ClientRequest clientRequest = executor.createRequest(uriBuilder);
+        return new ClientRequestConfigurer(clientRequest, uriBuilder);
+    }
+
+    private final ClientRequest clientRequest;
+    private final UriBuilder uriBuilder;
+
+    ClientRequestConfigurer(final ClientRequest clientRequest, final UriBuilder uriBuilder) {
+        this.clientRequest = clientRequest;
+        this.uriBuilder = uriBuilder;
+    }
+
+    public ClientRequestConfigurer accept(MediaType mediaType) {
+        clientRequest.accept(mediaType);
+        return this;
+    }
+
+    public ClientRequestConfigurer header(String name, String value) {
+        clientRequest.header(name, value);
+        return this;
+    }
+
+    /**
+     * Prerequisite to {@link #configureArgs(JsonRepresentation)} or {@link #configureArgs(Map)}.
+     */
+    public ClientRequestConfigurer setHttpMethod(HttpMethod2 httpMethod2) {
+        clientRequest.setHttpMethod(httpMethod2.getJavaxRsMethod());
+        return this;
+    }
+
+    /**
+     * Used when creating a request with arguments to execute.
+     * 
+     * <p>
+     * Typical flow is:
+     * <ul>
+     * <li> {@link RestfulClient#createRequest(HttpMethod2, String)}
+     * <li> {@link RestfulRequest#withArg(RequestParameter, Object)} for each arg
+     * <li> {@link RestfulRequest#execute()} - which calls this method.
+     * </ul>
+     */
+    public ClientRequestConfigurer configureArgs(Map<RequestParameter<?>, Object> args) {
+        if(clientRequest.getHttpMethod() == null) {
+            throw new IllegalStateException("Must set up http method first");
+        }
+        
+        JsonRepresentation argsAsMap = JsonRepresentation.newMap();
+        for (RequestParameter<?> requestParam : args.keySet()) {
+            put(args, requestParam, argsAsMap);
+        }
+        getHttpMethod().setUpArgs(this, argsAsMap);
+        return this;
+    }
+
+    private <P> void put(Map<RequestParameter<?>, Object> args, RequestParameter<P> requestParam, JsonRepresentation argsAsMap) {
+        @SuppressWarnings("unchecked")
+        final P value = (P)args.get(requestParam);
+        final String valueStr = requestParam.getParser().asString(value);
+        argsAsMap.mapPut(requestParam.getName(), valueStr);
+    }
+
+    /**
+     * Used when following links ({@link RestfulClient#follow(LinkRepresentation)}).
+     */
+    public ClientRequestConfigurer configureArgs(JsonRepresentation requestArgs) {
+        if(clientRequest.getHttpMethod() == null) {
+            throw new IllegalStateException("Must set up http method first");
+        }
+
+        getHttpMethod().setUpArgs(this, requestArgs);
+        return this;
+    }
+
+    /**
+     * Called back from {@link HttpMethod2#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+     */
+    ClientRequestConfigurer body(JsonRepresentation requestArgs) {
+        clientRequest.body(MediaType.APPLICATION_JSON_TYPE, requestArgs.toString());
+        return this;
+    }
+
+    /**
+     * Called back from {@link HttpMethod2#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+     */
+    ClientRequestConfigurer queryString(JsonRepresentation requestArgs) {
+        if(requestArgs.size() == 0) {
+            return this;
+        } 
+        final String queryString = UrlEncodingUtils.asUrlEncoded(requestArgs.toString());
+        uriBuilder.replaceQuery(queryString);
+        return this;
+    }
+
+    /**
+     * Called back from {@link HttpMethod2#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+     */
+    ClientRequestConfigurer queryArgs(JsonRepresentation requestArgs) {
+        final MultivaluedMap<String, String> queryParameters = clientRequest.getQueryParameters();
+        for(Map.Entry<String, JsonRepresentation> entry: requestArgs.mapIterable()) {
+            final String param = entry.getKey();
+            final JsonRepresentation argRepr = entry.getValue();
+            final String arg = UrlEncodingUtils.asUrlEncoded(argRepr.asArg());
+            queryParameters.add(param, arg);
+        }
+        return this;
+    }
+
+    /**
+     * For testing.
+     */
+    ClientRequest getClientRequest() {
+        return clientRequest;
+    }
+
+    HttpMethod2 getHttpMethod() {
+        final String httpMethod = clientRequest.getHttpMethod();
+        return HttpMethod2.valueOf(httpMethod);
+    }
+
+
+}
\ No newline at end of file

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod2.java (from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Method.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod2.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod2.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Method.java&r1=1229817&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Method.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod2.java Sat Jan 14 12:04:47 2012
@@ -16,56 +16,74 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib.blocks;
+package org.apache.isis.viewer.json.applib;
 
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.util.UrlEncodingUtils;
 import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.specimpl.UriBuilderImpl;
 
-public enum Method {
-    GET(ArgStrategy.QUERY_STRING),
-    PUT(ArgStrategy.BODY),
-    POST(ArgStrategy.BODY),
-    DELETE(ArgStrategy.QUERY_STRING);
-
-    private enum ArgStrategy {
-        QUERY_STRING,
-        BODY;
-        void setUpArgs(ClientRequest restEasyRequest, JsonRepresentation requestArgs) {
-            if(this == QUERY_STRING) {
-                final MultivaluedMap<String, String> queryParameters = restEasyRequest.getQueryParameters();
-                for(Map.Entry<String, JsonRepresentation> entry: requestArgs.mapIterable()) {
-                    final String param = entry.getKey();
-                    final JsonRepresentation argRepr = entry.getValue();
-                    final String arg = UrlEncodingUtils.asUrlEncoded(argRepr.asArg());
-                    queryParameters.add(param, arg);
-                }
-            } else {
-                restEasyRequest.body(MediaType.APPLICATION_JSON_TYPE, requestArgs.toString());
-            }
-        }
+public enum HttpMethod2 {
+    GET(javax.ws.rs.HttpMethod.GET, ArgStrategy.QUERY_STRING),
+    PUT(javax.ws.rs.HttpMethod.PUT, ArgStrategy.BODY),
+    DELETE(javax.ws.rs.HttpMethod.DELETE, ArgStrategy.QUERY_STRING),
+    POST(javax.ws.rs.HttpMethod.POST, ArgStrategy.BODY);
+
+    private enum ArgStrategy {
+        /**
+         * Individually encodes each query arg.
+         */
+        QUERY_ARGS {
+            @Override
+            void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+                clientRequestConfigurer.queryArgs(requestArgs);
+            }
+        },
+        /**
+         * Sends entire request args as a URL encoded map
+         */
+        QUERY_STRING {
+            @Override
+            void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+                clientRequestConfigurer.queryString(requestArgs);
+            }
+        },
+        BODY {
+            @Override
+            void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+                clientRequestConfigurer.body(requestArgs);
+            }
+        };
+        abstract void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs);
     }
     
-    private final ArgStrategy argStrategy;
+    private final String javaxRsMethod;
+    private final ArgStrategy argStrategy;
 
-    private Method(ArgStrategy argStrategy) {
+    private HttpMethod2(String javaxRsMethod, ArgStrategy argStrategy) {
+        this.javaxRsMethod = javaxRsMethod;
         this.argStrategy = argStrategy;
     }
-
-    public void setUp(ClientRequest restEasyRequest, JsonRepresentation requestArgs) {
-        restEasyRequest.setHttpMethod(name());
+
+    public String getJavaxRsMethod() {
+        return javaxRsMethod;
+    }
+
+    /**
+     * It's a bit nasty that we need to ask for the {@link UriBuilderImpl} as well as the {@link ClientRequest},
+     * but that's because the {@link ClientRequest} does not allow us to setup raw query strings (only query name/arg pairs)
+     * 
+     * @param restEasyRequest
+     * @param uriBuilder - that sits underneath the restEasyRequest
+     * @param requestArgs
+     */
+    public void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+        clientRequestConfigurer.setHttpMethod(this);
         if(requestArgs == null) {
             return;
         }
         if(!requestArgs.isMap()) {
             throw new IllegalArgumentException("requestArgs must be a map; instead got: " + requestArgs);
         }
-        argStrategy.setUpArgs(restEasyRequest, requestArgs);
+        argStrategy.setUpArgs(clientRequestConfigurer, requestArgs);
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/JsonRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/JsonRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/JsonRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/JsonRepresentation.java Sat Jan 14 12:04:47 2012
@@ -29,8 +29,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.apache.isis.viewer.json.applib.util.JsonNodeUtils;
+import org.apache.isis.viewer.json.applib.util.PathNode;
 import org.apache.isis.viewer.json.applib.util.UrlEncodingUtils;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.node.ArrayNode;
@@ -865,6 +866,20 @@ public class JsonRepresentation {
         }
         return true;
     }
+
+    public void mapPut(String key, List<Object> value) {
+        if(!isMap()) {
+            throw new IllegalStateException("does not represent map");
+        }
+        if(value == null) {
+            return;
+        }
+        final JsonRepresentation array = JsonRepresentation.newArray();
+        for(Object v: value) {
+            array.arrayAdd(v);
+        }
+        mapPut(key, array);
+    }
 
     public void mapPut(String key, Object value) {
         if(!isMap()) {

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java Sat Jan 14 12:04:47 2012
@@ -18,26 +18,28 @@
  */
 package org.apache.isis.viewer.json.applib;
 
-import javax.ws.rs.core.MediaType;
-
+import javax.ws.rs.core.MediaType;
+
 import org.apache.isis.viewer.json.applib.domainobjects.ActionResultRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.DomainObjectRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ListRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ObjectActionRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ObjectCollectionRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ObjectPropertyRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ScalarValueRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.DomainObjectRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ListRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ObjectActionRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ObjectCollectionRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ObjectPropertyRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ScalarValueRepresentation;
 import org.apache.isis.viewer.json.applib.domainobjects.TransientDomainObjectRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.ActionDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.ActionParameterDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.CollectionDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.PropertyDescriptionRepresentation;
 import org.apache.isis.viewer.json.applib.domaintypes.TypeActionResultRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.TypeListRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.ActionParameterDescriptionRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.ActionDescriptionRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.CollectionDescriptionRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.PropertyDescriptionRepresentation;
-import org.apache.isis.viewer.json.applib.homepage.HomePageRepresentation;
-import org.apache.isis.viewer.json.applib.user.UserRepresentation;
-import org.apache.isis.viewer.json.applib.util.Enums;
+import org.apache.isis.viewer.json.applib.domaintypes.TypeListRepresentation;
+import org.apache.isis.viewer.json.applib.errors.ErrorRepresentation;
+import org.apache.isis.viewer.json.applib.homepage.HomePageRepresentation;
+import org.apache.isis.viewer.json.applib.user.UserRepresentation;
+import org.apache.isis.viewer.json.applib.util.Enums;
+import org.apache.isis.viewer.json.applib.util.Parser;
 import org.apache.isis.viewer.json.applib.version.VersionRepresentation;
 
 public enum RepresentationType {

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationWalker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationWalker.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationWalker.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationWalker.java Sat Jan 14 12:04:47 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 
@@ -108,7 +108,7 @@ public class RepresentationWalker {
             return;
         }
         
-        Response response;
+        final RestfulResponse<JsonRepresentation> response;
         try {
             if(invokeBody != null) {
                 response = restfulClient.follow(link, invokeBody);
@@ -120,59 +120,9 @@ public class RepresentationWalker {
             return;
         }
         
-        addStep(path, link, null, RestfulResponse.of(response), null, null);
+        addStep(path, link, null, response, null, null);
     }
 
-//    public void walkXpath(String path, JsonRepresentation invokeBody) {
-//        JsonRepresentation entity = getEntityElseMarkStepInError();
-//        if(entity == null) {
-//            return;
-//        }
-//        
-//        Link link = null;
-//        try {
-//            JsonRepresentation matching = entity.xpath(path);
-//            if (matching == null) {
-//                addStep(path, null, null, null, "no such link '" + path + "'", null);
-//                return;
-//            }
-//
-//            link = matching.mapValueAsLink();
-//            if(link.getHref() == null) {
-//                addStep(path, link, null, null, "key does not identify a link '" + path + "'", null);
-//                return;
-//            }
-//
-//            Response response;
-//            if(invokeBody != null) {
-//                response = restfulClient.follow(link, invokeBody);
-//            } else {
-//                response = restfulClient.follow(link);
-//            }
-//            addStep(path, link, null, RestfulResponse.of(response), null, null);
-//            
-//        } catch (RuntimeException e) {
-//            // if xpath fails
-//            addStep(path, null, null, null, "exception: " + e.getMessage(), e);
-//            return;
-//        } catch (Exception e) {
-//            // if follow fails
-//            addStep(path, link, null, null, "failed to follow link: " + e.getMessage(), e);
-//            return;
-//        }
-//    }
-//
-//    private JsonRepresentation getEntityElseMarkStepInError() {
-//        try {
-//            return getEntity();
-//        } catch (Exception e) {
-//            Step previousStep = currentStep();
-//            previousStep.error = "exception: " + e.getMessage();
-//            previousStep.exception = e;
-//            return null;
-//        }
-//    }
-
     /**
      * The entity returned from the previous walk.
      * 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClient.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClient.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClient.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClient.java Sat Jan 14 12:04:47 2012
@@ -24,17 +24,15 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
 import org.apache.isis.viewer.json.applib.domainobjects.DomainObjectResource;
 import org.apache.isis.viewer.json.applib.domainobjects.DomainServiceResource;
 import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeResource;
 import org.apache.isis.viewer.json.applib.homepage.HomePageResource;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.apache.isis.viewer.json.applib.user.UserResource;
 import org.apache.isis.viewer.json.applib.version.VersionResource;
 import org.jboss.resteasy.client.ClientExecutor;
-import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientRequestFactory;
-import org.jboss.resteasy.client.core.BaseClientResponse;
 import org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor;
 
 public class RestfulClient {
@@ -48,7 +46,6 @@ public class RestfulClient {
 
     private final ClientExecutor executor;
     private final ClientRequestFactory clientRequestFactory;
-    private HttpMethod httpMethod;
 
     public RestfulClient(final URI baseUri) {
         this(baseUri, new ApacheHttpClientExecutor(new HttpClient()));
@@ -104,39 +101,36 @@ public class RestfulClient {
         return new RepresentationWalker(this, response);
     }
 
-    public Response follow(LinkRepresentation link) throws Exception {
-        return follow(link, JsonRepresentation.newMap());
+    public RestfulResponse<JsonRepresentation> follow(LinkRepresentation link) throws Exception {
+        return followT(link);
     }
 
-    public Response follow(LinkRepresentation link, JsonRepresentation requestArgs) throws Exception {
-        Response response = link.follow(executor, requestArgs);
-        
-        // this is a bit hacky
-        @SuppressWarnings("unchecked")
-        BaseClientResponse<String> restEasyResponse = (BaseClientResponse<String>)response;
-        restEasyResponse.setReturnType(String.class);
-        
-        return response;
+    public <T extends JsonRepresentation> RestfulResponse<T> followT(LinkRepresentation link) throws Exception {
+        return followT(link, JsonRepresentation.newMap());
     }
 
-    public RestfulRequest createRequest(HttpMethod httpMethod, String uriTemplate) {
-        
-        ClientRequest clientRequest = createRequest(uriTemplate);
-        clientRequest.accept(MediaType.APPLICATION_JSON_TYPE);
-        clientRequest.setHttpMethod(httpMethod.getJavaxRsMethod());
-        
-        return new RestfulRequest(clientRequest, httpMethod);
+    public RestfulResponse<JsonRepresentation> follow(LinkRepresentation link, JsonRepresentation requestArgs) throws Exception {
+        return followT(link, requestArgs);
+    }
+
+    public <T extends JsonRepresentation> RestfulResponse<T> followT(LinkRepresentation link, JsonRepresentation requestArgs) throws Exception {
+        return link.<T>follow(executor, requestArgs);
     }
 
-    private ClientRequest createRequest(String uriTemplate) {
+    public RestfulRequest createRequest(HttpMethod2 httpMethod2, String uriTemplate) {
+        
         boolean includesScheme = uriTemplate.startsWith("http:") || uriTemplate.startsWith("https:");
-        if(includesScheme) {
-            return clientRequestFactory.createRequest(uriTemplate);
-        } else {
-            return clientRequestFactory.createRelativeRequest(uriTemplate);
-        }
+        final String base = clientRequestFactory.getBase().toString();
+        String uri = (includesScheme ? "" : base) + uriTemplate;
+
+        final ClientRequestConfigurer clientRequestConfigurer = ClientRequestConfigurer.create(executor, uri);
+
+        clientRequestConfigurer.accept(MediaType.APPLICATION_JSON_TYPE);
+        clientRequestConfigurer.setHttpMethod(httpMethod2);
+        
+        return new RestfulRequest(clientRequestConfigurer);
     }
-    
+
     /**
      * exposed for testing purposes only.
      */

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java Sat Jan 14 12:04:47 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.applib;
 
-import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 /**
  * Values per the profile parameter

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulRequest.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulRequest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulRequest.java Sat Jan 14 12:04:47 2012
@@ -18,22 +18,21 @@
  */
 package org.apache.isis.viewer.json.applib;
 
-import static org.apache.isis.viewer.json.applib.util.UrlEncodingUtils.*;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.client.ClientRequest;
-
-import com.google.common.collect.Maps;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.isis.viewer.json.applib.util.Parser;
+import org.jboss.resteasy.client.core.BaseClientResponse;
+
+import com.google.common.collect.Maps;
 
 public final class RestfulRequest {
-
+
     public enum DomainModel {
         NONE,
         SIMPLE,
@@ -54,13 +53,13 @@ public final class RestfulRequest {
                 }
             };
         }
-        
+
         @Override
         public String toString() {
             return name().toLowerCase();
         }
     }
-    
+    
     public static class RequestParameter<Q> {
 
         public static RequestParameter<List<List<String>>> FOLLOW_LINKS = new RequestParameter<List<List<String>>>("x-ro-follow-links", Parser.forListOfListOfStrings(), Collections.<List<String>>emptyList());
@@ -87,28 +86,26 @@ public final class RestfulRequest {
         public Parser<Q> getParser() {
             return parser;
         }
-
-        public Q valueOf(Map<?, ?> parameterMap) {
-            if(parameterMap == null) {
-                return defaultValue;
-            }
-            @SuppressWarnings("unchecked")
-            Map<String, String[]> parameters = (Map<String, String[]>) parameterMap; 
-            final String[] values = parameters.get(getName());
-            if(values == null) {
-                return defaultValue;
-            }
-            // special case processing
-            if(values.length == 1) {
-                return getParser().valueOf(urlDecode(values[0]));
-            }
-            return getParser().valueOf(urlDecode(values));
-        }
+        
+        public Q valueOf(JsonRepresentation parameterRepresentation) {
+            if(parameterRepresentation == null) {
+                return defaultValue;
+            }
+            if(!parameterRepresentation.isMap()) {
+                return defaultValue;
+            } 
+            final Q parsedValue = getParser().valueOf(parameterRepresentation.getRepresentation(getName()));
+            return parsedValue != null? parsedValue: defaultValue;
+        }
+        
+        public Q getDefault() {
+            return defaultValue;
+        }
         
         @Override
         public String toString() {
-            return getName();
-        }
+            return getName();
+        }
     }
 
     public static class Header<X> {
@@ -116,8 +113,11 @@ public final class RestfulRequest {
         public static Header<List<MediaType>> ACCEPT = new Header<List<MediaType>>("Accept", Parser.forListOfMediaTypes());
             
         private final String name;
-        private final Parser<X> parser;
-        private Header(String name, Parser<X> parser) {
+        private final Parser<X> parser;
+        /**
+         * public visibility for testing purposes only.
+         */
+        public Header(String name, Parser<X> parser) {
             this.name = name;
             this.parser = parser;
         }
@@ -130,8 +130,8 @@ public final class RestfulRequest {
             return parser;
         }
         
-        void setHeader(ClientRequest clientRequest, X t) {
-            clientRequest.header(getName(), parser.asString(t));
+        void setHeader(ClientRequestConfigurer clientRequestConfigurer, X t) {
+            clientRequestConfigurer.header(getName(), parser.asString(t));
         }
         
         @Override
@@ -140,30 +140,21 @@ public final class RestfulRequest {
         }
     }
 
-    private final ClientRequest clientRequest;
-    private final HttpMethod httpMethod;
+    private final ClientRequestConfigurer clientRequestConfigurer;
     private final Map<RequestParameter<?>, Object> args = Maps.newLinkedHashMap();
     
-    public RestfulRequest(ClientRequest clientRequest, HttpMethod httpMethod) {
-        this.clientRequest = clientRequest;
-        this.httpMethod = httpMethod;
+    public RestfulRequest(ClientRequestConfigurer clientRequestConfigurer) {
+        this.clientRequestConfigurer = clientRequestConfigurer;
     }
 
 
-    /**
-     * Exposed primarily for testing.
-     */
-    public ClientRequest getClientRequest() {
-        return clientRequest;
-    }
-
     public <T> RestfulRequest withHeader(Header<T> header, T t) {
-        header.setHeader(clientRequest, t);
+        header.setHeader(clientRequestConfigurer, t);
         return this;
     }
 
     public <T> RestfulRequest withHeader(Header<List<T>> header, T... ts) {
-        header.setHeader(clientRequest, Arrays.asList(ts));
+        header.setHeader(clientRequestConfigurer, Arrays.asList(ts));
         return this;
     }
 
@@ -180,45 +171,35 @@ public final class RestfulRequest {
 
     public RestfulResponse<JsonRepresentation> execute() {
         try {
-            switch (httpMethod) {
-            case GET:
-            case DELETE:
-                setQueryArgs();
-                break;
-            case POST:
-            case PUT:
-                setBody();
-                break;
-            }
+            if(!args.isEmpty()) {
+                clientRequestConfigurer.configureArgs(args);
+            }
+            Response response = clientRequestConfigurer.getClientRequest().execute();
+            
+            // this is a bit hacky
+            @SuppressWarnings("unchecked")
+            BaseClientResponse<String> restEasyResponse = (BaseClientResponse<String>)response;
+            restEasyResponse.setReturnType(String.class);
 
-            Response executeJaxrs = clientRequest.execute();
-            return RestfulResponse.ofT(executeJaxrs);
+            return RestfulResponse.ofT(response);
         } catch (Exception ex) {
             throw new RuntimeException(ex);
         }
     }
 
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    private void setQueryArgs() {
-        for (RequestParameter requestParam : args.keySet()) {
-            clientRequest.queryParameter(requestParam.getName(), requestParam.parser.asString(args.get(requestParam)));
-        }
-    }
-
-    private void setBody() {
-        final JsonRepresentation bodyArgs = JsonRepresentation.newMap();
-        for (RequestParameter<?> requestParam : args.keySet()) {
-            bodyArgs.mapPut(requestParam.getName(), args.get(requestParam));
-        }
-        clientRequest.body(MediaType.APPLICATION_JSON, bodyArgs.toString());
-    }
-
-
     @SuppressWarnings("unchecked")
     public <T extends JsonRepresentation> RestfulResponse<T> executeT() {
         final RestfulResponse<JsonRepresentation> restfulResponse = execute();
         return (RestfulResponse<T>) restfulResponse;
+    }
+
+
+    /**
+     * For testing only.
+     */
+    ClientRequestConfigurer getClientRequestConfigurer() {
+        return clientRequestConfigurer;
     }
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulResponse.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulResponse.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulResponse.java Sat Jan 14 12:04:47 2012
@@ -18,23 +18,24 @@
  */
 package org.apache.isis.viewer.json.applib;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
-
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.Status.Family;
-import javax.ws.rs.core.Response.StatusType;
-
-import org.apache.isis.viewer.json.applib.util.JsonMapper;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-
-import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Map;
+
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.Response.Status.Family;
+import javax.ws.rs.core.Response.StatusType;
+
+import org.apache.isis.viewer.json.applib.util.JsonMapper;
+import org.apache.isis.viewer.json.applib.util.Parser;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+
+import com.google.common.collect.Maps;
 
 public class RestfulResponse<T> {
 
@@ -234,7 +235,6 @@ public class RestfulResponse<T> {
         
     }
 
-
     public static class Header<X> {
         
         public final static Header<String> WARNING = new Header<String>("Warning", Parser.forString());
@@ -297,7 +297,7 @@ public class RestfulResponse<T> {
 
     private static <V> V getHeader(final Response response, Header<V> header) {
         MultivaluedMap<String, Object> metadata = response.getMetadata();
-        // in spite of the always returns a String
+        // always returns a String
         String value = (String) metadata.getFirst(header.getName());
         return header.parse(value);
     }

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/AbstractObjectMemberRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/AbstractObjectMemberRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/AbstractObjectMemberRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/AbstractObjectMemberRepresentation.java Sat Jan 14 12:04:47 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.applib.domainobjects;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.codehaus.jackson.JsonNode;
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainObjectResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainObjectResource.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainObjectResource.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainObjectResource.java Sat Jan 14 12:04:47 2012
@@ -135,8 +135,7 @@ public interface DomainObjectResource {
     @ClientResponseType(entityType=String.class)
     public Response removeFromCollection(
         @PathParam("oid") final String oidStr,
-        @PathParam("collectionId") final String collectionId,
-        @QueryParam("args") final String arguments);
+        @PathParam("collectionId") final String collectionId);
 
     
     ////////////////////////////////////////////////////////////
@@ -161,8 +160,7 @@ public interface DomainObjectResource {
     @ClientResponseType(entityType=String.class)
     public Response invokeActionQueryOnly(
         @PathParam("oid") final String oidStr, 
-        @PathParam("actionId") final String actionId,
-        @QueryParam("args") final String arguments);
+        @PathParam("actionId") final String actionId);
 
     @PUT
     @Path("/{oid}/actions/{actionId}/invoke")

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainRepresentation.java Sat Jan 14 12:04:47 2012
@@ -22,8 +22,8 @@ import org.apache.isis.viewer.json.appli
 import org.apache.isis.viewer.json.applib.JsonRepresentation.HasExtensions;
 import org.apache.isis.viewer.json.applib.JsonRepresentation.HasLinks;
 import org.apache.isis.viewer.json.applib.JsonRepresentation.LinksToSelf;
-import org.apache.isis.viewer.json.applib.Rel;
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.Rel;
 import org.codehaus.jackson.JsonNode;
 
 public abstract class DomainRepresentation extends JsonRepresentation implements LinksToSelf, HasLinks, HasExtensions {

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainServiceResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainServiceResource.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainServiceResource.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/DomainServiceResource.java Sat Jan 14 12:04:47 2012
@@ -88,8 +88,7 @@ public interface DomainServiceResource {
     @ClientResponseType(entityType=String.class)
     public Response invokeActionQueryOnly(
         @PathParam("serviceId") final String serviceId, 
-        @PathParam("actionId") final String actionId,
-        @QueryParam("args") final String arguments);
+        @PathParam("actionId") final String actionId);
 
     @PUT
     @Path("/{serviceId}/actions/{actionId}/invoke")

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/ObjectActionRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/ObjectActionRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/ObjectActionRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/ObjectActionRepresentation.java Sat Jan 14 12:04:47 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.applib.domainobjects;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.codehaus.jackson.JsonNode;
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/TransientDomainObjectRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/TransientDomainObjectRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/TransientDomainObjectRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domainobjects/TransientDomainObjectRepresentation.java Sat Jan 14 12:04:47 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.applib.domainobjects;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.codehaus.jackson.JsonNode;
 
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/ErrorRepresentation.java (from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ErrorRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/ErrorRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/ErrorRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ErrorRepresentation.java&r1=1229817&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ErrorRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/errors/ErrorRepresentation.java Sat Jan 14 12:04:47 2012
@@ -16,9 +16,10 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib;
+package org.apache.isis.viewer.json.applib.errors;
 
-import org.codehaus.jackson.JsonNode;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.codehaus.jackson.JsonNode;
 
 public class ErrorRepresentation extends JsonRepresentation  {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/homepage/HomePageRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/homepage/HomePageRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/homepage/HomePageRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/homepage/HomePageRepresentation.java Sat Jan 14 12:04:47 2012
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.applib.homepage;
 
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
 import org.apache.isis.viewer.json.applib.domainobjects.DomainRepresentation;
+import org.apache.isis.viewer.json.applib.links.LinkRepresentation;
 import org.codehaus.jackson.JsonNode;
 
 public class HomePageRepresentation extends DomainRepresentation {

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/LinkRepresentation.java (from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/LinkRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/LinkRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentation.java&r1=1229817&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/LinkRepresentation.java Sat Jan 14 12:04:47 2012
@@ -16,26 +16,28 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib.blocks;
+package org.apache.isis.viewer.json.applib.links;
 
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.apache.isis.viewer.json.applib.ClientRequestConfigurer;
+import org.apache.isis.viewer.json.applib.HttpMethod2;
 import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.RestfulRequest;
+import org.apache.isis.viewer.json.applib.RestfulResponse;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
 import org.jboss.resteasy.client.ClientExecutor;
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
 
 
 public final class LinkRepresentation extends JsonRepresentation {
     
     public LinkRepresentation() {
         this(new ObjectNode(JsonNodeFactory.instance));
-        withMethod(Method.GET);
+        withMethod(HttpMethod2.GET);
     }
 
     public LinkRepresentation(JsonNode jsonNode) {
@@ -63,9 +65,9 @@ public final class LinkRepresentation ex
         return getRepresentation("value");
     }
 
-    public Method getMethod() {
+    public HttpMethod2 getHttpMethod() {
         String methodStr = asObjectNode().path("method").getTextValue();
-        return Method.valueOf(methodStr);
+        return HttpMethod2.valueOf(methodStr);
     }
 
     public MediaType getType() {
@@ -75,8 +77,8 @@ public final class LinkRepresentation ex
     }
 
 
-    public LinkRepresentation withMethod(Method method) {
-        asObjectNode().put("method", method.name());
+    public LinkRepresentation withMethod(HttpMethod2 httpMethod2) {
+        asObjectNode().put("method", httpMethod2.name());
         return this;
     }
 
@@ -96,29 +98,29 @@ public final class LinkRepresentation ex
         return new JsonRepresentation(arguments);
     }
     
-    public <T> Response follow(ClientExecutor executor) throws Exception {
+    public <T> RestfulResponse<JsonRepresentation> follow(ClientExecutor executor) throws Exception {
         return follow(executor, null);
     }
-
-    public <T> Response follow(ClientExecutor executor, JsonRepresentation requestArgs) throws Exception {
-        ClientRequest restEasyRequest = executor.createRequest(getHref());
-        restEasyRequest.accept(MediaType.APPLICATION_JSON_TYPE);
+    
+    public <T extends JsonRepresentation> RestfulResponse<T> follow(ClientExecutor executor, JsonRepresentation requestArgs) throws Exception {
+        
+        final ClientRequestConfigurer clientRequestConfigurer = ClientRequestConfigurer.create(executor, getHref());
         
-        getMethod().setUp(restEasyRequest, requestArgs);
+        clientRequestConfigurer.accept(MediaType.APPLICATION_JSON_TYPE);
+        clientRequestConfigurer.setHttpMethod(getHttpMethod());
         
-        @SuppressWarnings("unchecked")
-        ClientResponse<T> restEasyResponse = executor.execute(restEasyRequest);
-        return restEasyResponse;
+        clientRequestConfigurer.configureArgs(requestArgs);
+        
+        final RestfulRequest restfulRequest = new RestfulRequest(clientRequestConfigurer);
+        return restfulRequest.executeT();
     }
-
     
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getHref() == null) ? 0 : getHref().hashCode());
-        result = prime * result + ((getMethod() == null) ? 0 : getMethod().hashCode());
-        result = prime * result + ((getRel() == null) ? 0 : getRel().hashCode());
+        result = prime * result + ((getHttpMethod() == null) ? 0 : getHttpMethod().hashCode());
         return result;
     }
 
@@ -136,14 +138,14 @@ public final class LinkRepresentation ex
                 return false;
         } else if (!getHref().equals(other.getHref()))
             return false;
-        if (getMethod() != other.getMethod())
+        if (getHttpMethod() != other.getHttpMethod())
             return false;
         return true;
     }
 
     @Override
     public String toString() {
-        return "Link [rel=" + getRel() + ", href=" + getHref() + ", method=" + getMethod() + ", type=" + getType() + "]";
+        return "Link [rel=" + getRel() + ", href=" + getHref() + ", method=" + getHttpMethod() + ", type=" + getType() + "]";
     }
 
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java (from r1229928, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Rel.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Rel.java&r1=1229928&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Rel.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java Sat Jan 14 12:04:47 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib;
+package org.apache.isis.viewer.json.applib.links;
 
 public enum Rel {
     // IANA registered

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/Parser.java (from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Parser.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/Parser.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/Parser.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Parser.java&r1=1229817&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/Parser.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/Parser.java Sat Jan 14 12:04:47 2012
@@ -16,26 +16,27 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib;
+package org.apache.isis.viewer.json.applib.util;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.MediaType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 
 public abstract class Parser<T> {
-    
     public T valueOf(List<String> str) {
         if(str == null) {
             return null;
@@ -51,7 +52,18 @@ public abstract class Parser<T> {
         if(str.length==0)
             return null;
         return valueOf(str[0]);
-    }
+    }
+    public T valueOf(JsonRepresentation jsonRepresentation) {
+        if(jsonRepresentation == null) {
+            return null;
+        }
+        return valueOf(jsonRepresentation.asString());
+    }
+    public JsonRepresentation asJsonRepresentation(T t) {
+        return JsonRepresentation.newMap("dummy", asString(t)).getRepresentation("dummy");
+    }
+    
+
     public abstract T valueOf(String str);
     public abstract String asString(T t);
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/PathNode.java (from r1229817, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/PathNode.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/PathNode.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/PathNode.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/PathNode.java&r1=1229817&r2=1231484&rev=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/PathNode.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/PathNode.java Sat Jan 14 12:04:47 2012
@@ -16,13 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.json.applib;
+package org.apache.isis.viewer.json.applib.util;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+
 import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/version/VersionRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/version/VersionRepresentation.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/version/VersionRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/version/VersionRepresentation.java Sat Jan 14 12:04:47 2012
@@ -28,8 +28,8 @@ public class VersionRepresentation exten
         super(jsonNode);
     }
 
-    public JsonRepresentation getVersion() {
-        return getMap("version");
+    public JsonRepresentation getOptionalCapabilities() {
+        return getMap("optionalCapabilities");
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/DomainObjectRepresentationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/DomainObjectRepresentationTest.java?rev=1231484&r1=1231483&r2=1231484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/DomainObjectRepresentationTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/DomainObjectRepresentationTest.java Sat Jan 14 12:04:47 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.applib;
 
-import static org.apache.isis.viewer.json.applib.JsonUtils.readJson;
+import static org.apache.isis.viewer.json.applib.JsonFixture.readJson;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;