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/06/26 17:17:48 UTC
svn commit: r1139810 [1/2] - in /incubator/isis/trunk/viewer/json:
applib/src/main/java/META-INF/
applib/src/main/java/org/apache/isis/viewer/json/
applib/src/main/java/org/apache/isis/viewer/json/applib/
applib/src/main/java/org/apache/isis/viewer/res...
Author: danhaywood
Date: Sun Jun 26 15:17:45 2011
New Revision: 1139810
URL: http://svn.apache.org/viewvc?rev=1139810&view=rev
Log:
json viewer - moving classes to packages that follow our module conventions
Added:
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/AbstractRestfulClient.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/AbstractRestfulClient.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/Constants.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/Constants.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClientException.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/RestfulClientException.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/StringUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/StringUtils.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/UrlEncodeUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/UrlEncodeUtils.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/BootstrapResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/DomainObjectResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/HomePageResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/ServicesResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/SpecsResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/UserResource.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/AbstractJaxRsApplication.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/AbstractJaxRsApplication.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/Constants.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/Constants.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RestfulApplication.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/RepContext.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RepContext.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/ResourceContext.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyParams.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyParams.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyTrusted.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/EmbeddedWebViewerRestful.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/RestfulViewerInstaller.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/HttpMethod.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/HttpMethod.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/LinkRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Representation.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/Representation.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RepresentationBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/RepresentationBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/TypeBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/ResourceAbstract.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/BootstrapResourceImpl.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/bootstrap/BootstrapResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/home/HomePageResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/AbstractMemberRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/ActionRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/BodyArgs.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/BodyArgs.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/CollectionRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/CollectionRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberSelfRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/PropertyRepBuilder.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/InputStreamUtil.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ListUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/OidUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/PathUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/StringUtil.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlDecoderUtils.java
- copied, changed from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java
Removed:
incubator/isis/trunk/viewer/json/applib/src/main/java/META-INF/
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/AbstractRestfulClient.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/Constants.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/RestfulClientException.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/StringUtils.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/UrlEncodeUtils.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/BootstrapResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/DomainObjectResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/HomePageResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/ServicesResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/SpecsResource.java
incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/UserResource.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/AbstractJaxRsApplication.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/Constants.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RepContext.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/ResourceContext.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RestfulApplication.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyParams.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyTrusted.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/EmbeddedWebViewerRestful.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/RestfulViewerInstaller.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/HttpMethod.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/LinkRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/Representation.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/RepresentationBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/TypeBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/ResourceAbstract.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/bootstrap/BootstrapResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/home/HomePageResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/AbstractMemberRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/ActionRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/BodyArgs.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/CollectionRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java
Modified:
incubator/isis/trunk/viewer/json/viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/RepresentationContextTest_relFor.java
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/AbstractRestfulClient.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/AbstractRestfulClient.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/AbstractRestfulClient.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/AbstractRestfulClient.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/AbstractRestfulClient.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/AbstractRestfulClient.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/AbstractRestfulClient.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2;
+package org.apache.isis.viewer.json.applib;
import org.apache.log4j.Logger;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/Constants.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/Constants.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/Constants.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/Constants.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/Constants.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/Constants.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2;
+package org.apache.isis.viewer.json.applib;
public final class Constants {
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClientException.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/RestfulClientException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClientException.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClientException.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/RestfulClientException.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/RestfulClientException.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulClientException.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2;
+package org.apache.isis.viewer.json.applib;
public class RestfulClientException extends RuntimeException {
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/StringUtils.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/StringUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/StringUtils.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/StringUtils.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/StringUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/StringUtils.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/StringUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2;
+package org.apache.isis.viewer.json.applib;
import java.io.IOException;
import java.io.StringWriter;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/UrlEncodeUtils.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/UrlEncodeUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/UrlEncodeUtils.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/UrlEncodeUtils.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/UrlEncodeUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/UrlEncodeUtils.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/UrlEncodeUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2;
+package org.apache.isis.viewer.json.applib;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/BootstrapResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/BootstrapResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/BootstrapResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/DomainObjectResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/DomainObjectResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/DomainObjectResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import java.io.InputStream;
import java.util.List;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/HomePageResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/HomePageResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/HomePageResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/ServicesResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/ServicesResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/ServicesResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/SpecsResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/SpecsResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/SpecsResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Copied: incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java (from r1139802, incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/UserResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java?p2=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java&p1=incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/UserResource.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/restful/applib2/resources/UserResource.java (original)
+++ incubator/isis/trunk/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.applib2.resources;
+package org.apache.isis.viewer.xhtml.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/AbstractJaxRsApplication.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/AbstractJaxRsApplication.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/AbstractJaxRsApplication.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/AbstractJaxRsApplication.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/AbstractJaxRsApplication.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/AbstractJaxRsApplication.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/AbstractJaxRsApplication.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2;
+package org.apache.isis.viewer.json.viewer;
import java.util.Collections;
import java.util.LinkedHashSet;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/Constants.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/Constants.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/Constants.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/Constants.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/Constants.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/Constants.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2;
+package org.apache.isis.viewer.json.viewer;
import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
@@ -29,7 +29,7 @@ public final class Constants {
public static final String JQUERY_SRC_JS = "jquery-1.6.1.js";
public static final String JQUERY_MIN_JS = "jquery-1.6.1.min.js";
public static final String URL_ENCODING_CHAR_SET =
- org.apache.isis.viewer.restful.applib2.Constants.URL_ENCODING_CHAR_SET;
+ org.apache.isis.viewer.json.applib.Constants.URL_ENCODING_CHAR_SET;
private Constants() {
}
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RestfulApplication.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RestfulApplication.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RestfulApplication.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java Sun Jun 26 15:17:45 2011
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2;
+package org.apache.isis.viewer.json.viewer;
-import org.apache.isis.viewer.restful.viewer2.resources.bootstrap.BootstrapResourceImpl;
-import org.apache.isis.viewer.restful.viewer2.resources.home.HomePageResourceImpl;
-import org.apache.isis.viewer.restful.viewer2.resources.objects.DomainObjectResourceImpl;
-import org.apache.isis.viewer.restful.viewer2.resources.services.ServicesResourceImpl;
+import org.apache.isis.viewer.json.viewer.resources.bootstrap.BootstrapResourceImpl;
+import org.apache.isis.viewer.json.viewer.resources.home.HomePageResourceImpl;
+import org.apache.isis.viewer.json.viewer.resources.objects.DomainObjectResourceImpl;
+import org.apache.isis.viewer.json.viewer.resources.services.ServicesResourceImpl;
-public class RestfulApplication extends AbstractJaxRsApplication {
+public class JsonApplication extends AbstractJaxRsApplication {
- public RestfulApplication() {
+ public JsonApplication() {
addSingleton(new BootstrapResourceImpl());
addSingleton(new HomePageResourceImpl());
addSingleton(new ServicesResourceImpl());
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/RepContext.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RepContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/RepContext.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/RepContext.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RepContext.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/RepContext.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/RepContext.java Sun Jun 26 15:17:45 2011
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2;
+package org.apache.isis.viewer.json.viewer;
import java.util.Arrays;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/ResourceContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/ResourceContext.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/ResourceContext.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2;
+package org.apache.isis.viewer.json.viewer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyParams.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyParams.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyParams.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyParams.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyParams.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyParams.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyParams.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.authentication;
+package org.apache.isis.viewer.json.viewer.authentication;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyTrusted.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyTrusted.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/authentication/AuthenticationSessionLookupStrategyTrusted.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.authentication;
+package org.apache.isis.viewer.json.viewer.authentication;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/EmbeddedWebViewerRestful.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/EmbeddedWebViewerRestful.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.embedded;
+package org.apache.isis.viewer.json.viewer.embedded;
import org.apache.isis.core.commons.lang.MapUtils;
import org.apache.isis.core.webapp.content.ResourceCachingFilter;
@@ -24,8 +24,8 @@ import org.apache.isis.core.webapp.conte
import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter;
-import org.apache.isis.viewer.restful.viewer2.RestfulApplication;
-import org.apache.isis.viewer.restful.viewer2.authentication.AuthenticationSessionLookupStrategyTrusted;
+import org.apache.isis.viewer.json.viewer.JsonApplication;
+import org.apache.isis.viewer.json.viewer.authentication.AuthenticationSessionLookupStrategyTrusted;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
@@ -36,7 +36,7 @@ final class EmbeddedWebViewerRestful ext
webAppSpec.addContextParams("isis.viewers", "restful");
- webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
+ webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, JsonApplication.class.getName());
webAppSpec.addServletContextListener(ResteasyBootstrap.class);
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/RestfulViewerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/RestfulViewerInstaller.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/embedded/RestfulViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.embedded;
+package org.apache.isis.viewer.json.viewer.embedded;
import org.apache.isis.Isis;
import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstallerAbstract;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/HttpMethod.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/HttpMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/HttpMethod.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/HttpMethod.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/HttpMethod.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/HttpMethod.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/HttpMethod.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.representations;
+package org.apache.isis.viewer.json.viewer.representations;
public enum HttpMethod {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/LinkRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/LinkRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/LinkRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.representations;
+package org.apache.isis.viewer.json.viewer.representations;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.json.viewer.RepContext;
public class LinkRepBuilder extends RepresentationBuilder {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Representation.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/Representation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Representation.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Representation.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/Representation.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/Representation.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Representation.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.representations;
+package org.apache.isis.viewer.json.viewer.representations;
import java.util.LinkedHashMap;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RepresentationBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/RepresentationBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RepresentationBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RepresentationBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/RepresentationBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/RepresentationBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RepresentationBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.representations;
+package org.apache.isis.viewer.json.viewer.representations;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.json.viewer.RepContext;
public abstract class RepresentationBuilder {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/TypeBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/TypeBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/representations/TypeBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.representations;
+package org.apache.isis.viewer.json.viewer.representations;
import java.util.Collections;
import java.util.Map;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.json.viewer.RepContext;
import com.google.common.collect.Maps;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/ResourceAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/ResourceAbstract.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources;
+package org.apache.isis.viewer.json.viewer.resources;
import java.io.IOException;
@@ -42,11 +42,11 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.restful.viewer2.ResourceContext;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
-import org.apache.isis.viewer.restful.viewer2.util.OidUtils;
-import org.apache.isis.viewer.restful.viewer2.util.UrlDecoderUtils;
+import org.apache.isis.viewer.json.viewer.ResourceContext;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.representations.RepresentationBuilder;
+import org.apache.isis.viewer.json.viewer.util.OidUtils;
+import org.apache.isis.viewer.json.viewer.util.UrlDecoderUtils;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/BootstrapResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/bootstrap/BootstrapResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/BootstrapResourceImpl.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/BootstrapResourceImpl.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/bootstrap/BootstrapResourceImpl.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/bootstrap/BootstrapResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/BootstrapResourceImpl.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.bootstrap;
+package org.apache.isis.viewer.json.viewer.resources.bootstrap;
import java.io.IOException;
import java.io.InputStream;
@@ -26,8 +26,8 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.viewer.restful.applib2.resources.BootstrapResource;
-import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
+import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.applib.resources.BootstrapResource;
import com.google.common.io.ByteStreams;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/home/HomePageResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/home/HomePageResourceImpl.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/home/HomePageResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java Sun Jun 26 15:17:45 2011
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.home;
+package org.apache.isis.viewer.json.viewer.resources.home;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.viewer.restful.applib2.resources.HomePageResource;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.applib.resources.HomePageResource;
/**
* Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/AbstractMemberRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/AbstractMemberRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/AbstractMemberRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.util.List;
import java.util.Map;
@@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.representations.RepresentationBuilder;
import com.google.common.collect.Lists;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/ActionRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/ActionRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/ActionRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
import com.google.common.collect.Lists;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/BodyArgs.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/BodyArgs.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/BodyArgs.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/BodyArgs.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/BodyArgs.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/BodyArgs.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/BodyArgs.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
public enum BodyArgs {
/**
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/CollectionRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/CollectionRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/CollectionRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/CollectionRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/CollectionRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/CollectionRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/CollectionRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.util.List;
@@ -22,9 +22,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
import com.google.common.collect.Lists;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.util.List;
import java.util.Map;
@@ -26,10 +26,10 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.representations.RepresentationBuilder;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.io.InputStream;
import java.util.List;
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.applib2.resources.DomainObjectResource;
-import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer2.util.UrlDecoderUtils;
+import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.json.viewer.util.UrlDecoderUtils;
+import org.apache.isis.viewer.xhtml.applib.resources.DomainObjectResource;
@Path("/objects")
public class DomainObjectResourceImpl extends ResourceAbstract implements DomainObjectResource {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java Sun Jun 26 15:17:45 2011
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.applib2.resources.DomainObjectResource;
+import org.apache.isis.viewer.xhtml.applib.resources.DomainObjectResource;
/**
* Whether the representation of an {@link ObjectMember} (as generated by
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberSelfRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberSelfRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberSelfRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberSelfRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.representations.RepresentationBuilder;
public class MemberSelfRepBuilder extends RepresentationBuilder {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java Sun Jun 26 15:17:45 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import java.util.Map;
@@ -30,7 +30,7 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateAddToFacet;
import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateRemoveFromFacet;
import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacet;
-import org.apache.isis.viewer.restful.viewer2.representations.HttpMethod;
+import org.apache.isis.viewer.json.viewer.representations.HttpMethod;
import com.google.common.collect.ImmutableMap;
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java Sun Jun 26 15:17:45 2011
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.viewer.restful.viewer2.representations.HttpMethod;
+import org.apache.isis.viewer.json.viewer.representations.HttpMethod;
public class MutatorSpec {
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/PropertyRepBuilder.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/PropertyRepBuilder.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/PropertyRepBuilder.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/PropertyRepBuilder.java Sun Jun 26 15:17:45 2011
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.viewer.restful.viewer2.resources.objects;
+package org.apache.isis.viewer.json.viewer.resources.objects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
public class PropertyRepBuilder extends AbstractMemberRepBuilder<OneToOneAssociation> {