You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/05/19 09:28:38 UTC
svn commit: r1340365 [4/5] - in /incubator/isis/trunk/framework: ./ applib/
core/ core/commons/ core/metamodel/ core/progmodel/ core/runtime/
core/testsupport/ core/webapp/ progmodels/ progmodels/dflt/
progmodels/groovy/ progmodels/groovy/applib/ progm...
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AssociatedEntitiesRepository.java (from r1338476, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AssociatedEntitiesRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AssociatedEntitiesRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoRepository.java&r1=1338476&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AssociatedEntitiesRepository.java Sat May 19 07:28:31 2012
@@ -17,16 +17,33 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
+import java.util.List;
+
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ObjectType;
-@ObjectType("ExamplePojoRepository")
-public class ExamplePojoRepository {
-
- public ExamplePojo someAction() { return null; }
- public ExamplePojoWithValues someAction2() { return null; }
- public ExamplePojoWithReferences someAction3() { return null; }
- public ExamplePojoWithCollections someAction4() { return null; }
+@ObjectType("AssociatedEntities")
+public class AssociatedEntitiesRepository extends AbstractFactoryAndRepository {
+ public BaseEntity someAction() { return null; }
+ public SimpleEntity someAction2() { return null; }
+ public ReferencingEntity someAction3() { return null; }
+ public ParentEntity someAction4() { return null; }
+
+ @MemberOrder(sequence = "1")
+ public List<ParentEntity> list() {
+ return allInstances(ParentEntity.class);
+ }
+
+ @MemberOrder(sequence = "2")
+ public ParentEntity newEntity(final String name) {
+ final ParentEntity entity = newTransientInstance(ParentEntity.class);
+ entity.setName(name);
+ persist(entity);
+ return entity;
+ }
+
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BaseEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojo.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BaseEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BaseEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojo.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojo.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BaseEntity.java Sat May 19 07:28:31 2012
@@ -17,8 +17,10 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
-public abstract class ExamplePojo {
+import org.apache.isis.applib.AbstractContainedObject;
+
+public abstract class BaseEntity extends AbstractContainedObject {
}
Added: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ChildEntity.java?rev=1340365&view=auto
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ChildEntity.java (added)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ChildEntity.java Sat May 19 07:28:31 2012
@@ -0,0 +1,99 @@
+/*
+ * 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.tck.dom.refs;
+
+import java.util.List;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.applib.util.TitleBuffer;
+
+@ObjectType("CHLD")
+public class ChildEntity extends AbstractDomainObject {
+
+ // {{ Identification
+ public String title() {
+ final TitleBuffer buf = new TitleBuffer();
+ if (getParent() != null) {
+ buf.append(getParent().getName()).append("-");
+ }
+ buf.append(getName());
+ return buf.toString();
+ }
+
+ // }}
+
+ // {{ Name
+ private String name;
+
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+ // {{ Parent
+ private ParentEntity parent;
+
+ @MemberOrder(sequence = "1")
+ @Optional
+ public ParentEntity getParent() {
+ return parent;
+ }
+
+ public void setParent(final ParentEntity parent) {
+ this.parent = parent;
+ }
+
+ // }}
+
+ // {{ moveTo
+ @MemberOrder(sequence = "1")
+ public ChildEntity moveTo(final ParentEntity newParent) {
+ if (newParent == getParent()) {
+ // nothing to do
+ return this;
+ }
+ if (getParent() != null) {
+ getParent().removeChild(this);
+ }
+ newParent.getChildren().add(this);
+ this.setParent(newParent);
+ return this;
+ }
+
+ public ParentEntity default0MoveTo() {
+ return getParent();
+ }
+
+ public List<ParentEntity> choices0MoveTo() {
+ return getContainer().allInstances(ParentEntity.class);
+ }
+
+ // }}
+
+}
Propchange: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ChildEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntity.java (from r1338476, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithCollections.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithCollections.java&r1=1338476&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithCollections.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntity.java Sat May 19 07:28:31 2012
@@ -17,48 +17,116 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
import java.util.ArrayList;
import java.util.List;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.applib.util.TitleBuffer;
-@ObjectType("EPC")
-public class ExamplePojoWithCollections extends ExamplePojo {
+@ObjectType("PRNT")
+public class ParentEntity extends BaseEntity {
+
+ // {{ Identification
+ public String title() {
+ final TitleBuffer buf = new TitleBuffer();
+ buf.append(getName());
+ return buf.toString();
+ }
+ // }}
+
+ // {{ Name
+ private String name;
+ @MemberOrder(sequence = "1")
+ @Optional
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
// {{ HomogeneousCollection
- private List<ExamplePojoWithValues> homogeneousCollection = new ArrayList<ExamplePojoWithValues>();
+ private List<SimpleEntity> homogeneousCollection = new ArrayList<SimpleEntity>();
- public List<ExamplePojoWithValues> getHomogeneousCollection() {
+ public List<SimpleEntity> getHomogeneousCollection() {
return homogeneousCollection;
}
- public void setHomogeneousCollection(final List<ExamplePojoWithValues> homogenousCollection) {
+ public void setHomogeneousCollection(final List<SimpleEntity> homogenousCollection) {
this.homogeneousCollection = homogenousCollection;
}
// }}
// {{ HeterogeneousCollection
- private List<ExamplePojo> heterogeneousCollection = new ArrayList<ExamplePojo>();
+ private List<BaseEntity> heterogeneousCollection = new ArrayList<BaseEntity>();
- public List<ExamplePojo> getHeterogeneousCollection() {
+ public List<BaseEntity> getHeterogeneousCollection() {
return heterogeneousCollection;
}
- public void setHeterogeneousCollection(final List<ExamplePojo> hetrogenousCollection) {
+ public void setHeterogeneousCollection(final List<BaseEntity> hetrogenousCollection) {
this.heterogeneousCollection = hetrogenousCollection;
}
// }}
+ // {{ Children
+ private List<ChildEntity> children = new ArrayList<ChildEntity>();
+
+ @MemberOrder(sequence = "1")
+ public List<ChildEntity> getChildren() {
+ return children;
+ }
+
+ public void setChildren(final List<ChildEntity> children) {
+ this.children = children;
+ }
+ // }}
+
// {{ NotPersisted
@NotPersisted
- public List<ExamplePojoWithValues> getNotPersisted() {
+ public List<SimpleEntity> getNotPersisted() {
throw new org.apache.isis.applib.ApplicationException("unexpected call");
}
// }}
+
+
+ // {{ newChild (action)
+ public ChildEntity newChild(final String name) {
+ final ChildEntity childEntity = newTransientInstance(ChildEntity.class);
+ childEntity.setName(name);
+ childEntity.setParent(this);
+ this.getChildren().add(childEntity);
+ persistIfNotAlready(childEntity);
+ return childEntity;
+ }
+
+ // }}
+
+
+
+ // {{ removeChild (action)
+ public ParentEntity removeChild(final ChildEntity childEntity) {
+ if (homogeneousCollection.contains(childEntity)) {
+ homogeneousCollection.remove(childEntity);
+ childEntity.setParent(null);
+ }
+ return this;
+ }
+
+ public List<ChildEntity> choices0RemoveChild() {
+ return getChildren();
+ }
+ // }}
+
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithReferences.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithReferences.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithReferences.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java Sat May 19 07:28:31 2012
@@ -17,42 +17,42 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.ObjectType;
-@ObjectType("EPR")
-public class ExamplePojoWithReferences extends ExamplePojo {
+@ObjectType("RFCG")
+public class ReferencingEntity extends BaseEntity {
// {{ Reference
- private ExamplePojoWithValues reference;
+ private SimpleEntity reference;
- public ExamplePojoWithValues getReference() {
+ public SimpleEntity getReference() {
return reference;
}
- public void setReference(final ExamplePojoWithValues reference) {
+ public void setReference(final SimpleEntity reference) {
this.reference = reference;
}
// }}
// {{ AggregatedReference
- private ExamplePojoAggregated aggregatedReference;
+ private AggregatedEntity aggregatedReference;
- public ExamplePojoAggregated getAggregatedReference() {
+ public AggregatedEntity getAggregatedReference() {
return aggregatedReference;
}
- public void setAggregatedReference(final ExamplePojoAggregated aggregatedReference) {
+ public void setAggregatedReference(final AggregatedEntity aggregatedReference) {
this.aggregatedReference = aggregatedReference;
}
// }}
// {{ NotPersisted
@NotPersisted
- public ExamplePojoWithValues getNotPersisted() {
+ public SimpleEntity getNotPersisted() {
throw new org.apache.isis.applib.ApplicationException("unexpected call");
}
// }}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (from r1338476, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithValues.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithValues.java&r1=1338476&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoWithValues.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java Sat May 19 07:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
import java.util.Date;
@@ -26,16 +26,15 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
-@ObjectType("EPV")
-public class ExamplePojoWithValues extends ExamplePojo {
-
+@ObjectType("SMPL")
+public class SimpleEntity extends BaseEntity {
public String title() {
return getName();
}
- // {{ Name
+ // {{ name: String
private String name;
@MemberOrder(sequence = "1")
@@ -49,7 +48,7 @@ public class ExamplePojoWithValues exten
// }}
- // {{ Date (property)
+ // {{ Date: java.util.Date
private Date date;
@Optional
@@ -63,7 +62,7 @@ public class ExamplePojoWithValues exten
}
// }}
- // {{ Size
+ // {{ Size: int
private int size;
@MemberOrder(sequence = "1")
@@ -77,7 +76,7 @@ public class ExamplePojoWithValues exten
// }}
- // {{ Nullable
+ // {{ Nullable: long
private Long number;
@Optional
@@ -92,7 +91,7 @@ public class ExamplePojoWithValues exten
// }}
- // {{ NotPersisted
+ // {{ NotPersisted: int (nb: throws exception if called)
@NotPersisted
public int getNotPersisted() {
throw new org.apache.isis.applib.ApplicationException("unexpected call");
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java Sat May 19 07:28:31 2012
@@ -21,6 +21,7 @@ package org.apache.isis.tck.dom.scalars;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.value.Color;
import org.apache.isis.applib.value.Date;
@@ -32,6 +33,7 @@ import org.apache.isis.applib.value.Perc
import org.apache.isis.applib.value.Time;
import org.apache.isis.applib.value.TimeStamp;
+@ObjectType("APLV")
public class ApplibValuedEntity extends AbstractDomainObject {
// {{ ColorProperty
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java Sat May 19 07:28:31 2012
@@ -21,16 +21,32 @@ package org.apache.isis.tck.dom.scalars;
import java.util.List;
+import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.QueryOnly;
@Named("ApplibValues")
-public interface ApplibValuedEntityRepository {
+@ObjectType("ApplibValues")
+public class ApplibValuedEntityRepository extends AbstractFactoryAndRepository {
+ @Override
+ public String getId() {
+ return "applibValuedEntities";
+ }
+
+ @QueryOnly
@MemberOrder(sequence = "1")
- public List<ApplibValuedEntity> list();
+ public List<ApplibValuedEntity> list() {
+ return allInstances(ApplibValuedEntity.class);
+ }
@MemberOrder(sequence = "2")
- public ApplibValuedEntity newEntity();
+ public ApplibValuedEntity newEntity() {
+ final ApplibValuedEntity entity = newTransientInstance(ApplibValuedEntity.class);
+ persist(entity);
+ return entity;
+ }
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java Sat May 19 07:28:31 2012
@@ -26,8 +26,10 @@ import java.util.Date;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
+@ObjectType("JDKV")
public class JdkValuedEntity extends AbstractDomainObject {
// {{ Title
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java Sat May 19 07:28:31 2012
@@ -21,16 +21,31 @@ package org.apache.isis.tck.dom.scalars;
import java.util.List;
+import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.QueryOnly;
@Named("JdkValues")
-public interface JdkValuedEntityRepository {
+@ObjectType("JdkValues")
+public class JdkValuedEntityRepository extends AbstractFactoryAndRepository {
+
+ public String getId() {
+ return "jdkValuedEntities";
+ }
@MemberOrder(sequence = "1")
- public List<JdkValuedEntity> list();
+ @QueryOnly
+ public List<JdkValuedEntity> list() {
+ return allInstances(JdkValuedEntity.class);
+ }
@MemberOrder(sequence = "2")
- public JdkValuedEntity newEntity();
+ public JdkValuedEntity newEntity() {
+ final JdkValuedEntity entity = newTransientInstance(JdkValuedEntity.class);
+ persist(entity);
+ return entity;
+ }
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java Sat May 19 07:28:31 2012
@@ -21,16 +21,31 @@ package org.apache.isis.tck.dom.scalars;
import java.util.List;
+import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.QueryOnly;
@Named("PrimitiveValues")
-public interface PrimitiveValuedEntityRepository {
+@ObjectType("PRMV")
+public class PrimitiveValuedEntityRepository extends AbstractFactoryAndRepository {
+ @Override
+ public String getId() {
+ return "primitiveValuedEntities";
+ }
+
+ @QueryOnly
@MemberOrder(sequence = "1")
- public List<PrimitiveValuedEntity> list();
+ public List<PrimitiveValuedEntity> list() {
+ return allInstances(PrimitiveValuedEntity.class);
+ }
@MemberOrder(sequence = "2")
- public PrimitiveValuedEntity newEntity();
-
+ public PrimitiveValuedEntity newEntity() {
+ final PrimitiveValuedEntity entity = newTransientInstance(PrimitiveValuedEntity.class);
+ persist(entity);
+ return entity;
+ }
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java Sat May 19 07:28:31 2012
@@ -21,8 +21,10 @@ package org.apache.isis.tck.dom.scalars;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
+@ObjectType("WRPV")
public class WrapperValuedEntity extends AbstractDomainObject {
// {{ Title
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.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?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java Sat May 19 07:28:31 2012
@@ -21,16 +21,31 @@ package org.apache.isis.tck.dom.scalars;
import java.util.List;
+import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.annotation.QueryOnly;
@Named("WrapperValues")
-public interface WrapperValuedEntityRepository {
+@ObjectType("WrapperValues")
+public class WrapperValuedEntityRepository extends AbstractFactoryAndRepository {
+
+ @Override
+ public String getId() {
+ return "wrapperValuedEntities";
+ }
@MemberOrder(sequence = "1")
- public List<WrapperValuedEntity> list();
+ @QueryOnly
+ public List<WrapperValuedEntity> list() {
+ return allInstances(WrapperValuedEntity.class);
+ }
@MemberOrder(sequence = "2")
- public WrapperValuedEntity newEntity();
-
+ public WrapperValuedEntity newEntity() {
+ final WrapperValuedEntity entity = newTransientInstance(WrapperValuedEntity.class);
+ persist(entity);
+ return entity;
+ }
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java Sat May 19 07:28:31 2012
@@ -25,19 +25,19 @@ package org.apache.isis.tck.dom.sqlos;
import java.util.List;
import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.tck.dom.sqlos.data.NumericTestClass;
+import org.apache.isis.tck.dom.poly.Empty;
+import org.apache.isis.tck.dom.poly.ReferencingPolyTypesEntity;
+import org.apache.isis.tck.dom.poly.SelfReferencingEntity;
+import org.apache.isis.tck.dom.poly.StringBaseEntitySub;
+import org.apache.isis.tck.dom.poly.StringBaseEntitySubThree;
+import org.apache.isis.tck.dom.poly.StringBaseEntitySubTwo;
+import org.apache.isis.tck.dom.poly.Stringable;
+import org.apache.isis.tck.dom.poly.StringableEntityWithOwnProperties;
+import org.apache.isis.tck.dom.poly.StringableEntityWithOwnProperty;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.tck.dom.sqlos.data.SimpleClass;
import org.apache.isis.tck.dom.sqlos.data.SimpleClassTwo;
import org.apache.isis.tck.dom.sqlos.data.SqlDataClass;
-import org.apache.isis.tck.dom.sqlos.poly.EmptyInterface;
-import org.apache.isis.tck.dom.sqlos.poly.PolyInterface;
-import org.apache.isis.tck.dom.sqlos.poly.PolyInterfaceImplA;
-import org.apache.isis.tck.dom.sqlos.poly.PolyInterfaceImplB;
-import org.apache.isis.tck.dom.sqlos.poly.PolySelfRefClass;
-import org.apache.isis.tck.dom.sqlos.poly.PolySubClassOne;
-import org.apache.isis.tck.dom.sqlos.poly.PolySubClassThree;
-import org.apache.isis.tck.dom.sqlos.poly.PolySubClassTwo;
-import org.apache.isis.tck.dom.sqlos.poly.PolyTestClass;
/**
* @author Kevin
@@ -100,71 +100,70 @@ public class SqlDomainObjectRepository e
return object;
}
- // NumericTestClass
- public List<NumericTestClass> allNumericTestClasses() {
- return allInstances(NumericTestClass.class);
+ // PrimitiveValuedEntity
+ public List<PrimitiveValuedEntity> allPrimitiveValueEntities() {
+ return allInstances(PrimitiveValuedEntity.class);
}
- public NumericTestClass newNumericTestClass() {
- final NumericTestClass object = newTransientInstance(NumericTestClass.class);
- return object;
+ public PrimitiveValuedEntity newPrimitiveValuedEntity() {
+ return newTransientInstance(PrimitiveValuedEntity.class);
}
- public List<NumericTestClass> allNumericTestClassesThatMatch(final NumericTestClass match) {
- return allMatches(NumericTestClass.class, match);
+ public List<PrimitiveValuedEntity> allPrimitiveValuedEntitiesThatMatch(final PrimitiveValuedEntity match) {
+ return allMatches(PrimitiveValuedEntity.class, match);
}
// PolyTestClass
- public PolyTestClass newPolyTestClass() {
- final PolyTestClass object = newTransientInstance(PolyTestClass.class);
+ public ReferencingPolyTypesEntity newPolyTestClass() {
+ final ReferencingPolyTypesEntity object = newTransientInstance(ReferencingPolyTypesEntity.class);
return object;
}
- public List<PolyTestClass> allPolyTestClasses() {
- return allInstances(PolyTestClass.class);
+ public List<ReferencingPolyTypesEntity> allPolyTestClasses() {
+ return allInstances(ReferencingPolyTypesEntity.class);
}
- public PolySubClassOne newPolySubClassOne() {
- final PolySubClassOne object = newTransientInstance(PolySubClassOne.class);
+ public StringBaseEntitySub newPolySubClassOne() {
+ final StringBaseEntitySub object = newTransientInstance(StringBaseEntitySub.class);
return object;
}
- public PolySubClassThree newPolySubClassThree() {
- final PolySubClassThree object = newTransientInstance(PolySubClassThree.class);
+ public StringBaseEntitySubThree newPolySubClassThree() {
+ final StringBaseEntitySubThree object = newTransientInstance(StringBaseEntitySubThree.class);
return object;
}
- public PolySubClassTwo newPolySubClassTwo() {
- final PolySubClassTwo object = newTransientInstance(PolySubClassTwo.class);
+ public StringBaseEntitySubTwo newPolySubClassTwo() {
+ final StringBaseEntitySubTwo object = newTransientInstance(StringBaseEntitySubTwo.class);
return object;
}
- public PolyInterfaceImplA newPolyInterfaceImplA() {
- final PolyInterfaceImplA object = newTransientInstance(PolyInterfaceImplA.class);
+ public StringableEntityWithOwnProperty newPolyInterfaceImplA() {
+ final StringableEntityWithOwnProperty object = newTransientInstance(StringableEntityWithOwnProperty.class);
return object;
}
- public PolyInterfaceImplB newPolyInterfaceImplB() {
- final PolyInterfaceImplB object = newTransientInstance(PolyInterfaceImplB.class);
+ public StringableEntityWithOwnProperties newPolyInterfaceImplB() {
+ final StringableEntityWithOwnProperties object = newTransientInstance(StringableEntityWithOwnProperties.class);
return object;
}
- public PolySelfRefClass newPolySelfRefClass() {
- final PolySelfRefClass object = newTransientInstance(PolySelfRefClass.class);
+ public SelfReferencingEntity newPolySelfRefClass() {
+ final SelfReferencingEntity object = newTransientInstance(SelfReferencingEntity.class);
return object;
}
- public List<PolyInterface> allPolyInterfaces() {
- return allInstances(PolyInterface.class);
+ public List<Stringable> allPolyInterfaces() {
+ return allInstances(Stringable.class);
}
- public List<PolyInterface> queryPolyInterfaces(final PolyInterface query) {
- return allMatches(PolyInterface.class, query);
+ public List<Stringable> queryPolyInterfaces(final Stringable query) {
+ return allMatches(Stringable.class, query);
}
- public List<EmptyInterface> allEmptyInterfacesThatMatch(final EmptyInterface match) {
- return allMatches(EmptyInterface.class, match);
+ public List<Empty> allEmptyInterfacesThatMatch(final Empty match) {
+ return allMatches(Empty.class, match);
}
// }}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClassTwo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClassTwo.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClassTwo.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClassTwo.java Sat May 19 07:28:31 2012
@@ -29,6 +29,7 @@ import org.apache.isis.applib.AbstractDo
*
*/
public class SimpleClassTwo extends AbstractDomainObject {
+
public String title() {
return text;
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SqlDataClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SqlDataClass.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SqlDataClass.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SqlDataClass.java Sat May 19 07:28:31 2012
@@ -33,6 +33,7 @@ import org.apache.isis.applib.value.Pass
import org.apache.isis.applib.value.Percentage;
import org.apache.isis.applib.value.Time;
import org.apache.isis.applib.value.TimeStamp;
+import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
/**
* The SqlDataClass is a test class used in the sql-persistor integration tests.
@@ -47,40 +48,38 @@ import org.apache.isis.applib.value.Time
*/
public class SqlDataClass extends AbstractDomainObject {
+
public String title() {
return string;
}
- // Isis Date Type
- // {{ Date
- private Date date;
+ // {{ String
+ private String string;
- public Date getDate() {
- return date;
+ public String getString() {
+ return string;
}
- public void setDate(final Date date) {
- this.date = date;
+ public void setString(final String string) {
+ this.string = string;
}
// }}
- // {{ String type
- private String string;
+ // {{ Isis Date
+ private Date date;
- public String getString() {
- return string;
+ public Date getDate() {
+ return date;
}
- public void setString(final String string) {
- this.string = string;
+ public void setDate(final Date date) {
+ this.date = date;
}
// }}
- // SQL Date Type
- // {{ SqlDate
- /**/
+ // {{ java.sql Date
private java.sql.Date sqlDate;
@MemberOrder(sequence = "1")
@@ -96,7 +95,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ Money
+ // {{ Isis Money
private Money money;
@MemberOrder(sequence = "1")
@@ -110,7 +109,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ DateTime
+ // {{ Isis DateTime
private DateTime dateTime;
@MemberOrder(sequence = "1")
@@ -124,7 +123,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ TimeStamp
+ // {{ Isis TimeStamp
private TimeStamp timeStamp;
@MemberOrder(sequence = "1")
@@ -138,8 +137,7 @@ public class SqlDataClass extends Abstra
// }}
- // Color, Image, Password, Percentage, Time
- // {{ Time
+ // {{ Isis Time
private Time time;
@MemberOrder(sequence = "1")
@@ -153,7 +151,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ Color
+ // {{ Isis Color
private Color color;
@MemberOrder(sequence = "1")
@@ -167,7 +165,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ Image
+ // {{ Isis Image
private Image image;
@MemberOrder(sequence = "1")
@@ -178,10 +176,9 @@ public class SqlDataClass extends Abstra
public void setImage(final Image image) {
this.image = image;
}
-
// }}
- // {{ Password
+ // {{ Isis Password
private Password password;
@MemberOrder(sequence = "1")
@@ -195,7 +192,7 @@ public class SqlDataClass extends Abstra
// }}
- // {{ Percentage
+ // {{ Isis Percentage
private Percentage percentage;
@MemberOrder(sequence = "1")
@@ -209,7 +206,11 @@ public class SqlDataClass extends Abstra
// }}
+
+ //
// References to other entities
+ //
+
// {{ SimpleClasses
public List<SimpleClass> simpleClasses1 = new ArrayList<SimpleClass>();
@@ -309,31 +310,29 @@ public class SqlDataClass extends Abstra
// }}
- // {{ NumericTestClassMax
- private NumericTestClass numericTestClassMax;
+ // {{ PrimitiveValuedEntityMax
+ private PrimitiveValuedEntity pveMax;
- public NumericTestClass getNumericTestClassMax() {
- return numericTestClassMax;
+ public PrimitiveValuedEntity getPrimitiveValuedEntityMax() {
+ return pveMax;
}
- public void setNumericTestClassMax(final NumericTestClass numericClassMax) {
- this.numericTestClassMax = numericClassMax;
+ public void setPrimitiveValuedEntityMax(final PrimitiveValuedEntity pveMax) {
+ this.pveMax = pveMax;
}
// }}
- // {{ NumericTestClassMin
- private NumericTestClass numericTestClassMin;
+ // {{ PrimitiveValuedEntityMin
+ private PrimitiveValuedEntity pveMin;
- public NumericTestClass getNumericTestClassMin() {
- return numericTestClassMin;
+ public PrimitiveValuedEntity getPrimitiveValuedEntityMin() {
+ return pveMin;
}
- public void setNumericTestClassMin(final NumericTestClass numericClassMin) {
- this.numericTestClassMin = numericClassMin;
+ public void setPrimitiveValuedEntityMin(final PrimitiveValuedEntity pveMin) {
+ this.pveMin = pveMin;
}
// }}
-
}
-// Copyright (c) Kevin Meyer, www.kmz.co.za.
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/viewmodels/SimpleViewModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/viewmodels/SimpleViewModel.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/viewmodels/SimpleViewModel.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/viewmodels/SimpleViewModel.java Sat May 19 07:28:31 2012
@@ -22,10 +22,19 @@ package org.apache.isis.tck.dom.viewmode
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ViewModel;
+import org.apache.isis.applib.util.TitleBuffer;
@ViewModel
public class SimpleViewModel extends AbstractDomainObject {
+ // {{ title
+ public String title() {
+ final TitleBuffer buf = new TitleBuffer();
+ buf.append(name);
+ return buf.toString();
+ }
+ // }}
+
// {{ Name
private String name;
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java Sat May 19 07:28:31 2012
@@ -23,30 +23,31 @@ import org.apache.isis.applib.annotation
@ObjectType("RLE")
public class Role {
+
+ // {{ Name (String)
public String name;
- public Person person;
-
- public void setPerson(final Person v) {
- person = v;
+ public String getName() {
+ return name;
}
-
+ public void setName(final String name) {
+ this.name = name;
+ }
+ // }}
+
+ // {{ Person (Person)
+ public Person person;
public Person getPerson() {
return person;
}
-
+ public void setPerson(final Person v) {
+ person = v;
+ }
public void modifyPerson(final Person person) {
setPerson(person);
}
-
public void clearPerson(final Person person) {
setPerson(null);
}
+ // }}
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
}
Propchange: incubator/isis/trunk/framework/tck/tck-fixture/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/tck/tck-fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/pom.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>tck-fixture</artifactId>
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-objstore-dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <artifactId>tck-dom</artifactId>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Copied: incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/refs/ParentAndChildEntityFixture.java (from r1338467, incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/assocs/ParentAndChildEntityFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/refs/ParentAndChildEntityFixture.java?p2=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/refs/ParentAndChildEntityFixture.java&p1=incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/assocs/ParentAndChildEntityFixture.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/assocs/ParentAndChildEntityFixture.java (original)
+++ incubator/isis/trunk/framework/tck/tck-fixture/src/main/java/org/apache/isis/tck/fixture/refs/ParentAndChildEntityFixture.java Sat May 19 07:28:31 2012
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.tck.fixture.assocs;
+package org.apache.isis.tck.fixture.refs;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.tck.dom.assocs.ParentEntity;
-import org.apache.isis.tck.dom.assocs.ParentEntityRepository;
+import org.apache.isis.tck.dom.refs.AssociatedEntitiesRepository;
+import org.apache.isis.tck.dom.refs.ParentEntity;
public class ParentAndChildEntityFixture extends AbstractFixture {
@@ -41,9 +41,9 @@ public class ParentAndChildEntityFixture
return parent;
}
- private ParentEntityRepository parentEntityRepository;
+ private AssociatedEntitiesRepository parentEntityRepository;
- public void setParentEntityRepository(final ParentEntityRepository parentEntityRepository) {
+ public void setParentEntityRepository(final AssociatedEntitiesRepository parentEntityRepository) {
this.parentEntityRepository = parentEntityRepository;
}
Propchange: incubator/isis/trunk/framework/viewer/bdd/common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -3,3 +3,4 @@ target
.settings
.project
.umlproject
+target-ide
Modified: incubator/isis/trunk/framework/viewer/bdd/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>bdd-common</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Propchange: incubator/isis/trunk/framework/viewer/bdd/concordion/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.settings
target
.project
+target-ide
Propchange: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../../tck/pom.xml</relativePath>
</parent>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>bdd-concordion</artifactId>
Modified: incubator/isis/trunk/framework/viewer/bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -62,12 +62,12 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd-common</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd-common</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -75,12 +75,12 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd-concordion</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd-concordion</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>progmodels</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Propchange: incubator/isis/trunk/framework/viewer/dnd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -8,3 +8,4 @@ cobertura.ser
.byecycle
build
.umlproject
+target-ide
Propchange: incubator/isis/trunk/framework/viewer/dnd-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -3,4 +3,4 @@ logs
.classpath
.project
target
-
+target-ide
Modified: incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml Sat May 19 07:28:31 2012
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../tck/pom.xml</relativePath>
</parent>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis core -->
Modified: incubator/isis/trunk/framework/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/dnd/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Sat May 19 07:28:31 2012
@@ -71,9 +71,9 @@ public class ViewUpdateNotifierTest {
public void setUp() throws Exception {
Logger.getRootLogger().setLevel(Level.OFF);
- iswf.persist(iswf.fixtures.epv1);
+ iswf.persist(iswf.fixtures.smpl1);
- adapter = iswf.adapterFor(iswf.fixtures.epv1);
+ adapter = iswf.adapterFor(iswf.fixtures.smpl1);
notifier = new ExposedViewUpdateNotifier();
}
Propchange: incubator/isis/trunk/framework/viewer/html/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -6,3 +6,4 @@ cobertura.ser
*.iml
build
.umlproject
+target-ide
Propchange: incubator/isis/trunk/framework/viewer/html-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/viewer/html-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/html-tck/pom.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../tck/pom.xml</relativePath>
</parent>
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-dom</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/html/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>testsupport</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java Sat May 19 07:28:31 2012
@@ -42,7 +42,7 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithValues;
+import org.apache.isis.tck.dom.refs.SimpleEntity;
import org.apache.isis.viewer.html.action.ActionException;
public class ContextTest_mapCollection {
@@ -74,15 +74,15 @@ public class ContextTest_mapCollection {
public void mapCollection_then_getMappedCollection() throws Exception {
// given
- iswf.persist(iswf.fixtures.epv1);
- iswf.persist(iswf.fixtures.epv2);
+ iswf.persist(iswf.fixtures.smpl1);
+ iswf.persist(iswf.fixtures.smpl2);
- final List<ExamplePojoWithValues> collection = Lists.newArrayList();
- collection.add(iswf.fixtures.epv1);
- collection.add(iswf.fixtures.epv2);
+ final List<SimpleEntity> collection = Lists.newArrayList();
+ collection.add(iswf.fixtures.smpl1);
+ collection.add(iswf.fixtures.smpl2);
- final Oid oid1 = getAdapterManager().adapterFor(iswf.fixtures.epv1).getOid();
- final Oid oid2 = getAdapterManager().adapterFor(iswf.fixtures.epv2).getOid();
+ final Oid oid1 = getAdapterManager().adapterFor(iswf.fixtures.smpl1).getOid();
+ final Oid oid2 = getAdapterManager().adapterFor(iswf.fixtures.smpl2).getOid();
final ObjectAdapter collectionAdapter = getAdapterManager().adapterFor(collection);
final String id = context.mapCollection(collectionAdapter);
@@ -107,12 +107,12 @@ public class ContextTest_mapCollection {
public void testRegisteredCollectionReturnSameIdentityForSameCollection() {
// given
- iswf.persist(iswf.fixtures.epv1);
- iswf.persist(iswf.fixtures.epv2);
+ iswf.persist(iswf.fixtures.smpl1);
+ iswf.persist(iswf.fixtures.smpl2);
- final List<ExamplePojoWithValues> collection = Lists.newArrayList();
- collection.add(iswf.fixtures.epv1);
- collection.add(iswf.fixtures.epv2);
+ final List<SimpleEntity> collection = Lists.newArrayList();
+ collection.add(iswf.fixtures.smpl1);
+ collection.add(iswf.fixtures.smpl2);
final ObjectAdapter collectionAdapter = getAdapterManager().adapterFor(collection);
@@ -128,15 +128,15 @@ public class ContextTest_mapCollection {
public void testRegisteredCollectionReturnDifferentIdentityForDifferentCollection() {
// given
- iswf.persist(iswf.fixtures.epv1);
- iswf.persist(iswf.fixtures.epv2);
+ iswf.persist(iswf.fixtures.smpl1);
+ iswf.persist(iswf.fixtures.smpl2);
- final List<ExamplePojoWithValues> collection1 = Lists.newArrayList();
- collection1.add(iswf.fixtures.epv1);
+ final List<SimpleEntity> collection1 = Lists.newArrayList();
+ collection1.add(iswf.fixtures.smpl1);
final ObjectAdapter collection1Adapter = getAdapterManager().adapterFor(collection1);
- final List<ExamplePojoWithValues> collection2 = Lists.newArrayList();
- collection2.add(iswf.fixtures.epv2);
+ final List<SimpleEntity> collection2 = Lists.newArrayList();
+ collection2.add(iswf.fixtures.smpl2);
final ObjectAdapter collection2Adapter = getAdapterManager().adapterFor(collection2);
// when
Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java Sat May 19 07:28:31 2012
@@ -66,7 +66,7 @@ public class ContextTest_mapObject {
public void mapObject_then_restoreAllObjectsToLoader() throws Exception {
// given
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
oid = originalAdapter.getOid();
context.mapObject(originalAdapter);
@@ -92,7 +92,7 @@ public class ContextTest_mapObject {
public void mapObject_forTransient_then_getMappedObject_byId() {
// given
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
oid = originalAdapter.getOid();
final String id = context.mapObject(originalAdapter);
@@ -108,9 +108,9 @@ public class ContextTest_mapObject {
public void mapObject_forPersistent_then_getMappedObject_byId() {
// given
- iswf.persist(iswf.fixtures.epv1);
+ iswf.persist(iswf.fixtures.smpl1);
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
oid = originalAdapter.getOid();
final String id = context.mapObject(originalAdapter);
@@ -126,15 +126,15 @@ public class ContextTest_mapObject {
public void getMappedObject_forPersistent_whenChanged() throws Exception {
// given
- iswf.persist(iswf.fixtures.epv1);
+ iswf.persist(iswf.fixtures.smpl1);
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
final Oid oid = originalAdapter.getOid();
final String id = context.mapObject(originalAdapter);
final Version version = originalAdapter.getVersion();
- iswf.fixtures.epv1.setName("changed date");
+ iswf.fixtures.smpl1.setName("changed date");
iswf.bounceSystem(); // does a commit, which will bump the version
originalAdapter = getAdapterManager().getAdapterFor(oid);
@@ -157,7 +157,7 @@ public class ContextTest_mapObject {
public void mapObject_forTransient_alwaysReturnsSameId() {
// given
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
// when
final String id = context.mapObject(originalAdapter);
@@ -172,9 +172,9 @@ public class ContextTest_mapObject {
public void mapObject_forPersistent_alwaysReturnsSameId() {
// given
- iswf.persist(iswf.fixtures.epv1);
+ iswf.persist(iswf.fixtures.smpl1);
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
// when
final String id = context.mapObject(originalAdapter);
@@ -189,8 +189,8 @@ public class ContextTest_mapObject {
public void mapObject_forTransient_returnsDifferentIdsForDifferentObjects() {
// when
- final String id = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.epv1));
- final String id2 = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.epv2));
+ final String id = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.smpl1));
+ final String id2 = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.smpl2));
// then
assertThat(id, not(equalTo(id2)));
@@ -201,12 +201,12 @@ public class ContextTest_mapObject {
public void mapObject_forPersistent_returnsDifferentIdsForDifferentObjects() {
// given
- iswf.persist(iswf.fixtures.epv1);
- iswf.persist(iswf.fixtures.epv2);
+ iswf.persist(iswf.fixtures.smpl1);
+ iswf.persist(iswf.fixtures.smpl2);
// when
- final String id = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.epv1));
- final String id2 = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.epv2));
+ final String id = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.smpl1));
+ final String id2 = context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.smpl2));
// then
assertThat(id, not(equalTo(id2)));
@@ -217,8 +217,8 @@ public class ContextTest_mapObject {
public void restoreAllObjectsToLoader_restoredAsGhosts() throws Exception {
// given
- iswf.persist(iswf.fixtures.epv1);
- originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ iswf.persist(iswf.fixtures.smpl1);
+ originalAdapter = getAdapterManager().adapterFor(iswf.fixtures.smpl1);
oid = originalAdapter.getOid();
iswf.bounceSystem();
@@ -238,11 +238,11 @@ public class ContextTest_mapObject {
@Test
public void testExceptionThrownWhenNoActionForIdentity() {
- iswf.persist(iswf.fixtures.epv1);
- iswf.persist(iswf.fixtures.epv2);
+ iswf.persist(iswf.fixtures.smpl1);
+ iswf.persist(iswf.fixtures.smpl2);
// when
- context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.epv1));
+ context.mapObject(getAdapterManager().adapterFor(iswf.fixtures.smpl1));
try {
assertNull(context.getMappedObject("NON-EXISTENT-ID"));
Propchange: incubator/isis/trunk/framework/viewer/json/json-applib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
target
.classpath
.project
+target-ide
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>json-applib</artifactId>
Propchange: incubator/isis/trunk/framework/viewer/json/json-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../../tck/pom.xml</relativePath>
</parent>
@@ -66,13 +66,13 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-dom</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java Sat May 19 07:28:31 2012
@@ -41,8 +41,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.runtimes.dflt.webserver.WebServer;
-import org.apache.isis.tck.dom.assocs.ChildEntity;
+import org.apache.isis.tck.dom.refs.ChildEntity;
import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
+import org.apache.isis.tck.dom.scalars.ApplibValuedEntityRepository;
import org.apache.isis.viewer.json.applib.HttpMethod;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RestfulClient;
@@ -293,7 +294,7 @@ public class DomainObjectResourceTest {
assertThat(type.getHttpMethod(), is(HttpMethod.GET));
assertThat(propertyDetailsRepr.getString("memberType"), is("property"));
- assertThat(propertyDetailsRepr.getString("value"), is(org.apache.isis.tck.objstore.dflt.scalars.ApplibValuedEntityRepositoryDefault.class.getName()));
+ assertThat(propertyDetailsRepr.getString("value"), is(ApplibValuedEntityRepository.class.getName()));
assertThat(propertyDetailsRepr.getString("disabledReason"), is(not(nullValue())));
}
Propchange: incubator/isis/trunk/framework/viewer/json/json-viewer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@ target
.classpath
.project
.settings
+target-ide
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/pom.xml Sat May 19 07:28:31 2012
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>json-viewer</artifactId>
Modified: incubator/isis/trunk/framework/viewer/json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/pom.xml Sat May 19 07:28:31 2012
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -99,23 +99,23 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json-applib</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json-applib</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json-viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json-viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Propchange: incubator/isis/trunk/framework/viewer/junit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -3,3 +3,4 @@
.settings
target
.umlproject
+target-ide
Propchange: incubator/isis/trunk/framework/viewer/junit-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/viewer/junit-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/junit-tck/pom.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../tck/pom.xml</relativePath>
</parent>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/AbstractTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/framework/viewer/junit-tck/src/test/java/junit/AbstractTest.java Sat May 19 07:28:31 2012
@@ -27,7 +27,6 @@ import org.apache.isis.applib.DomainObje
import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntityRepository;
-import org.apache.isis.tck.objstore.dflt.scalars.PrimitiveValuedEntityRepositoryDefault;
import org.apache.isis.viewer.junit.ConfigDir;
import org.apache.isis.viewer.junit.IsisTestRunner;
import org.apache.isis.viewer.junit.Service;
@@ -35,7 +34,7 @@ import org.apache.isis.viewer.junit.Serv
@RunWith(IsisTestRunner.class)
@ConfigDir("../../viewer/dnd-tck/src/main/resources")
-@Services({ @Service(PrimitiveValuedEntityRepositoryDefault.class) })
+@Services({ @Service(PrimitiveValuedEntityRepository.class) })
public abstract class AbstractTest {
private DomainObjectContainer domainObjectContainer;
Modified: incubator/isis/trunk/framework/viewer/junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/junit/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -35,8 +35,8 @@
<siteBaseDir>../..</siteBaseDir>
<relativeUrl>viewer/junit/</relativeUrl>
- <wrapper-progmodel.version>0.3.0-incubating-SNAPSHOT</wrapper-progmodel.version>
- <identity-bytecode.version>0.3.0-incubating-SNAPSHOT</identity-bytecode.version>
+ <wrapper-progmodel.version>0.3.1-incubating-SNAPSHOT</wrapper-progmodel.version>
+ <identity-bytecode.version>0.3.1-incubating-SNAPSHOT</identity-bytecode.version>
<docbkxGuideTitle>Apache Isis JUnit Support</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using JUnit</docbkxGuideSubTitle>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>isis</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>viewer</artifactId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>core</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>progmodels</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -91,13 +91,13 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-dispatcher</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-servlet</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Propchange: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -3,3 +3,4 @@ target
.classpath
.project
.umlproject
+target-ide
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>scimpi-dispatcher</artifactId>
Propchange: incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
target
.classpath
.project
+target-ide
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
Propchange: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,3 +2,4 @@
.classpath
.project
target
+target-ide
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<relativePath>../../../tck/pom.xml</relativePath>
</parent>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-dom</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis viewer -->