You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/09/01 14:31:08 UTC
svn commit: r1164045 [1/2] - in /incubator/isis/trunk/framework:
tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/
tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/
tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objst...
Author: danhaywood
Date: Thu Sep 1 12:31:06 2011
New Revision: 1164045
URL: http://svn.apache.org/viewvc?rev=1164045&view=rev
Log:
ISIS-109: reworking home page, also services list and user
Added:
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuedEntityRepository.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuedEntityFixture.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuedEntityFixture.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuedEntityFixture.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuedEntityFixture.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuedEntityRepositoryDefault.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuedEntityRepositoryDefault.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuedEntityRepositoryDefault.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuedEntityRepositoryDefault.java
- copied, changed from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeRepresentation.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeResource.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/TypeResource.java
- copied, changed from r1163522, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/SpecsResource.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/WellKnownType.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objectlist/DomainServiceListRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/reptypes/
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/reptypes/RepresentationTypeResourceImpl.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserResourceImpl.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/MapUtils.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/MapUtilsTest.java
Modified:
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntityRepository.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuesEntityFixture.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuesEntityRepositoryDefault.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuesEntityRepositoryDefault.java
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/RestfulClient.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Link.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesRepresentation.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesResource.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/types/SpecsResource.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/user/UserRepresentation.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/HttpStatusCode.java
incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/ResourceRepresentationTest.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/TypeBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objectlist/DomainObjectListRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/AbstractMemberRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/ActionRepBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MutatorSpec.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/AbstractTest.java
incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/todo/ScalarEntityRepositoryTest.java
incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/todo/ScalarEntityTest.java
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuedEntityRepository.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuesEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuesEntityRepository.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuesEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AbstractValuedEntityRepository.java Thu Sep 1 12:31:06 2011
@@ -23,11 +23,11 @@ import java.util.List;
import org.apache.isis.applib.AbstractFactoryAndRepository;
-public abstract class AbstractValuesEntityRepository<T> extends AbstractFactoryAndRepository {
+public abstract class AbstractValuedEntityRepository<T> extends AbstractFactoryAndRepository {
private Class<T> cls;
- public AbstractValuesEntityRepository(Class<T> cls) {
+ public AbstractValuedEntityRepository(Class<T> cls) {
super();
this.cls = cls;
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntity.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java Thu Sep 1 12:31:06 2011
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.value.*;
-public class ApplibValuesEntity extends AbstractDomainObject {
+public class ApplibValuedEntity extends AbstractDomainObject {
// {{ ColorProperty
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntityRepository.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuesEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java Thu Sep 1 12:31:06 2011
@@ -25,12 +25,12 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Named;
@Named("ApplibValues")
-public interface ApplibValuesEntityRepository {
+public interface ApplibValuedEntityRepository {
@MemberOrder(sequence="1")
- public List<ApplibValuesEntity> list();
+ public List<ApplibValuedEntity> list();
@MemberOrder(sequence="2")
- public ApplibValuesEntity newEntity();
+ public ApplibValuedEntity newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntity.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java Thu Sep 1 12:31:06 2011
@@ -28,7 +28,7 @@ import org.apache.isis.applib.AbstractDo
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Optional;
-public class JdkValuesEntity extends AbstractDomainObject {
+public class JdkValuedEntity extends AbstractDomainObject {
// {{ Title
public String title() {
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntityRepository.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuesEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java Thu Sep 1 12:31:06 2011
@@ -25,12 +25,12 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Named;
@Named("JdkValues")
-public interface JdkValuesEntityRepository {
+public interface JdkValuedEntityRepository {
@MemberOrder(sequence="1")
- public List<JdkValuesEntity> list();
+ public List<JdkValuedEntity> list();
@MemberOrder(sequence="2")
- public JdkValuesEntity newEntity();
+ public JdkValuedEntity newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntity.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java Thu Sep 1 12:31:06 2011
@@ -22,7 +22,7 @@ package org.apache.isis.tck.dom.scalars;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
-public class PrimitiveValuesEntity extends AbstractDomainObject {
+public class PrimitiveValuedEntity extends AbstractDomainObject {
// {{ Title
public String title() {
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntityRepository.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuesEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java Thu Sep 1 12:31:06 2011
@@ -25,12 +25,12 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Named;
@Named("PrimitiveValues")
-public interface PrimitiveValuesEntityRepository {
+public interface PrimitiveValuedEntityRepository {
@MemberOrder(sequence="1")
- public List<PrimitiveValuesEntity> list();
+ public List<PrimitiveValuedEntity> list();
@MemberOrder(sequence="2")
- public PrimitiveValuesEntity newEntity();
+ public PrimitiveValuedEntity newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntity.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java Thu Sep 1 12:31:06 2011
@@ -23,7 +23,7 @@ import org.apache.isis.applib.AbstractDo
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Optional;
-public class WrapperValuesEntity extends AbstractDomainObject {
+public class WrapperValuedEntity extends AbstractDomainObject {
// {{ Title
public String title() {
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java (from r1163522, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntityRepository.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuesEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java Thu Sep 1 12:31:06 2011
@@ -25,12 +25,12 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Named;
@Named("WrapperValues")
-public interface WrapperValuesEntityRepository {
+public interface WrapperValuedEntityRepository {
@MemberOrder(sequence="1")
- public List<WrapperValuesEntity> list();
+ public List<WrapperValuedEntity> list();
@MemberOrder(sequence="2")
- public WrapperValuesEntity newEntity();
+ public WrapperValuedEntity newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuedEntityFixture.java (from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuesEntityFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuedEntityFixture.java?p2=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuedEntityFixture.java&p1=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuesEntityFixture.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuesEntityFixture.java (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/ApplibValuedEntityFixture.java Thu Sep 1 12:31:06 2011
@@ -21,12 +21,12 @@
package org.apache.isis.tck.fixture.scalars;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.tck.dom.scalars.ApplibValuesEntity;
-import org.apache.isis.tck.dom.scalars.ApplibValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntityRepository;
-public class ApplibValuesEntityFixture extends AbstractFixture {
+public class ApplibValuedEntityFixture extends AbstractFixture {
@Override
public void install() {
@@ -37,13 +37,13 @@ public class ApplibValuesEntityFixture e
createEntity();
}
- private ApplibValuesEntity createEntity() {
+ private ApplibValuedEntity createEntity() {
return applibValuesEntityRepository.newEntity();
}
- private ApplibValuesEntityRepository applibValuesEntityRepository;
- public void setApplibValuesEntityRepository(ApplibValuesEntityRepository applibValuesEntityRepository) {
+ private ApplibValuedEntityRepository applibValuesEntityRepository;
+ public void setApplibValuesEntityRepository(ApplibValuedEntityRepository applibValuesEntityRepository) {
this.applibValuesEntityRepository = applibValuesEntityRepository;
}
Copied: incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuedEntityFixture.java (from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuesEntityFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuedEntityFixture.java?p2=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuedEntityFixture.java&p1=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuesEntityFixture.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuesEntityFixture.java (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/JdkValuedEntityFixture.java Thu Sep 1 12:31:06 2011
@@ -21,12 +21,12 @@
package org.apache.isis.tck.fixture.scalars;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.tck.dom.scalars.JdkValuesEntity;
-import org.apache.isis.tck.dom.scalars.JdkValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.JdkValuedEntity;
+import org.apache.isis.tck.dom.scalars.JdkValuedEntityRepository;
-public class JdkValuesEntityFixture extends AbstractFixture {
+public class JdkValuedEntityFixture extends AbstractFixture {
@Override
public void install() {
@@ -37,13 +37,13 @@ public class JdkValuesEntityFixture exte
createEntity();
}
- private JdkValuesEntity createEntity() {
+ private JdkValuedEntity createEntity() {
return jdkValuesEntityRepository.newEntity();
}
- private JdkValuesEntityRepository jdkValuesEntityRepository;
- public void setJdkValuesEntityRepository(JdkValuesEntityRepository jdkValuesEntityRepository) {
+ private JdkValuedEntityRepository jdkValuesEntityRepository;
+ public void setJdkValuesEntityRepository(JdkValuedEntityRepository jdkValuesEntityRepository) {
this.jdkValuesEntityRepository = jdkValuesEntityRepository;
}
Copied: incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuedEntityFixture.java (from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuesEntityFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuedEntityFixture.java?p2=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuedEntityFixture.java&p1=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuesEntityFixture.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuesEntityFixture.java (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/PrimitiveValuedEntityFixture.java Thu Sep 1 12:31:06 2011
@@ -22,11 +22,11 @@ package org.apache.isis.tck.fixture.scal
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.tck.dom.scalars.PrimitiveValuesEntity;
-import org.apache.isis.tck.dom.scalars.PrimitiveValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
-public class PrimitiveValuesEntityFixture extends AbstractFixture {
+public class PrimitiveValuedEntityFixture extends AbstractFixture {
@Override
public void install() {
@@ -37,13 +37,13 @@ public class PrimitiveValuesEntityFixtur
createEntity();
}
- private PrimitiveValuesEntity createEntity() {
+ private PrimitiveValuedEntity createEntity() {
return primitiveValuesEntityRepository.newEntity();
}
- private PrimitiveValuesEntityRepository primitiveValuesEntityRepository;
- public void setPrimitiveValuesEntityRepository(PrimitiveValuesEntityRepository primitiveValuesEntityRepository) {
+ private PrimitiveValuedEntityRepository primitiveValuesEntityRepository;
+ public void setPrimitiveValuesEntityRepository(PrimitiveValuedEntityRepository primitiveValuesEntityRepository) {
this.primitiveValuesEntityRepository = primitiveValuesEntityRepository;
}
Copied: incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuedEntityFixture.java (from r1163522, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuesEntityFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuedEntityFixture.java?p2=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuedEntityFixture.java&p1=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuesEntityFixture.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuesEntityFixture.java (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/scalars/WrapperValuedEntityFixture.java Thu Sep 1 12:31:06 2011
@@ -21,12 +21,12 @@
package org.apache.isis.tck.fixture.scalars;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.tck.dom.scalars.WrapperValuesEntity;
-import org.apache.isis.tck.dom.scalars.WrapperValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntity;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntityRepository;
-public class WrapperValuesEntityFixture extends AbstractFixture {
+public class WrapperValuedEntityFixture extends AbstractFixture {
@Override
public void install() {
@@ -37,13 +37,13 @@ public class WrapperValuesEntityFixture
createEntity();
}
- private WrapperValuesEntity createEntity() {
+ private WrapperValuedEntity createEntity() {
return wrapperValuesEntityRepository.newEntity();
}
- private WrapperValuesEntityRepository wrapperValuesEntityRepository;
- public void setPrimitiveValuesEntityRepository(WrapperValuesEntityRepository wrapperValuesEntityRepository) {
+ private WrapperValuedEntityRepository wrapperValuesEntityRepository;
+ public void setPrimitiveValuesEntityRepository(WrapperValuedEntityRepository wrapperValuesEntityRepository) {
this.wrapperValuesEntityRepository = wrapperValuesEntityRepository;
}
Copied: incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuedEntityRepositoryDefault.java (from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuesEntityRepositoryDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuedEntityRepositoryDefault.java?p2=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuedEntityRepositoryDefault.java&p1=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuesEntityRepositoryDefault.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuesEntityRepositoryDefault.java (original)
+++ incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/ApplibValuedEntityRepositoryDefault.java Thu Sep 1 12:31:06 2011
@@ -19,21 +19,26 @@
package org.apache.isis.tck.objstore.dflt.scalars;
-import org.apache.isis.tck.dom.scalars.AbstractValuesEntityRepository;
-import org.apache.isis.tck.dom.scalars.ApplibValuesEntity;
-import org.apache.isis.tck.dom.scalars.ApplibValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.AbstractValuedEntityRepository;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntityRepository;
-public class ApplibValuesEntityRepositoryDefault extends AbstractValuesEntityRepository<ApplibValuesEntity> implements ApplibValuesEntityRepository {
+public class ApplibValuedEntityRepositoryDefault extends AbstractValuedEntityRepository<ApplibValuedEntity> implements ApplibValuedEntityRepository {
- public ApplibValuesEntityRepositoryDefault() {
- super(ApplibValuesEntity.class);
+ public ApplibValuedEntityRepositoryDefault() {
+ super(ApplibValuedEntity.class);
}
+ @Override
+ public String getId() {
+ return "applibValuedEntities";
+ }
+
/**
* Required otherwise return type is erased
*/
@Override
- public ApplibValuesEntity newEntity() {
+ public ApplibValuedEntity newEntity() {
return super.newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuedEntityRepositoryDefault.java (from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuesEntityRepositoryDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuedEntityRepositoryDefault.java?p2=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuedEntityRepositoryDefault.java&p1=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuesEntityRepositoryDefault.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuesEntityRepositoryDefault.java (original)
+++ incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/JdkValuedEntityRepositoryDefault.java Thu Sep 1 12:31:06 2011
@@ -19,21 +19,26 @@
package org.apache.isis.tck.objstore.dflt.scalars;
-import org.apache.isis.tck.dom.scalars.AbstractValuesEntityRepository;
-import org.apache.isis.tck.dom.scalars.JdkValuesEntity;
-import org.apache.isis.tck.dom.scalars.JdkValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.AbstractValuedEntityRepository;
+import org.apache.isis.tck.dom.scalars.JdkValuedEntity;
+import org.apache.isis.tck.dom.scalars.JdkValuedEntityRepository;
-public class JdkValuesEntityRepositoryDefault extends AbstractValuesEntityRepository<JdkValuesEntity> implements JdkValuesEntityRepository {
+public class JdkValuedEntityRepositoryDefault extends AbstractValuedEntityRepository<JdkValuedEntity> implements JdkValuedEntityRepository {
- public JdkValuesEntityRepositoryDefault() {
- super(JdkValuesEntity.class);
+ public JdkValuedEntityRepositoryDefault() {
+ super(JdkValuedEntity.class);
}
-
+
+ @Override
+ public String getId() {
+ return "jdkValuedEntities";
+ }
+
/**
* Required otherwise return type is erased
*/
@Override
- public JdkValuesEntity newEntity() {
+ public JdkValuedEntity newEntity() {
return super.newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuedEntityRepositoryDefault.java (from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuesEntityRepositoryDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuedEntityRepositoryDefault.java?p2=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuedEntityRepositoryDefault.java&p1=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuesEntityRepositoryDefault.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuesEntityRepositoryDefault.java (original)
+++ incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/PrimitiveValuedEntityRepositoryDefault.java Thu Sep 1 12:31:06 2011
@@ -19,21 +19,26 @@
package org.apache.isis.tck.objstore.dflt.scalars;
-import org.apache.isis.tck.dom.scalars.AbstractValuesEntityRepository;
-import org.apache.isis.tck.dom.scalars.PrimitiveValuesEntity;
-import org.apache.isis.tck.dom.scalars.PrimitiveValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.AbstractValuedEntityRepository;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
-public class PrimitiveValuesEntityRepositoryDefault extends AbstractValuesEntityRepository<PrimitiveValuesEntity> implements PrimitiveValuesEntityRepository {
+public class PrimitiveValuedEntityRepositoryDefault extends AbstractValuedEntityRepository<PrimitiveValuedEntity> implements PrimitiveValuedEntityRepository {
- public PrimitiveValuesEntityRepositoryDefault() {
- super(PrimitiveValuesEntity.class);
+ public PrimitiveValuedEntityRepositoryDefault() {
+ super(PrimitiveValuedEntity.class);
}
+ @Override
+ public String getId() {
+ return "primitiveValuedEntities";
+ }
+
/**
* Required otherwise return type is erased
*/
@Override
- public PrimitiveValuesEntity newEntity() {
+ public PrimitiveValuedEntity newEntity() {
return super.newEntity();
}
Copied: incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuedEntityRepositoryDefault.java (from r1163522, incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuesEntityRepositoryDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuedEntityRepositoryDefault.java?p2=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuedEntityRepositoryDefault.java&p1=incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuesEntityRepositoryDefault.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuesEntityRepositoryDefault.java (original)
+++ incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/scalars/WrapperValuedEntityRepositoryDefault.java Thu Sep 1 12:31:06 2011
@@ -19,21 +19,26 @@
package org.apache.isis.tck.objstore.dflt.scalars;
-import org.apache.isis.tck.dom.scalars.AbstractValuesEntityRepository;
-import org.apache.isis.tck.dom.scalars.WrapperValuesEntity;
-import org.apache.isis.tck.dom.scalars.WrapperValuesEntityRepository;
+import org.apache.isis.tck.dom.scalars.AbstractValuedEntityRepository;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntity;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntityRepository;
-public class WrapperValuesEntityRepositoryDefault extends AbstractValuesEntityRepository<WrapperValuesEntity> implements WrapperValuesEntityRepository {
+public class WrapperValuedEntityRepositoryDefault extends AbstractValuedEntityRepository<WrapperValuedEntity> implements WrapperValuedEntityRepository {
- public WrapperValuesEntityRepositoryDefault() {
- super(WrapperValuesEntity.class);
+ public WrapperValuedEntityRepositoryDefault() {
+ super(WrapperValuedEntity.class);
}
-
+
+ @Override
+ public String getId() {
+ return "wrapperValuedEntities";
+ }
+
/**
* Required otherwise return type is erased
*/
@Override
- public WrapperValuesEntity newEntity() {
+ public WrapperValuedEntity newEntity() {
return super.newEntity();
}
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=1164045&r1=1164044&r2=1164045&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 Thu Sep 1 12:31:06 2011
@@ -112,12 +112,12 @@ public class JsonRepresentation {
/////////////////////////////////////////////////////////////////////////
public JsonRepresentation elementAt(int i) {
- ensureIsAnArrayNoLargerThan(i);
+ ensureIsAnArrayAtLeastAsLargeAs(i);
return new JsonRepresentation(jsonNode.get(i));
}
public void setElementAt(int i, JsonRepresentation objectRepr) {
- ensureIsAnArrayNoLargerThan(i);
+ ensureIsAnArrayAtLeastAsLargeAs(i);
if(objectRepr.isArray()) {
throw new IllegalArgumentException("Representation being set cannot be an array");
}
@@ -126,7 +126,7 @@ public class JsonRepresentation {
arrayNode.set(i, objectRepr.getJsonNode());
}
- private void ensureIsAnArrayNoLargerThan(int i) {
+ private void ensureIsAnArrayAtLeastAsLargeAs(int i) {
if (!jsonNode.isArray()) {
throw new IllegalStateException("Is not an array");
}
@@ -437,9 +437,77 @@ public class JsonRepresentation {
return JsonNodeUtils.asUrlEncoded(getJsonNode());
}
-
+
+
/////////////////////////////////////////////////////////////////////////
- // mutable
+ // mutable (array)
+ /////////////////////////////////////////////////////////////////////////
+
+ public void add(Object value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(new POJONode(value));
+ }
+
+ public void add(JsonRepresentation value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value.getJsonNode());
+ }
+
+ public void add(String value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(JsonNode value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(long value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(int value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(double value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(float value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ public void add(boolean value) {
+ if(!isArray()) {
+ throw new IllegalStateException("does not represent array");
+ }
+ nodeAsArray().add(value);
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+ // mutable (map)
/////////////////////////////////////////////////////////////////////////
public void put(String key, Object value) {
@@ -575,4 +643,6 @@ public class JsonRepresentation {
+
+
}
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=1164045&r1=1164044&r2=1164045&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 Thu Sep 1 12:31:06 2011
@@ -27,7 +27,7 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.domain.DomainObjectResource;
import org.apache.isis.viewer.json.applib.domain.ServicesResource;
import org.apache.isis.viewer.json.applib.homepage.HomePageResource;
-import org.apache.isis.viewer.json.applib.types.SpecsResource;
+import org.apache.isis.viewer.json.applib.types.TypeResource;
import org.apache.isis.viewer.json.applib.user.UserResource;
import org.jboss.resteasy.client.ClientExecutor;
import org.jboss.resteasy.client.ClientRequestFactory;
@@ -40,7 +40,7 @@ public class RestfulClient {
private final ServicesResource servicesResource;
private final DomainObjectResource domainObjectResource;
private final UserResource userResource;
- private final SpecsResource specsResource;
+ private final TypeResource specsResource;
private final ClientExecutor executor;
private final ClientRequestFactory clientRequestFactory;
@@ -56,7 +56,7 @@ public class RestfulClient {
this.homePageResource = clientRequestFactory.createProxy(HomePageResource.class);
this.userResource = clientRequestFactory.createProxy(UserResource.class);
- this.specsResource = clientRequestFactory.createProxy(SpecsResource.class);
+ this.specsResource = clientRequestFactory.createProxy(TypeResource.class);
this.servicesResource = clientRequestFactory.createProxy(ServicesResource.class);
this.domainObjectResource = clientRequestFactory.createProxy(DomainObjectResource.class);
}
@@ -74,7 +74,7 @@ public class RestfulClient {
return userResource;
}
- public SpecsResource getSpecsResource() {
+ public TypeResource getSpecsResource() {
return specsResource;
}
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Link.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Link.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Link.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/blocks/Link.java Thu Sep 1 12:31:06 2011
@@ -115,11 +115,6 @@ public final class Link extends JsonRepr
return false;
if (getMethod() != other.getMethod())
return false;
- if (getRel() == null) {
- if (other.getRel() != null)
- return false;
- } else if (!getRel().equals(other.getRel()))
- return false;
return true;
}
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesRepresentation.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesRepresentation.java Thu Sep 1 12:31:06 2011
@@ -1,6 +1,7 @@
package org.apache.isis.viewer.json.applib.domain;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.blocks.Link;
import org.codehaus.jackson.JsonNode;
@@ -9,5 +10,9 @@ public class ServicesRepresentation exte
public ServicesRepresentation(JsonNode jsonNode) {
super(jsonNode);
}
+
+ public Link getRepresentationType() {
+ return getLink("representationType");
+ }
}
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesResource.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesResource.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domain/ServicesResource.java Thu Sep 1 12:31:06 2011
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.json.appl
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -35,4 +36,10 @@ public interface ServicesResource {
@ClientResponseType(entityType=String.class)
public Response services();
+ @GET
+ @Path("/{serviceId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ @ClientResponseType(entityType=String.class)
+ public abstract Response service(@PathParam("serviceId") final String serviceId);
+
}
\ No newline at end of file
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=1164045&r1=1164044&r2=1164045&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 Thu Sep 1 12:31:06 2011
@@ -10,6 +10,12 @@ public class HomePageRepresentation exte
super(jsonNode);
}
+ public Link getRepresentationType() {
+ return getLink("representationType");
+ }
+ public Link getSelf() {
+ return getLink("self");
+ }
public Link getUser() {
return getLink("user");
}
Added: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeRepresentation.java?rev=1164045&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeRepresentation.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeRepresentation.java Thu Sep 1 12:31:06 2011
@@ -0,0 +1,21 @@
+package org.apache.isis.viewer.json.applib.reptypes;
+
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.blocks.Link;
+import org.codehaus.jackson.JsonNode;
+
+public class RepresentationTypeRepresentation extends JsonRepresentation {
+
+ public RepresentationTypeRepresentation(JsonNode jsonNode) {
+ super(jsonNode);
+ }
+
+ public Link getRepresentationType() {
+ return getLink("representationType");
+ }
+
+ public Link getSelf() {
+ return getLink("self");
+ }
+
+}
Added: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeResource.java?rev=1164045&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeResource.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/reptypes/RepresentationTypeResource.java Thu Sep 1 12:31:06 2011
@@ -0,0 +1,38 @@
+/*
+ * 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.reptypes;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.ClientResponseType;
+
+@Path("/representationTypes")
+public interface RepresentationTypeResource {
+
+ @GET
+ @Path("/{representationTypeName}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ @ClientResponseType(entityType=String.class)
+ public Response representationType(String representationTypeName);
+
+}
\ No newline at end of file
Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/TypeResource.java (from r1163522, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/SpecsResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/TypeResource.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/TypeResource.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/SpecsResource.java&r1=1163522&r2=1164045&rev=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/SpecsResource.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/types/TypeResource.java Thu Sep 1 12:31:06 2011
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
import org.jboss.resteasy.annotations.ClientResponseType;
@Path("/types")
-public interface SpecsResource {
+public interface TypeResource {
@GET
@Path("/")
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/user/UserRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/user/UserRepresentation.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/user/UserRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/user/UserRepresentation.java Thu Sep 1 12:31:06 2011
@@ -1,6 +1,7 @@
package org.apache.isis.viewer.json.applib.user;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.blocks.Link;
import org.codehaus.jackson.JsonNode;
@@ -10,4 +11,24 @@ public class UserRepresentation extends
super(jsonNode);
}
+ public Link getRepresentationType() {
+ return getLink("representationType");
+ }
+
+ public String getUserName() {
+ return getString("username");
+ }
+
+ public String getFriendlyName() {
+ return getString("friendlyName");
+ }
+
+ public String getEmail() {
+ return getString("email");
+ }
+
+ public JsonRepresentation getRoles() {
+ return getRepresentation("roles");
+ }
+
}
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/HttpStatusCode.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/HttpStatusCode.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/HttpStatusCode.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/util/HttpStatusCode.java Thu Sep 1 12:31:06 2011
@@ -37,6 +37,31 @@ public class HttpStatusCode {
private boolean includes(int statusCode) {
return from <= statusCode && statusCode <= to;
}
+
+ public boolean isContinue() {
+ return this == CONTINUE;
+ }
+
+ public boolean isSuccess() {
+ return this == SUCCESS;
+ }
+
+ public boolean isRedirect() {
+ return this == REDIRECT;
+ }
+
+ public boolean isClientError() {
+ return this == CLIENT_ERROR;
+ }
+
+ public boolean isServerError() {
+ return this == SERVER_ERROR;
+ }
+
+ public boolean isOutOfRange() {
+ return this == OUT_OF_RANGE_LOW || this == OUT_OF_RANGE_HIGH;
+ }
+
}
////Field descriptor #62 I
@@ -120,8 +145,6 @@ public class HttpStatusCode {
////Field descriptor #62 I
//public static final int SC_REQUEST_TIMEOUT = 408;
//
-////Field descriptor #62 I
-//public static final int SC_CONFLICT = 409;
public final static HttpStatusCode NOT_CONFLICT = new HttpStatusCode(409);
Added: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java?rev=1164045&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java Thu Sep 1 12:31:06 2011
@@ -0,0 +1,34 @@
+package org.apache.isis.viewer.json.applib.blocks;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+
+import java.io.UnsupportedEncodingException;
+
+import org.junit.Test;
+
+public class LinkTest_equals {
+
+ @Test
+ public void equalDependsOnMethodAndHref() throws UnsupportedEncodingException {
+ Link link = new Link().withHref("http://localhost:8080/objects/ABC:123").withMethod(Method.GET);
+ Link link2 = new Link().withHref("http://localhost:8080/objects/ABC:123").withMethod(Method.GET);
+ Link link3 = new Link().withHref("http://localhost:8080/objects/ABC:123").withMethod(Method.PUT);
+ Link link4 = new Link().withHref("http://localhost:8080/objects/ABC:456").withMethod(Method.GET);
+
+ assertThat(link, is(equalTo(link2)));
+ assertThat(link, is(not(equalTo(link3))));
+ assertThat(link, is(not(equalTo(link4))));
+ }
+
+ @Test
+ public void equalDoesNotDependsOnMethodAndHref() throws UnsupportedEncodingException {
+ Link link = new Link().withHref("http://localhost:8080/objects/ABC:123").withMethod(Method.GET).withRel("something");
+ Link link2 = new Link().withHref("http://localhost:8080/objects/ABC:123").withMethod(Method.GET).withRel("else");
+
+ assertThat(link, is(equalTo(link2)));
+ }
+
+}
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/isis.properties?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/main/webapp/WEB-INF/isis.properties Thu Sep 1 12:31:06 2011
@@ -16,18 +16,18 @@
# under the License.
isis.services.prefix = org.apache.isis.tck.objstore.dflt
isis.services =\
- scalars.ApplibValuesEntityRepositoryDefault,\
- scalars.JdkValuesEntityRepositoryDefault,\
- scalars.PrimitiveValuesEntityRepositoryDefault,\
- scalars.WrapperValuesEntityRepositoryDefault
+ scalars.ApplibValuedEntityRepositoryDefault,\
+ scalars.JdkValuedEntityRepositoryDefault,\
+ scalars.PrimitiveValuedEntityRepositoryDefault,\
+ scalars.WrapperValuedEntityRepositoryDefault
isis.fixtures.prefix= org.apache.isis.tck.fixture
isis.fixtures=\
LogonAsSvenFixture,\
- scalars.ApplibValuesEntityFixture,\
- scalars.JdkValuesEntityFixture,\
- scalars.PrimitiveValuesEntityFixture,\
- scalars.WrapperValuesEntityFixture
+ scalars.ApplibValuedEntityFixture,\
+ scalars.JdkValuedEntityFixture,\
+ scalars.PrimitiveValuedEntityFixture,\
+ scalars.WrapperValuedEntityFixture
isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/ResourceRepresentationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/ResourceRepresentationTest.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/ResourceRepresentationTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/ResourceRepresentationTest.java Thu Sep 1 12:31:06 2011
@@ -9,8 +9,8 @@ import static org.apache.isis.core.commo
import javax.ws.rs.core.Response;
import org.apache.isis.runtimes.dflt.webserver.WebServer;
-import org.apache.isis.tck.dom.scalars.ApplibValuesEntity;
-import org.apache.isis.tck.objstore.dflt.scalars.ApplibValuesEntityRepositoryDefault;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
+import org.apache.isis.tck.objstore.dflt.scalars.ApplibValuedEntityRepositoryDefault;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationWalker;
import org.apache.isis.viewer.json.applib.RestfulClient;
@@ -25,6 +25,7 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.domain.ServicesResource;
import org.apache.isis.viewer.json.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.json.applib.homepage.HomePageResource;
+import org.apache.isis.viewer.json.applib.reptypes.RepresentationTypeRepresentation;
import org.apache.isis.viewer.json.applib.user.UserRepresentation;
import org.apache.isis.viewer.json.applib.util.HttpStatusCode;
import org.apache.isis.viewer.json.applib.util.HttpStatusCode.Range;
@@ -75,6 +76,12 @@ public class ResourceRepresentationTest
assertThat(homePageRepr, is(not(nullValue())));
assertThat(homePageRepr.isMap(), is(true));
+ assertThat(homePageRepr.getRepresentationType(), is(not(nullValue())));
+ assertThat(homePageRepr.getRepresentationType().getMethod(), is(Method.GET));
+
+ assertThat(homePageRepr.getSelf(), is(not(nullValue())));
+ assertThat(homePageRepr.getSelf().getMethod(), is(Method.GET));
+
assertThat(homePageRepr.getUser(), is(not(nullValue())));
assertThat(homePageRepr.getUser().getMethod(), is(Method.GET));
@@ -82,7 +89,47 @@ public class ResourceRepresentationTest
assertThat(homePageRepr.getServices().getMethod(), is(Method.GET));
}
- @Ignore("to get working again")
+ @Test
+ public void homePageResource_linksToSelf() throws Exception {
+ // given
+ HomePageResource homePageResource = client.getHomePageResource();
+
+ // when
+ Response resourcesResp = homePageResource.resources();
+ JsonResponse<HomePageRepresentation> homePageJsonResp = JsonResponse.of(resourcesResp, HomePageRepresentation.class);
+
+ // then
+ HomePageRepresentation homePageRepr = homePageJsonResp.getEntity();
+
+ // and when
+ Response servicesResp = client.follow(homePageRepr.getSelf());
+ JsonResponse<HomePageRepresentation> homePageJsonResp2 = JsonResponse.of(servicesResp, HomePageRepresentation.class);
+
+ // then
+ HomePageRepresentation homePageRepr2 = homePageJsonResp2.getEntity();
+ assertThat(homePageRepr.getSelf(), is(homePageRepr2.getSelf()));
+ }
+
+ @Test
+ public void homePageResource_linksToItsRepresentationType() throws Exception {
+ // given
+ HomePageResource homePageResource = client.getHomePageResource();
+
+ // when
+ Response resourcesResp = homePageResource.resources();
+ JsonResponse<HomePageRepresentation> homePageJsonResp = JsonResponse.of(resourcesResp, HomePageRepresentation.class);
+
+ // then
+ HomePageRepresentation homePageRepr = homePageJsonResp.getEntity();
+
+ // and when
+ Response representationTypeResp = client.follow(homePageRepr.getRepresentationType());
+ JsonResponse<RepresentationTypeRepresentation> representationTypeJsonResp = JsonResponse.of(representationTypeResp, RepresentationTypeRepresentation.class);
+
+ // then
+ assertThat(representationTypeJsonResp.getStatus().getRange(), is (HttpStatusCode.Range.SUCCESS));
+ }
+
@Test
public void homePageResource_linksToServicesResource() throws Exception {
@@ -101,13 +148,17 @@ public class ResourceRepresentationTest
JsonResponse<ServicesRepresentation> servicesJsonResp = JsonResponse.of(servicesResp, ServicesRepresentation.class);
// then
+ assertThat(servicesJsonResp.getStatus().getRange(), is (HttpStatusCode.Range.SUCCESS));
ServicesRepresentation servicesRepr = servicesJsonResp.getEntity();
- JsonRepresentation applibValuesEntityRepoRep = servicesRepr.elementAt(0);
- assertThat(applibValuesEntityRepoRep, is(not(nullValue())));
+ Link serviceReprRepTypeLink = servicesRepr.getRepresentationType();
+ assertThat(serviceReprRepTypeLink.getHref(), matches(".*/representationTypes/list:object$"));
+
+ JsonRepresentation serviceValues = servicesRepr.xpath("/value/e[rel='service']");
+ assertThat(serviceValues, is(not(nullValue())));
+ assertThat(serviceValues.arraySize(), is(greaterThan(0)));
}
- @Ignore("not yet implemented")
@Test
public void homePageResource_linksToUserResource() throws Exception {
@@ -126,10 +177,13 @@ public class ResourceRepresentationTest
JsonResponse<UserRepresentation> userJsonResp = JsonResponse.of(userResp, UserRepresentation.class);
// then
+ assertThat(userJsonResp.getStatus().getRange(), is(HttpStatusCode.Range.SUCCESS));
UserRepresentation userRepr = userJsonResp.getEntity();
- assertThat(userRepr, is(not(nullValue())));
- assertThat(userRepr.isMap(), is(true));
+ Link userReprRepTypeLink = userRepr.getRepresentationType();
+ assertThat(userReprRepTypeLink.getHref(), matches(".*/representationTypes/user$"));
+
+ assertThat(userRepr.getUserName(), is(not(nullValue())));
}
@@ -164,7 +218,7 @@ public class ResourceRepresentationTest
Link repoTypeLink = repoRepr.getLink("type");
assertThat(repoTypeLink.getRel(), is("type"));
assertThat(repoTypeLink.getHref(), matches("http://localhost:\\d+/types/application/vnd." +
- org.apache.isis.tck.objstore.dflt.scalars.ApplibValuesEntityRepositoryDefault.class.getName() +
+ org.apache.isis.tck.objstore.dflt.scalars.ApplibValuedEntityRepositoryDefault.class.getName() +
"\\+json"));
Link repoIconLink = repoRepr.getLink("icon");
@@ -201,6 +255,7 @@ public class ResourceRepresentationTest
}
+ @Ignore("to get working again")
@Test
public void domainObjectResource_returnsDomainObjectRepresentation() throws Exception {
@@ -224,7 +279,7 @@ public class ResourceRepresentationTest
// _self.type
Link selfType = domainObjectRepr.getLink("_self.type");
assertThat(selfType.getRel(), is("type"));
- assertThat(selfType.getHref(), matches(".+" + ApplibValuesEntityRepositoryDefault.class.getName() + ".+"));
+ assertThat(selfType.getHref(), matches(".+" + ApplibValuedEntityRepositoryDefault.class.getName() + ".+"));
assertThat(selfType.getMethod(), is(Method.GET));
assertThat(domainObjectRepr.getString("_self.title"), is("ApplibValues"));
@@ -244,7 +299,7 @@ public class ResourceRepresentationTest
JsonRepresentation idProperty = properties.getRepresentation("id");
assertThat(idProperty.getString("memberType"), is("property"));
assertThat(idProperty.getString("propertyId"), is("id"));
- assertThat(idProperty.getString("value"), is(org.apache.isis.tck.objstore.dflt.scalars.ApplibValuesEntityRepositoryDefault.class.getName()));
+ assertThat(idProperty.getString("value"), is(org.apache.isis.tck.objstore.dflt.scalars.ApplibValuedEntityRepositoryDefault.class.getName()));
assertThat(idProperty.getString("disabledReason"), is(not(nullValue())));
Link idPropertyType = idProperty.getLink("type");
@@ -285,7 +340,7 @@ public class ResourceRepresentationTest
Link newEntityActionType = newEntityAction.getLink("type");
assertThat(newEntityActionType.getRel(), is("type"));
assertThat(newEntityActionType.getHref(), matches(".+vnd\\." +
- ApplibValuesEntity.class.getName() +
+ ApplibValuedEntity.class.getName() +
"\\+json"));
assertThat(newEntityActionType.getMethod(), is(Method.GET));
@@ -295,6 +350,7 @@ public class ResourceRepresentationTest
assertThat(newEntityActionDetails.getMethod(), is(Method.GET));
}
+ @Ignore("to get working again")
@Test
public void domainObjectResource_propertyDetails() throws Exception {
// given
@@ -327,7 +383,7 @@ public class ResourceRepresentationTest
assertThat(type.getMethod(), is(Method.GET));
assertThat(propertyDetailsRepr.getString("memberType"), is("property"));
- assertThat(propertyDetailsRepr.getString("value"), is(org.apache.isis.tck.objstore.dflt.scalars.ApplibValuesEntityRepositoryDefault.class.getName()));
+ assertThat(propertyDetailsRepr.getString("value"), is(org.apache.isis.tck.objstore.dflt.scalars.ApplibValuedEntityRepositoryDefault.class.getName()));
assertThat(propertyDetailsRepr.getString("disabledReason"), is(not(nullValue())));
}
@@ -385,6 +441,7 @@ public class ResourceRepresentationTest
}
+ @Ignore("to get working again")
@Test
public void domainObjectResource_actionPostInvoke_returningList() throws Exception {
@@ -415,7 +472,7 @@ public class ResourceRepresentationTest
Link domainObjectTypeLink = domainObjectRefRepr.getLink("type");
assertThat(domainObjectTypeLink.getRel(), is("type"));
assertThat(domainObjectTypeLink.getHref(), matches("http://localhost:\\d+/types/application/vnd." +
- org.apache.isis.tck.dom.scalars.ApplibValuesEntity.class.getName() +
+ org.apache.isis.tck.dom.scalars.ApplibValuedEntity.class.getName() +
"\\+json"));
Link domainObjectIconLink = domainObjectRefRepr.getLink("icon");
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java Thu Sep 1 12:31:06 2011
@@ -20,13 +20,17 @@ package org.apache.isis.viewer.json.view
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.reptypes.RepresentationTypeResourceImpl;
import org.apache.isis.viewer.json.viewer.resources.services.ServicesResourceImpl;
+import org.apache.isis.viewer.json.viewer.resources.user.UserResourceImpl;
public class JsonApplication extends AbstractJaxRsApplication {
public JsonApplication() {
addSingleton(new HomePageResourceImpl());
+ addSingleton(new RepresentationTypeResourceImpl());
addSingleton(new ServicesResourceImpl());
+ addSingleton(new UserResourceImpl());
addSingleton(new DomainObjectResourceImpl());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java?rev=1164045&r1=1164044&r2=1164045&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkRepBuilder.java Thu Sep 1 12:31:06 2011
@@ -25,29 +25,30 @@ import org.apache.isis.viewer.json.viewe
public class LinkRepBuilder extends RepresentationBuilder {
- public static LinkRepBuilder newBuilder(RepContext repContext, String relSuffix, String url) {
- return new LinkRepBuilder(repContext, relSuffix, url);
- }
- public static TypeBuilder newTypeBuilder(RepContext repContext, ObjectSpecification objectSpec) {
- return new TypeBuilder(repContext, objectSpec);
+ public static LinkRepBuilder newBuilder(RepContext repContext, String rel, String href) {
+ return new LinkRepBuilder(repContext, rel, href);
}
- public static LinkRepBuilder newObjectBuilder(RepContext repContext,
- ObjectAdapter elementAdapter, OidStringifier oidStringifier) {
+ public static LinkRepBuilder newObjectBuilder(RepContext repContext, ObjectAdapter elementAdapter, OidStringifier oidStringifier) {
String url = DomainObjectRepBuilder.urlFor(elementAdapter, oidStringifier);
return LinkRepBuilder.newBuilder(repContext, "object", url);
}
- private final String relSuffix;
+ public static LinkRepBuilder newTypeBuilder(RepContext repContext, ObjectSpecification objectSpec) {
+ String url = "types/" + WellKnownType.canonical(objectSpec.getFullIdentifier());
+ return LinkRepBuilder.newBuilder(repContext, "type", url);
+ }
+
+ private final String rel;
private final String href;
private HttpMethod method = HttpMethod.GET;
private String title;
- private Object body;
+ private JsonRepresentation arguments;
- public LinkRepBuilder(RepContext repContext, String relSuffix, String href) {
+ public LinkRepBuilder(RepContext repContext, String rel, String href) {
super(repContext);
- this.relSuffix = relSuffix;
+ this.rel = rel;
this.href = href;
}
public LinkRepBuilder withHttpMethod(HttpMethod method) {
@@ -58,16 +59,17 @@ public class LinkRepBuilder extends Repr
this.title = title;
return this;
}
- public LinkRepBuilder withBody(Object body) {
- this.body = body;
+ public LinkRepBuilder withArguments(JsonRepresentation arguments) {
+ this.arguments = arguments;
return this;
}
public JsonRepresentation build() {
- representation.put("rel", relSuffix);
+ representation.put("rel", rel);
representation.put("href", repContext.urlFor(href));
representation.put("method", method);
representation.put("title", title);
- representation.put("body", body);
+ representation.put("arguments", arguments);
return representation;
}
+
}
\ No newline at end of file
Added: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/WellKnownType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/WellKnownType.java?rev=1164045&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/WellKnownType.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/WellKnownType.java Thu Sep 1 12:31:06 2011
@@ -0,0 +1,61 @@
+package org.apache.isis.viewer.json.viewer.representations;
+
+
+public enum WellKnownType {
+
+ STRING(java.lang.String.class),
+ BYTE(java.lang.Byte.class),
+ SHORT(java.lang.Short.class),
+ INT(java.lang.Integer.class),
+ LONG(java.lang.Long.class),
+ BOOLEAN(java.lang.Boolean.class),
+ FLOAT(java.lang.Float.class),
+ DOUBLE(java.lang.Double.class),
+ BIGINT(java.math.BigInteger.class),
+ BIGDEC(java.math.BigDecimal.class),
+ OBJECT(java.lang.Object.class),
+ LIST(java.util.List.class),
+ SET(java.util.Set.class);
+
+ private final Class<?> cls;
+ private final String className;
+
+ private WellKnownType(Class<?> cls) {
+ this.cls = cls;
+ this.className = cls.getName();
+ }
+
+ public String getName() {
+ return name().toLowerCase();
+ }
+
+ public static WellKnownType lookup(Class<?> cls) {
+ for (WellKnownType wellKnownType : values()) {
+ if(wellKnownType.cls.equals(cls)) {
+ return wellKnownType;
+ }
+ }
+ return null;
+ }
+
+ public static WellKnownType lookup(String className) {
+ for (WellKnownType wellKnownType : values()) {
+ if(wellKnownType.className.equals(className)) {
+ return wellKnownType;
+ }
+ }
+ return null;
+ }
+
+ public static String canonical(String className) {
+ WellKnownType wellKnownType = WellKnownType.lookup(className);
+ return wellKnownType != null? wellKnownType.getName(): className;
+ }
+
+ public static String canonical(Class<?> cls) {
+ WellKnownType wellKnownType = WellKnownType.lookup(cls);
+ return wellKnownType != null? wellKnownType.getName(): cls.getName();
+ }
+
+
+}