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/07/17 09:09:27 UTC
svn commit: r1362384 [3/3] - in /incubator/isis/trunk/framework:
runtimes/dflt/objectstores/jdo/jdo-datanucleus/
runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/refs/
tck/tck-dom/ ...
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java Tue Jul 17 07:09:26 2012
@@ -1,109 +1,88 @@
-/*
- * 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.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-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;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- // }}
-
- // {{ Date: java.util.Date
- private Date date;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Date getDate() {
- return date;
- }
-
- public void setDate(final Date date) {
- this.date = date;
- }
- // }}
-
- // {{ Size: int
- private int size;
-
- @MemberOrder(sequence = "1")
- public int getSize() {
- return size;
- }
-
- public void setSize(final int size) {
- this.size = size;
- }
-
- // }}
-
- // {{ Nullable: long
- private Long number;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Long getNullable() {
- return number;
- }
-
- public void setNullable(final Long number) {
- this.number = number;
- }
-
- // }}
-
- // {{ NotPersisted: int (nb: throws exception if called)
- @NotPersisted
- public int getNotPersisted() {
- throw new org.apache.isis.applib.ApplicationException("unexpected call");
- }
- // }}
-
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("PIS1")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("PIS1")
+@ObjectType("PIS1")
+public class PolyInterfaceSubtype1Entity extends BaseEntity implements PolyInterface {
+
+
+
+ // {{ Parent (title #1)
+ private PolyInterfaceParentEntity parent;
+
+ @Title(sequence="1", append="-")
+ @MemberOrder(sequence = "1")
+ @Optional
+ public PolyInterfaceParentEntity getParent() {
+ return parent;
+ }
+
+ public void setParent(final PolyInterfaceParentEntity parent) {
+ this.parent = parent;
+ }
+
+ // }}
+
+ // {{ Name (title #2)
+ private String name;
+
+ @Title(sequence="2")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Foo (property)
+ private int foo;
+
+ @MemberOrder(sequence = "1")
+ public int getFoo() {
+ return foo;
+ }
+
+ public void setFoo(final int foo) {
+ this.foo = foo;
+ }
+ // }}
+
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java Tue Jul 17 07:09:26 2012
@@ -1,109 +1,88 @@
-/*
- * 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.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-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;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- // }}
-
- // {{ Date: java.util.Date
- private Date date;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Date getDate() {
- return date;
- }
-
- public void setDate(final Date date) {
- this.date = date;
- }
- // }}
-
- // {{ Size: int
- private int size;
-
- @MemberOrder(sequence = "1")
- public int getSize() {
- return size;
- }
-
- public void setSize(final int size) {
- this.size = size;
- }
-
- // }}
-
- // {{ Nullable: long
- private Long number;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Long getNullable() {
- return number;
- }
-
- public void setNullable(final Long number) {
- this.number = number;
- }
-
- // }}
-
- // {{ NotPersisted: int (nb: throws exception if called)
- @NotPersisted
- public int getNotPersisted() {
- throw new org.apache.isis.applib.ApplicationException("unexpected call");
- }
- // }}
-
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("PIS2")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("PIS2")
+@ObjectType("PIS2")
+public class PolyInterfaceSubtype2Entity extends BaseEntity implements PolyInterface {
+
+
+ // {{ Parent (title #1)
+ private PolyInterfaceParentEntity parent;
+
+ @Title(sequence="1", append="-")
+ @MemberOrder(sequence = "1")
+ @Optional
+ public PolyInterfaceParentEntity getParent() {
+ return parent;
+ }
+
+ public void setParent(final PolyInterfaceParentEntity parent) {
+ this.parent = parent;
+ }
+
+ // }}
+
+ // {{ Name (title #2)
+ private String name;
+
+ @Title(sequence="2")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Bar (property)
+ private String bar;
+
+ @MemberOrder(sequence = "1")
+ public String getBar() {
+ return bar;
+ }
+
+ public void setBar(final String bar) {
+ this.bar = bar;
+ }
+ // }}
+
+
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java Tue Jul 17 07:09:26 2012
@@ -1,109 +1,89 @@
-/*
- * 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.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-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;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- // }}
-
- // {{ Date: java.util.Date
- private Date date;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Date getDate() {
- return date;
- }
-
- public void setDate(final Date date) {
- this.date = date;
- }
- // }}
-
- // {{ Size: int
- private int size;
-
- @MemberOrder(sequence = "1")
- public int getSize() {
- return size;
- }
-
- public void setSize(final int size) {
- this.size = size;
- }
-
- // }}
-
- // {{ Nullable: long
- private Long number;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Long getNullable() {
- return number;
- }
-
- public void setNullable(final Long number) {
- this.number = number;
- }
-
- // }}
-
- // {{ NotPersisted: int (nb: throws exception if called)
- @NotPersisted
- public int getNotPersisted() {
- throw new org.apache.isis.applib.ApplicationException("unexpected call");
- }
- // }}
-
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("PIS3")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("PIS3")
+@ObjectType("PIS3")
+public class PolyInterfaceSubtype3Entity extends BaseEntity implements PolyInterface {
+
+
+
+ // {{ Parent (title #1)
+ private PolyInterfaceParentEntity parent;
+
+ @Title(sequence="1", append="-")
+ @MemberOrder(sequence = "1")
+ @Optional
+ public PolyInterfaceParentEntity getParent() {
+ return parent;
+ }
+
+ public void setParent(final PolyInterfaceParentEntity parent) {
+ this.parent = parent;
+ }
+
+ // }}
+
+ // {{ Name (title #2)
+ private String name;
+
+ @Title(sequence="2")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Baz (property)
+ private java.math.BigDecimal boz;
+
+ @MemberOrder(sequence = "1")
+ public java.math.BigDecimal getBoz() {
+ return boz;
+ }
+
+ public void setBoz(final java.math.BigDecimal baz) {
+ this.boz = baz;
+ }
+ // }}
+
+
+
+}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.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?rev=1362384&r1=1362383&r2=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java Tue Jul 17 07:09:26 2012
@@ -22,6 +22,7 @@ package org.apache.isis.tck.dom.refs;
import java.util.List;
import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.InheritanceStrategy;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.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?rev=1362384&r1=1362383&r2=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java Tue Jul 17 07:09:26 2012
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation
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.annotation.Title;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
@javax.jdo.annotations.Discriminator("SMPL")
@@ -36,14 +37,10 @@ import org.apache.isis.applib.annotation
@ObjectType("SMPL")
public class SimpleEntity extends BaseEntity {
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
+ // {{ name: String (title)
private String name;
+ @Title
@MemberOrder(sequence = "1")
public String getName() {
return name;
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,54 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+
+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.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDFC")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDFC")
+@ObjectType("UDFC")
+public class UnidirFkChildEntity extends AbstractDomainObject {
+
+
+ // {{ Name (title)
+ private String name;
+
+ @Title(sequence="1")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java Tue Jul 17 07:09:26 2012
@@ -1,109 +1,103 @@
-/*
- * 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.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-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;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- // }}
-
- // {{ Date: java.util.Date
- private Date date;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Date getDate() {
- return date;
- }
-
- public void setDate(final Date date) {
- this.date = date;
- }
- // }}
-
- // {{ Size: int
- private int size;
-
- @MemberOrder(sequence = "1")
- public int getSize() {
- return size;
- }
-
- public void setSize(final int size) {
- this.size = size;
- }
-
- // }}
-
- // {{ Nullable: long
- private Long number;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Long getNullable() {
- return number;
- }
-
- public void setNullable(final Long number) {
- this.number = number;
- }
-
- // }}
-
- // {{ NotPersisted: int (nb: throws exception if called)
- @NotPersisted
- public int getNotPersisted() {
- throw new org.apache.isis.applib.ApplicationException("unexpected call");
- }
- // }}
-
-
-}
+/*
+ * 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.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.jdo.annotations.IdentityType;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDFP")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDFP")
+@ObjectType("UDFP")
+public class UnidirFkParentEntity extends BaseEntity {
+
+
+ // {{ Name (also title)
+ private String name;
+
+ @Title
+ @MemberOrder(sequence = "1")
+ @Optional
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Children
+ private Set<UnidirFkChildEntity> children = new HashSet<UnidirFkChildEntity>();
+
+ public Set<UnidirFkChildEntity> getChildren() {
+ return children;
+ }
+
+ public void setChildren(final Set<UnidirFkChildEntity> children) {
+ this.children = children;
+ }
+ // }}
+
+
+ // {{ newChild (action)
+ public UnidirFkChildEntity newChild(final String name) {
+ final UnidirFkChildEntity childEntity = newTransientInstance(UnidirFkChildEntity.class);
+ childEntity.setName(name);
+ addChild(childEntity);
+ return childEntity;
+ }
+ // }}
+
+
+ // {{ removeChild (action)
+ public void addChild(UnidirFkChildEntity childEntity) {
+ this.getChildren().add(childEntity);
+ persistIfNotAlready(childEntity);
+ }
+ // }}
+
+ // {{ removeChild (action)
+ public UnidirFkParentEntity removeChild(final UnidirFkChildEntity childEntity) {
+ if (getChildren().contains(childEntity)) {
+ getChildren().remove(childEntity);
+ }
+ return this;
+ }
+
+ public List<UnidirFkChildEntity> choices0RemoveChild() {
+ return Arrays.asList(getChildren().toArray(new UnidirFkChildEntity[0]));
+ }
+ // }}
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,43 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.tck.dom.AbstractEntityRepository;
+
+@Named("UnidirParentEntities")
+@ObjectType("UnidirParentEntities")
+public class UnidirFkParentEntityRepository extends AbstractEntityRepository<UnidirFkParentEntity> {
+
+ public UnidirFkParentEntityRepository() {
+ super(UnidirFkParentEntity.class, "UnidirParentEntities");
+ }
+
+ @MemberOrder(sequence = "2")
+ public UnidirFkParentEntity newEntity(final String name) {
+ final UnidirFkParentEntity entity = newTransientInstance(UnidirFkParentEntity.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/UnidirJoinChildEntity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,54 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+
+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.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDJC")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDJC")
+@ObjectType("UDJC")
+public class UnidirJoinChildEntity extends AbstractDomainObject {
+
+
+ // {{ Name (title)
+ private String name;
+
+ @Title(sequence="1")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+}
Added: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java?rev=1362384&view=auto
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java (added)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java Tue Jul 17 07:09:26 2012
@@ -0,0 +1,106 @@
+/*
+ * 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.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Persistent;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDJP")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDJP")
+@ObjectType("UDJP")
+public class UnidirJoinParentEntity extends BaseEntity {
+
+
+ // {{ Name (also title)
+ private String name;
+
+ @Title
+ @MemberOrder(sequence = "1")
+ @Optional
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Children
+ @Join
+ private Set<UnidirJoinChildEntity> children = new HashSet<UnidirJoinChildEntity>();
+
+ public Set<UnidirJoinChildEntity> getChildren() {
+ return children;
+ }
+
+ public void setChildren(final Set<UnidirJoinChildEntity> children) {
+ this.children = children;
+ }
+ // }}
+
+
+ // {{ newChild (action)
+ public UnidirJoinChildEntity newChild(final String name) {
+ final UnidirJoinChildEntity childEntity = newTransientInstance(UnidirJoinChildEntity.class);
+ childEntity.setName(name);
+ addChild(childEntity);
+ return childEntity;
+ }
+ // }}
+
+
+ // {{ removeChild (action)
+ public void addChild(UnidirJoinChildEntity childEntity) {
+ this.getChildren().add(childEntity);
+ persistIfNotAlready(childEntity);
+ }
+ // }}
+
+ // {{ removeChild (action)
+ public UnidirJoinParentEntity removeChild(final UnidirJoinChildEntity childEntity) {
+ if (getChildren().contains(childEntity)) {
+ getChildren().remove(childEntity);
+ }
+ return this;
+ }
+
+ public List<UnidirFkChildEntity> choices0RemoveChild() {
+ return Arrays.asList(getChildren().toArray(new UnidirFkChildEntity[0]));
+ }
+ // }}
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,43 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.tck.dom.AbstractEntityRepository;
+
+@Named("UnidirParentEntities")
+@ObjectType("UnidirParentEntities")
+public class UnidirJoinParentEntityRepository extends AbstractEntityRepository<UnidirJoinParentEntity> {
+
+ public UnidirJoinParentEntityRepository() {
+ super(UnidirJoinParentEntity.class, "UnidirJoinParentEntities");
+ }
+
+ @MemberOrder(sequence = "2")
+ public UnidirJoinParentEntity newEntity(final String name) {
+ final UnidirJoinParentEntity entity = newTransientInstance(UnidirJoinParentEntity.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/UnidirReferencedEntity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,54 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+
+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.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDRD")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDRD")
+@ObjectType("UDRD")
+public class UnidirReferencedEntity extends AbstractDomainObject {
+
+
+ // {{ Name (title)
+ private String name;
+
+ @Title(sequence="1")
+ @MemberOrder(sequence = "1")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,43 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.tck.dom.AbstractEntityRepository;
+
+@Named("UnidirReferencedEntities")
+@ObjectType("UnidirReferencedEntities")
+public class UnidirReferencedEntityRepository extends AbstractEntityRepository<UnidirReferencedEntity> {
+
+ public UnidirReferencedEntityRepository() {
+ super(UnidirReferencedEntity.class, "UnidirReferencedEntities");
+ }
+
+ @MemberOrder(sequence = "2")
+ public UnidirReferencedEntity newEntity(final String name) {
+ final UnidirReferencedEntity entity = newTransientInstance(UnidirReferencedEntity.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/UnidirReferencingEntity.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java Tue Jul 17 07:09:26 2012
@@ -1,109 +1,68 @@
-/*
- * 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.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-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;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-
- public String title() {
- return getName();
- }
-
-
- // {{ name: String
- private String name;
-
- @MemberOrder(sequence = "1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- // }}
-
- // {{ Date: java.util.Date
- private Date date;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Date getDate() {
- return date;
- }
-
- public void setDate(final Date date) {
- this.date = date;
- }
- // }}
-
- // {{ Size: int
- private int size;
-
- @MemberOrder(sequence = "1")
- public int getSize() {
- return size;
- }
-
- public void setSize(final int size) {
- this.size = size;
- }
-
- // }}
-
- // {{ Nullable: long
- private Long number;
-
- @Optional
- @MemberOrder(sequence = "1")
- public Long getNullable() {
- return number;
- }
-
- public void setNullable(final Long number) {
- this.number = number;
- }
-
- // }}
-
- // {{ NotPersisted: int (nb: throws exception if called)
- @NotPersisted
- public int getNotPersisted() {
- throw new org.apache.isis.applib.ApplicationException("unexpected call");
- }
- // }}
-
-
-}
+/*
+ * 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 javax.jdo.annotations.IdentityType;
+
+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.annotation.Title;
+
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("UDRG")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
+@javax.persistence.Entity
+@javax.persistence.DiscriminatorValue("UDRG")
+@ObjectType("UDRG")
+public class UnidirReferencingEntity extends BaseEntity {
+
+
+ // {{ Name (also title)
+ private String name;
+
+ @Title
+ @MemberOrder(sequence = "1")
+ @Optional
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ // }}
+
+
+ // {{ Referenced (property)
+ public UnidirReferencedEntity referenced;
+
+ @MemberOrder(sequence = "1")
+ public UnidirReferencedEntity getReferenced() {
+ return referenced;
+ }
+
+ public void setReferenced(final UnidirReferencedEntity referenced) {
+ this.referenced = referenced;
+ }
+ // }}
+
+}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java (from r1362381, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java&r1=1362381&r2=1362384&rev=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ParentEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java Tue Jul 17 07:09:26 2012
@@ -1,48 +1,43 @@
-/*
- * 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 org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ParentEntities")
-@ObjectType("ParentEntities")
-public class ParentEntityRepository extends AbstractEntityRepository<ParentEntity> {
-
- public ParentEntityRepository() {
- super(ParentEntity.class, "ParentEntities");
- }
-
- public BaseEntity someAction() { return null; }
- public SimpleEntity someAction2() { return null; }
- public ReferencingEntity someAction3() { return null; }
- public ParentEntity someAction4() { return null; }
-
- @MemberOrder(sequence = "2")
- public ParentEntity newEntity(final String name) {
- final ParentEntity entity = newTransientInstance(ParentEntity.class);
- entity.setName(name);
- persist(entity);
- return entity;
- }
-
-}
+/*
+ * 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 org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.tck.dom.AbstractEntityRepository;
+
+@Named("UnidirReferencingEntities")
+@ObjectType("UnidirReferencingEntities")
+public class UnidirReferencingEntityRepository extends AbstractEntityRepository<UnidirReferencingEntity> {
+
+ public UnidirReferencingEntityRepository() {
+ super(UnidirReferencingEntity.class, "UnidirReferencingEntities");
+ }
+
+ @MemberOrder(sequence = "2")
+ public UnidirReferencingEntity newEntity(final String name) {
+ final UnidirReferencingEntity entity = newTransientInstance(UnidirReferencingEntity.class);
+ entity.setName(name);
+ persist(entity);
+ return entity;
+ }
+
+}
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java?rev=1362384&r1=1362383&r2=1362384&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/object/DomainObjectResourceTest.java Tue Jul 17 07:09:26 2012
@@ -41,7 +41,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.runtimes.dflt.webserver.WebServer;
-import org.apache.isis.tck.dom.refs.ChildEntity;
+import org.apache.isis.tck.dom.refs.BidirWithSetChildEntity;
import org.apache.isis.tck.dom.scalars.ApplibValuedEntity;
import org.apache.isis.tck.dom.scalars.ApplibValuedEntityRepository;
import org.apache.isis.viewer.restfulobjects.applib.HttpMethod;
@@ -98,7 +98,7 @@ public class DomainObjectResourceTest {
// then
final LinkRepresentation self = domainObjectRepr.getSelf();
assertThat(self, isLink().rel(Rel.SELF).href(matches(".+objects/OID:32")).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domainobject"));
- assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
+ assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + BidirWithSetChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
assertThat(domainObjectRepr.getTitle(), is("parent 4 - child 2"));
assertThat(domainObjectRepr.getOid(), is("OID:32"));
@@ -144,7 +144,7 @@ public class DomainObjectResourceTest {
final DomainObjectRepresentation domainObjectRepr = givenDomainObjectRepresentationFor("OID:32");
// then
- assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
+ assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + BidirWithSetChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
}
@Test