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/10/12 08:45:02 UTC
svn commit: r1182226 [2/2] - in /incubator/isis/trunk/framework:
applib/src/main/java/org/apache/isis/applib/annotation/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/stable/
core/progmodel/src/main/java/org/apache/isis/core...
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
public abstract class AbstractObjectMemberReprRenderer<R extends ReprRendererAbstract<R, ObjectAndMember<T>>, T extends ObjectMember>
@@ -37,8 +37,8 @@ public abstract class AbstractObjectMemb
protected T objectMember;
- public AbstractObjectMemberReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public AbstractObjectMemberReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
@@ -52,8 +52,8 @@ public class DomainObjectReprRenderer ex
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new DomainObjectReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new DomainObjectReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -66,8 +66,8 @@ public class DomainObjectReprRenderer ex
private ObjectAdapterLinkToBuilder linkToBuilder;
private ObjectAdapter objectAdapter;
- private DomainObjectReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private DomainObjectReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
usingLinkToBuilder(new DomainObjectLinkToBuilder());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -22,7 +22,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
+import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
+import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -35,15 +37,15 @@ public class ListReprRenderer extends Re
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new ListReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new ListReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
private ObjectAdapterLinkToBuilder objectAdapterLinkToBuilder;
- private ListReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private ListReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
usingLinkToBuilder(new DomainObjectLinkToBuilder());
}
@@ -55,9 +57,21 @@ public class ListReprRenderer extends Re
@Override
public ListReprRenderer with(Collection<ObjectAdapter> objectAdapters) {
JsonRepresentation list = JsonRepresentation.newArray();
+
+ final LinkFollower linkFollower = getLinkFollower().follow("values");
+ final boolean following = linkFollower.isFollowing();
+
for(ObjectAdapter adapter: objectAdapters) {
JsonRepresentation linkToObject = objectAdapterLinkToBuilder.with(adapter).linkToAdapter().build();
list.arrayAdd(linkToObject);
+
+ if(following) {
+ final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.DOMAIN_OBJECT);
+ final DomainObjectReprRenderer renderer =
+ (DomainObjectReprRenderer) factory.newRenderer(getResourceContext(), linkFollower, JsonRepresentation.newMap());
+ JsonRepresentation domainObject = renderer.with(adapter).render();
+ linkToObject.mapPut("value", domainObject);
+ }
}
representation.mapPut("values", list);
return this;
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
@@ -44,13 +44,13 @@ public class ObjectActionReprRenderer ex
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new ObjectActionReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new ObjectActionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private ObjectActionReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private ObjectActionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public JsonRepresentation render() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -44,13 +44,13 @@ public class ObjectCollectionReprRendere
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new ObjectCollectionReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new ObjectCollectionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private ObjectCollectionReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private ObjectCollectionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public JsonRepresentation render() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
@@ -42,14 +42,14 @@ public class ObjectPropertyReprRenderer
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new ObjectPropertyReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new ObjectPropertyReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private ObjectPropertyReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private ObjectPropertyReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public JsonRepresentation render() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -23,7 +23,7 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.json.viewer.JsonApplicationException;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -36,13 +36,13 @@ public class ScalarValueReprRenderer ext
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new ScalarValueReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new ScalarValueReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private ScalarValueReprRenderer(final ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private ScalarValueReprRenderer(final ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public ScalarValueReprRenderer with(final ObjectAdapter objectAdapter) {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeFeatureReprBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeFeatureReprBuilder.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeFeatureReprBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeFeatureReprBuilder.java Wed Oct 12 06:45:00 2011
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.resources.domainobjects.MemberType;
@@ -33,8 +33,8 @@ public abstract class AbstractTypeFeatur
protected MemberType memberType;
protected T objectFeature;
- public AbstractTypeFeatureReprBuilder(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public AbstractTypeFeatureReprBuilder(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public ObjectSpecification getObjectSpecification() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -20,7 +20,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
@@ -34,8 +34,8 @@ public class DomainTypeReprRenderer exte
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new DomainTypeReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new DomainTypeReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -47,8 +47,8 @@ public class DomainTypeReprRenderer exte
private ObjectSpecification objectSpecification;
- public DomainTypeReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public DomainTypeReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -6,7 +6,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
@@ -22,13 +22,13 @@ public class DomainTypesReprRenderer ext
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new DomainTypesReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new DomainTypesReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private DomainTypesReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private DomainTypesReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -36,8 +36,8 @@ public class TypeActionParamReprRenderer
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new TypeActionParamReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new TypeActionParamReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -50,8 +50,8 @@ public class TypeActionParamReprRenderer
return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION_PARAMETER, url);
}
- public TypeActionParamReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public TypeActionParamReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -35,8 +35,8 @@ public class TypeActionReprRenderer exte
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new TypeActionReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new TypeActionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -47,8 +47,8 @@ public class TypeActionReprRenderer exte
return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION, url);
}
- public TypeActionReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public TypeActionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -35,8 +35,8 @@ public class TypeCollectionReprRenderer
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new TypeCollectionReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new TypeCollectionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -47,8 +47,8 @@ public class TypeCollectionReprRenderer
return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_COLLECTION, url);
}
- public TypeCollectionReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public TypeCollectionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public JsonRepresentation render() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -35,8 +35,8 @@ public class TypePropertyReprRenderer ex
}
@Override
- public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new TypePropertyReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new TypePropertyReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
@@ -47,8 +47,8 @@ public class TypePropertyReprRenderer ex
return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_PROPERTY, url);
}
- public TypePropertyReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ public TypePropertyReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
public JsonRepresentation render() {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -6,7 +6,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
@@ -26,13 +26,13 @@ public class HomePageReprRenderer extend
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new HomePageReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new HomePageReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private HomePageReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private HomePageReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
@Override
@@ -67,11 +67,11 @@ public class HomePageReprRenderer extend
private void putLinkToSelf(JsonRepresentation representation) {
final LinkBuilder linkBuilder = LinkBuilder.newBuilder(resourceContext, "self", getRepresentationType(), "");
- final PathFollower pathFollower = getPathFollower().follow("self");
- if(!pathFollower.isTerminated()) {
+ final LinkFollower linkFollower = getLinkFollower().follow("self");
+ if(linkFollower.isFollowing()) {
final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.HOME_PAGE);
- final HomePageReprRenderer renderer = (HomePageReprRenderer) factory.newRenderer(getResourceContext(), pathFollower, JsonRepresentation.newMap());
+ final HomePageReprRenderer renderer = (HomePageReprRenderer) factory.newRenderer(getResourceContext(), linkFollower, JsonRepresentation.newMap());
linkBuilder.withValue(renderer.render());
}
@@ -81,11 +81,11 @@ public class HomePageReprRenderer extend
private void putLinkToCapabilities(final JsonRepresentation representation) {
final LinkBuilder linkBuilder = LinkBuilder.newBuilder(getResourceContext(), "capabilities", RepresentationType.CAPABILITIES, "capabilities");
- final PathFollower pathFollower = getPathFollower().follow("capabilities");
- if(!pathFollower.isTerminated()) {
+ final LinkFollower linkFollower = getLinkFollower().follow("capabilities");
+ if(linkFollower.isFollowing()) {
final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.CAPABILITIES);
- final CapabilitiesReprRenderer renderer = (CapabilitiesReprRenderer) factory.newRenderer(getResourceContext(), pathFollower, JsonRepresentation.newMap());
+ final CapabilitiesReprRenderer renderer = (CapabilitiesReprRenderer) factory.newRenderer(getResourceContext(), linkFollower, JsonRepresentation.newMap());
linkBuilder.withValue(renderer.render());
}
@@ -98,14 +98,14 @@ public class HomePageReprRenderer extend
final LinkBuilder linkBuilder =
LinkBuilder.newBuilder(getResourceContext(), "services", RepresentationType.LIST, "services");
- final PathFollower pathFollower = getPathFollower().follow("services");
- if(!pathFollower.isTerminated()) {
+ final LinkFollower linkFollower = getLinkFollower().follow("services");
+ if(linkFollower.isFollowing()) {
final List<ObjectAdapter> serviceAdapters = getResourceContext().getPersistenceSession().getServices();
final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.LIST);
- final ListReprRenderer renderer = (ListReprRenderer) factory.newRenderer(getResourceContext(), pathFollower, JsonRepresentation.newMap());
+ final ListReprRenderer renderer = (ListReprRenderer) factory.newRenderer(getResourceContext(), linkFollower, JsonRepresentation.newMap());
renderer.usingLinkToBuilder(new DomainServiceLinkToBuilder())
.withSelf("services")
.with(serviceAdapters);
@@ -120,11 +120,11 @@ public class HomePageReprRenderer extend
final LinkBuilder userLinkBuilder =
LinkBuilder.newBuilder(getResourceContext(), "user", RepresentationType.USER, "user");
- final PathFollower pathFollower = getPathFollower().follow("user");
- if(!pathFollower.isTerminated()) {
+ final LinkFollower linkFollower = getLinkFollower().follow("user");
+ if(linkFollower.isFollowing()) {
final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.USER);
final UserReprRenderer renderer =
- (UserReprRenderer) factory.newRenderer(getResourceContext(), pathFollower, JsonRepresentation.newMap());
+ (UserReprRenderer) factory.newRenderer(getResourceContext(), linkFollower, JsonRepresentation.newMap());
renderer.with(getResourceContext().getAuthenticationSession());
userLinkBuilder.withValue(renderer.render());
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserReprRenderer.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/user/UserReprRenderer.java Wed Oct 12 06:45:00 2011
@@ -20,7 +20,7 @@ import org.apache.isis.core.commons.auth
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.PathFollower;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -34,13 +34,13 @@ public class UserReprRenderer extends Re
}
@Override
- public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, PathFollower pathFollower, JsonRepresentation representation) {
- return new UserReprRenderer(resourceContext, pathFollower, getRepresentationType(), representation);
+ public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+ return new UserReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
}
}
- private UserReprRenderer(ResourceContext resourceContext, PathFollower pathFollower, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, pathFollower, representationType, representation);
+ private UserReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+ super(resourceContext, linkFollower, representationType, representation);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/PathFollowerTest_asGraph.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/PathFollowerTest_asGraph.java?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/PathFollowerTest_asGraph.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/PathFollowerTest_asGraph.java Wed Oct 12 06:45:00 2011
@@ -15,7 +15,7 @@ public class PathFollowerTest_asGraph {
@Test
public void simple() throws Exception {
List<List<String>> links = asListOfLists("a.b.c,a.b.d,d.b,e,e");
- final Map<String, Map> root = PathFollower.asGraph(links);
+ final Map<String, Map> root = LinkFollower.asGraph(links);
assertThat(root.size(), is(3));
Map<String,Map> nodeA = root.get("a");
@@ -39,14 +39,14 @@ public class PathFollowerTest_asGraph {
@Test
public void empty() throws Exception {
List<List<String>> links = asListOfLists("");
- final Map<String, Map> root = PathFollower.asGraph(links);
+ final Map<String, Map> root = LinkFollower.asGraph(links);
assertThat(root.size(), is(0));
}
@Test
public void whenNull() throws Exception {
- final Map<String, Map> root = PathFollower.asGraph(null);
+ final Map<String, Map> root = LinkFollower.asGraph(null);
assertThat(root.size(), is(0));
}
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/src/main/webapp/WEB-INF/isis.properties Wed Oct 12 06:45:00 2011
@@ -14,20 +14,23 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# 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, \
+ simples.SimpleEntityRepositoryDefault,\
+ stables.StableEntityRepositoryDefault
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,\
+ simples.SimpleEntityFixture,\
+ stables.StableEntityFixture
isis.exploration.users=sven, dick, bob
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/webapp/WEB-INF/isis.properties Wed Oct 12 06:45:00 2011
@@ -16,20 +16,22 @@
# 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, \
+ simples.SimpleEntityRepositoryDefault,\
+ stables.StableEntityRepositoryDefault
isis.fixtures.prefix= org.apache.isis.tck.fixture
isis.fixtures=\
LogonAsSvenFixture,\
- scalars.ApplibValuesEntityFixture,\
- scalars.JdkValuesEntityFixture,\
- scalars.PrimitiveValuesEntityFixture,\
- scalars.WrapperValuesEntityFixture
-
-isis.exploration.users=sven, dick, bob
+ scalars.ApplibValuedEntityFixture,\
+ scalars.JdkValuedEntityFixture,\
+ scalars.PrimitiveValuedEntityFixture,\
+ scalars.WrapperValuedEntityFixture,\
+ simples.SimpleEntityFixture,\
+ stables.StableEntityFixture
isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
Modified: incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties?rev=1182226&r1=1182225&r2=1182226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/src/main/webapp/WEB-INF/isis.properties Wed Oct 12 06:45:00 2011
@@ -16,18 +16,22 @@
# 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, \
+ simples.SimpleEntityRepositoryDefault,\
+ stables.StableEntityRepositoryDefault
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,\
+ simples.SimpleEntityFixture,\
+ stables.StableEntityFixture
isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor