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 [3/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...
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java Sat May 19 07:28:31 2012
@@ -40,8 +40,8 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithValues;
import org.apache.isis.tck.dom.movies.Person;
+import org.apache.isis.tck.dom.refs.SimpleEntity;
public class ObjectFixtureServiceTest_loadFile {
@@ -79,9 +79,9 @@ public class ObjectFixtureServiceTest_lo
final Set<Object> objects = service.allSavedObjects();
Assert.assertEquals(1, objects.size());
final Object object = objects.toArray()[0];
- assertThat(object instanceof ExamplePojoWithValues, is(true));
- Assert.assertEquals("Fred Smith", ((ExamplePojoWithValues) object).getName());
- Assert.assertEquals(new Date(110, 2, 8, 13, 32), ((ExamplePojoWithValues) object).getDate());
+ assertThat(object instanceof SimpleEntity, is(true));
+ Assert.assertEquals("Fred Smith", ((SimpleEntity) object).getName());
+ Assert.assertEquals(new Date(110, 2, 8, 13, 32), ((SimpleEntity) object).getDate());
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java Sat May 19 07:28:31 2012
@@ -35,8 +35,8 @@ import org.junit.Test;
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithCollections;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithValues;
+import org.apache.isis.tck.dom.refs.ParentEntity;
+import org.apache.isis.tck.dom.refs.SimpleEntity;
public class ObjectFixtureServiceTest_save {
@@ -67,13 +67,13 @@ public class ObjectFixtureServiceTest_sa
@Test
public void saveObjectAddedToList() throws Exception {
- final ExamplePojoWithValues epv = iswf.fixtures.epv1;
+ final SimpleEntity epv = iswf.fixtures.smpl1;
epv.setName("Fred Smith");
epv.setDate(new Date(110, 2, 8, 13, 32));
- final ExamplePojoWithCollections epc = iswf.fixtures.epc1;
- epc.getHomogeneousCollection().add(iswf.fixtures.epv1);
- epc.getHomogeneousCollection().add(iswf.fixtures.epv2);
+ final ParentEntity epc = iswf.fixtures.prnt1;
+ epc.getHomogeneousCollection().add(iswf.fixtures.smpl1);
+ epc.getHomogeneousCollection().add(iswf.fixtures.smpl2);
service.save(epc);
final Set<Object> savedObjects = service.allSavedObjects();
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest.java Sat May 19 07:28:31 2012
@@ -47,10 +47,10 @@ import org.apache.isis.core.commons.enco
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-import org.apache.isis.tck.dom.eg.ExamplePojo;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithCollections;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithReferences;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithValues;
+import org.apache.isis.tck.dom.refs.BaseEntity;
+import org.apache.isis.tck.dom.refs.ParentEntity;
+import org.apache.isis.tck.dom.refs.ReferencingEntity;
+import org.apache.isis.tck.dom.refs.SimpleEntity;
public class MementoTest {
@@ -82,23 +82,23 @@ public class MementoTest {
// logger.addAppender(new ConsoleAppender());
// BasicConfigurator.configure();
- iswf.fixtures.epv1.setName("Fred");
- iswf.fixtures.epv2.setName("Harry");
+ iswf.fixtures.smpl1.setName("Fred");
+ iswf.fixtures.smpl2.setName("Harry");
- iswf.fixtures.epr1_a1.setName("Tom");
+ iswf.fixtures.rfcg1_a1.setName("Tom");
- iswf.fixtures.epr1.setReference(iswf.fixtures.epv1);
- iswf.fixtures.epr1.setAggregatedReference(iswf.fixtures.epr1_a1);
+ iswf.fixtures.rfcg1.setReference(iswf.fixtures.smpl1);
+ iswf.fixtures.rfcg1.setAggregatedReference(iswf.fixtures.rfcg1_a1);
- iswf.fixtures.epc1.getHomogeneousCollection().add(iswf.fixtures.epv1);
- iswf.fixtures.epc1.getHomogeneousCollection().add(iswf.fixtures.epv2);
+ iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl1);
+ iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl2);
- iswf.fixtures.epc1.getHeterogeneousCollection().add(iswf.fixtures.epv1);
- iswf.fixtures.epc1.getHeterogeneousCollection().add(iswf.fixtures.epr1);
+ iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.smpl1);
+ iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.rfcg1);
- originalAdapterForEpv1 = iswf.adapterFor(iswf.fixtures.epv1);
- originalAdapterForEpr1 = iswf.adapterFor(iswf.fixtures.epr1);
- originalAdapterForEpc1 = iswf.adapterFor(iswf.fixtures.epc1);
+ originalAdapterForEpv1 = iswf.adapterFor(iswf.fixtures.smpl1);
+ originalAdapterForEpr1 = iswf.adapterFor(iswf.fixtures.rfcg1);
+ originalAdapterForEpc1 = iswf.adapterFor(iswf.fixtures.prnt1);
mementoForEpv1 = new Memento(originalAdapterForEpv1);
mementoForEpr1 = new Memento(originalAdapterForEpr1);
@@ -163,15 +163,15 @@ public class MementoTest {
@Test
public void recreateObject_valuePreserved() throws Exception {
recreatedAdapter = mementoForEpv1.recreateObject();
- final ExamplePojoWithValues recreatedObject = (ExamplePojoWithValues)recreatedAdapter.getObject();
+ final SimpleEntity recreatedObject = (SimpleEntity)recreatedAdapter.getObject();
assertEquals("Fred", recreatedObject.getName());
}
@Test
public void recreateObject_referencePreserved() throws Exception {
recreatedAdapter = mementoForEpr1.recreateObject();
- final ExamplePojoWithReferences recreatedObject = (ExamplePojoWithReferences)recreatedAdapter.getObject();
- final ExamplePojoWithValues reference1 = recreatedObject.getReference();
+ final ReferencingEntity recreatedObject = (ReferencingEntity)recreatedAdapter.getObject();
+ final SimpleEntity reference1 = recreatedObject.getReference();
assertNotNull(reference1);
assertThat("Fred", equalTo(reference1.getName()));
@@ -180,8 +180,8 @@ public class MementoTest {
@Test
public void recreateObject_homogeneousCollectionPreserved() throws Exception {
recreatedAdapter = mementoForEpc1.recreateObject();
- final ExamplePojoWithCollections recreatedObject = (ExamplePojoWithCollections)recreatedAdapter.getObject();
- final List<ExamplePojoWithValues> homogenousCollection = recreatedObject.getHomogeneousCollection();
+ final ParentEntity recreatedObject = (ParentEntity)recreatedAdapter.getObject();
+ final List<SimpleEntity> homogenousCollection = recreatedObject.getHomogeneousCollection();
assertNotNull(homogenousCollection);
assertThat(homogenousCollection.size(), is(2));
@@ -192,16 +192,16 @@ public class MementoTest {
@Test
public void recreateObject_heterogeneousCollectionPreserved() throws Exception {
recreatedAdapter = mementoForEpc1.recreateObject();
- final ExamplePojoWithCollections recreatedObject = (ExamplePojoWithCollections)recreatedAdapter.getObject();
- final List<ExamplePojo> hetrogenousCollection = recreatedObject.getHeterogeneousCollection();
+ final ParentEntity recreatedObject = (ParentEntity)recreatedAdapter.getObject();
+ final List<BaseEntity> hetrogenousCollection = recreatedObject.getHeterogeneousCollection();
assertNotNull(hetrogenousCollection);
assertThat(hetrogenousCollection.size(), is(2));
- final ExamplePojoWithValues firstObj = (ExamplePojoWithValues)hetrogenousCollection.get(0);
+ final SimpleEntity firstObj = (SimpleEntity)hetrogenousCollection.get(0);
assertThat(firstObj.getName(), is("Fred"));
- final ExamplePojoWithReferences secondObj = (ExamplePojoWithReferences)hetrogenousCollection.get(1);
- final ExamplePojoWithValues reference1 = secondObj.getReference();
+ final ReferencingEntity secondObj = (ReferencingEntity)hetrogenousCollection.get(1);
+ final SimpleEntity reference1 = secondObj.getReference();
assertThat(reference1.getName(), is("Fred"));
assertSame(firstObj, reference1);
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java Sat May 19 07:28:31 2012
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-import org.apache.isis.tck.dom.eg.TestPojo;
+import org.apache.isis.tck.dom.scalars.WrapperValuedEntity;
public class MementoTest_data {
@@ -44,17 +44,17 @@ public class MementoTest_data {
@Before
public void setUpSystem() throws Exception {
- iswf.fixtures.testPojo1.setPropertyUsedForTitle("Fred");
+ iswf.fixtures.wve1.setStringProperty("Fred");
- originalAdapter1 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.testPojo1);
+ originalAdapter1 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.wve1);
oid1 = originalAdapter1.getOid();
memento1 = new Memento(originalAdapter1);
data1 = memento1.getData();
- iswf.fixtures.testPojo2.setPropertyUsedForTitle("Harry");
- iswf.container.persist(iswf.fixtures.testPojo2);
+ iswf.fixtures.wve2.setStringProperty("Harry");
+ iswf.container.persist(iswf.fixtures.wve2);
- originalAdapter2 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.testPojo2);
+ originalAdapter2 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.wve2);
oid2 = originalAdapter2.getOid();
memento2 = new Memento(originalAdapter2);
data2 = memento2.getData();
@@ -70,7 +70,6 @@ public class MementoTest_data {
}
-
@Test
public void data_getOid_equal() throws Exception {
assertEquals(oid1, data1.getOid());
@@ -91,7 +90,7 @@ public class MementoTest_data {
@Test
public void data_getClassName() throws Exception {
- assertEquals(TestPojo.class.getName(), data1.getClassName());
+ assertEquals(WrapperValuedEntity.class.getName(), data1.getClassName());
}
@@ -99,7 +98,7 @@ public class MementoTest_data {
public void data_getEntry_forStringField() throws Exception {
assertEquals(ObjectData.class, data1.getClass());
final ObjectData objectData = (ObjectData) data1;
- assertEquals("Fred", objectData.getEntry("propertyUsedForTitle"));
+ assertEquals("Fred", objectData.getEntry("stringProperty"));
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_encodedData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_encodedData.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_encodedData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_encodedData.java Sat May 19 07:28:31 2012
@@ -49,19 +49,19 @@ public class MementoTest_encodedData {
@Before
public void setUpSystem() throws Exception {
- iswf.fixtures.epv1.setName("Fred");
- iswf.fixtures.epv2.setName("Harry");
+ iswf.fixtures.smpl1.setName("Fred");
+ iswf.fixtures.smpl2.setName("Harry");
- iswf.fixtures.epr1.setReference(iswf.fixtures.epv1);
+ iswf.fixtures.rfcg1.setReference(iswf.fixtures.smpl1);
- iswf.fixtures.epc1.getHomogeneousCollection().add(iswf.fixtures.epv1);
- iswf.fixtures.epc1.getHomogeneousCollection().add(iswf.fixtures.epv2);
+ iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl1);
+ iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl2);
- iswf.fixtures.epc1.getHeterogeneousCollection().add(iswf.fixtures.epv1);
- iswf.fixtures.epc1.getHeterogeneousCollection().add(iswf.fixtures.epr1);
+ iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.smpl1);
+ iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.rfcg1);
- rootAdapter = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.epv1);
+ rootAdapter = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.smpl1);
memento = new Memento(rootAdapter);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorSessionHydratorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorSessionHydratorTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorSessionHydratorTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorSessionHydratorTest.java Sat May 19 07:28:31 2012
@@ -19,13 +19,11 @@
package org.apache.isis.runtimes.dflt.runtime.persistence;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
@@ -41,36 +39,29 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.runtime.system.persistence.IdentifierGenerator;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures.Fixtures.Initialization;
-import org.apache.isis.tck.dom.eg.ExamplePojoRepository;
-import org.apache.isis.tck.dom.eg.ExamplePojoWithValues;
-import org.apache.isis.tck.dom.eg.TestPojoRepository;
+import org.apache.isis.tck.dom.refs.AssociatedEntitiesRepository;
+import org.apache.isis.tck.dom.refs.SimpleEntity;
public class PersistorSessionHydratorTest {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
- private RootOid epvTransientOid = RootOidDefault.deString("!EPV:-999");
+ private RootOid epvTransientOid = RootOidDefault.deString("!SMPL:-999");
private IdentifierGenerator mockIdentifierGenerator = context.mock(IdentifierGenerator.class);
{
context.checking(new Expectations() {
{
- allowing(mockIdentifierGenerator).createTransientIdentifierFor(with(equalTo(ObjectSpecId.of("TestPojoRepository"))), with(any(Object.class)));
+ allowing(mockIdentifierGenerator).createTransientIdentifierFor(with(equalTo(ObjectSpecId.of("AssociatedEntities"))), with(an(AssociatedEntitiesRepository.class)));
will(returnValue("1"));
-
- allowing(mockIdentifierGenerator).createPersistentIdentifierFor(with(equalTo(ObjectSpecId.of("TestPojoRepository"))), with(an(TestPojoRepository.class)), with(any(RootOid.class)));
- will(returnValue("1"));
-
- allowing(mockIdentifierGenerator).createTransientIdentifierFor(with(equalTo(ObjectSpecId.of("ExamplePojoRepository"))), with(an(ExamplePojoRepository.class)));
- will(returnValue("1"));
- allowing(mockIdentifierGenerator).createPersistentIdentifierFor(with(equalTo(ObjectSpecId.of("ExamplePojoRepository"))), with(an(ExamplePojoRepository.class)), with(any(RootOid.class)));
+ allowing(mockIdentifierGenerator).createPersistentIdentifierFor(with(equalTo(ObjectSpecId.of("AssociatedEntities"))), with(an(AssociatedEntitiesRepository.class)), with(any(RootOid.class)));
will(returnValue("1"));
- allowing(mockIdentifierGenerator).createTransientIdentifierFor(with(equalTo(ObjectSpecId.of("EPV"))), with(an(ExamplePojoWithValues.class)));
+ allowing(mockIdentifierGenerator).createTransientIdentifierFor(with(equalTo(ObjectSpecId.of("SMPL"))), with(an(SimpleEntity.class)));
will(returnValue("-999"));
- allowing(mockIdentifierGenerator).createPersistentIdentifierFor(with(equalTo(ObjectSpecId.of("EPV"))), with(an(ExamplePojoWithValues.class)), with(any(RootOid.class)));
+ allowing(mockIdentifierGenerator).createPersistentIdentifierFor(with(equalTo(ObjectSpecId.of("SMPL"))), with(an(SimpleEntity.class)), with(any(RootOid.class)));
will(returnValue("1"));
}
});
@@ -90,14 +81,14 @@ public class PersistorSessionHydratorTes
@Test
public void adaptorFor_whenTransient() {
// given
- iswf.fixtures.epv1 = iswf.container.newTransientInstance(ExamplePojoWithValues.class);
+ iswf.fixtures.smpl1 = iswf.container.newTransientInstance(SimpleEntity.class);
// when
- final ObjectAdapter adapter = iswf.adapterFor(iswf.fixtures.epv1);
+ final ObjectAdapter adapter = iswf.adapterFor(iswf.fixtures.smpl1);
// then
assertEquals(epvTransientOid, adapter.getOid());
- assertEquals(iswf.fixtures.epv1, adapter.getObject());
+ assertEquals(iswf.fixtures.smpl1, adapter.getObject());
assertEquals(ResolveState.TRANSIENT, adapter.getResolveState());
assertEquals(null, adapter.getVersion());
}
@@ -106,21 +97,21 @@ public class PersistorSessionHydratorTes
public void recreateAdapter_whenPersistent() throws Exception {
// given persisted object
- iswf.fixtures.epv1 = iswf.container.newTransientInstance(ExamplePojoWithValues.class);
- iswf.fixtures.epv1.setName("Fred");
- iswf.persist(iswf.fixtures.epv1);
+ iswf.fixtures.smpl1 = iswf.container.newTransientInstance(SimpleEntity.class);
+ iswf.fixtures.smpl1.setName("Fred");
+ iswf.persist(iswf.fixtures.smpl1);
iswf.tearDownSystem();
iswf.setUpSystem();
// when
- final RootOidDefault oid = RootOidDefault.deString("EPV:1");
+ final RootOidDefault oid = RootOidDefault.deString("SMPL:1");
final ObjectAdapter adapter = iswf.recreateAdapter(oid);
// then
assertEquals(oid, adapter.getOid());
assertEquals(ResolveState.GHOST, adapter.getResolveState());
- final ExamplePojoWithValues epv = (ExamplePojoWithValues)adapter.getObject();
+ final SimpleEntity epv = (SimpleEntity)adapter.getObject();
assertEquals("Fred", epv.getName());
assertNotNull(adapter.getVersion());
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixturesTest_basicTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixturesTest_basicTest.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixturesTest_basicTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixturesTest_basicTest.java Sat May 19 07:28:31 2012
@@ -25,6 +25,8 @@ import static org.junit.Assert.assertTha
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.tck.dom.scalars.JdkValuedEntity;
+
public class IsisSystemWithFixturesTest_basicTest {
@Rule
@@ -33,11 +35,11 @@ public class IsisSystemWithFixturesTest_
@Test
public void savePojo() throws Exception {
- assertThat(iswf.fixtures.testPojoRepository.findAll().size(), is(0));
+ assertThat(iswf.container.allInstances(JdkValuedEntity.class).size(), is(0));
- iswf.container.persist(iswf.fixtures.testPojo1);
+ iswf.container.persist(iswf.fixtures.jve1);
- assertThat(iswf.fixtures.testPojoRepository.findAll().size(), is(1));
+ assertThat(iswf.container.allInstances(JdkValuedEntity.class).size(), is(1));
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/test.data
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/test.data?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/test.data (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/test.data Sat May 19 07:28:31 2012
@@ -1,4 +1,4 @@
-org.apache.isis.tck.dom.eg.ExamplePojoWithValues#4
+org.apache.isis.tck.dom.refs.SimpleEntity#4
date: 08-Mar-2010 13:32
name: Fred Smith
nullable:
Propchange: incubator/isis/trunk/framework/runtimes/dflt/webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -7,3 +7,4 @@ target
*.iml
build
.umlproject
+target-ide
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.runtimes.dflt</groupId>
Propchange: incubator/isis/trunk/framework/runtimes/dflt/webserver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -4,3 +4,4 @@ target
.project
build
.umlproject
+target-ide
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.runtimes.dflt</groupId>
Modified: incubator/isis/trunk/framework/runtimes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/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>runtimes</artifactId>
@@ -75,7 +75,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>
@@ -83,12 +83,12 @@
<dependency>
<groupId>org.apache.isis.runtimes</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<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>test-jar</type>
</dependency>
Modified: incubator/isis/trunk/framework/searchandreplace.groovy
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/searchandreplace.groovy?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/searchandreplace.groovy (original)
+++ incubator/isis/trunk/framework/searchandreplace.groovy Sat May 19 07:28:31 2012
@@ -36,7 +36,7 @@ if(options.x) {
//
//
def replacements = [
-"isis-parent": "isis"
+"0.3.0-incubating-SNAPSHOT": "0.3.1-incubating-SNAPSHOT"
]
Propchange: incubator/isis/trunk/framework/security/dflt/
------------------------------------------------------------------------------
--- 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/security/dflt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/dflt/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/dflt/pom.xml (original)
+++ incubator/isis/trunk/framework/security/dflt/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.security</groupId>
@@ -71,7 +71,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/security/file/
------------------------------------------------------------------------------
--- 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/security/file/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/file/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/file/pom.xml (original)
+++ incubator/isis/trunk/framework/security/file/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.security</groupId>
@@ -70,7 +70,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/security/ldap/
------------------------------------------------------------------------------
--- 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/security/ldap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/ldap/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/ldap/pom.xml (original)
+++ incubator/isis/trunk/framework/security/ldap/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.security</groupId>
@@ -70,7 +70,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/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/pom.xml (original)
+++ incubator/isis/trunk/framework/security/pom.xml Sat May 19 07:28:31 2012
@@ -24,7 +24,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>security</artifactId>
@@ -93,7 +93,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>
@@ -102,48 +102,48 @@
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</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.security</groupId>
<artifactId>file</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>file</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.security</groupId>
<artifactId>ldap</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>ldap</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.security</groupId>
<artifactId>sql</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>sql</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/security/sql/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -1,3 +1,4 @@
hsql-db
target
.*
+target-ide
Modified: incubator/isis/trunk/framework/security/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/sql/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/sql/pom.xml (original)
+++ incubator/isis/trunk/framework/security/sql/pom.xml Sat May 19 07:28:31 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.security</groupId>
@@ -70,7 +70,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/site-skin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 19 07:28:31 2012
@@ -2,4 +2,4 @@
.classpath
.project
target
-
+target-ide
Modified: incubator/isis/trunk/framework/site-skin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/site-skin/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/site-skin/pom.xml (original)
+++ incubator/isis/trunk/framework/site-skin/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>
<groupId>org.apache.isis.skins</groupId>
Added: incubator/isis/trunk/framework/src/site/resources/images/oids.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/images/oids.png?rev=1340365&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/framework/src/site/resources/images/oids.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/isis/trunk/framework/src/site/resources/images/oids.pptx
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/images/oids.pptx?rev=1340365&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/framework/src/site/resources/images/oids.pptx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/isis/trunk/framework/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/site.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/src/site/site.xml Sat May 19 07:28:31 2012
@@ -22,7 +22,7 @@
<skin>
<groupId>org.apache.isis.skins</groupId>
<artifactId>classic-skin</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</skin>
<version position="right" />
Modified: incubator/isis/trunk/framework/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/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>
<groupId>org.apache.isis.tck</groupId>
@@ -166,285 +166,285 @@
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>applib</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>applib</artifactId>
<classifier>javadoc</classifier>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: core -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>commons</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>metamodel</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>progmodel</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>runtime</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>webapp</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: progmodels: dflt -->
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: progmodel: wrapper -->
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>wrapper</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>wrapper-applib</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>wrapper-metamodel</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: progmodel: groovy -->
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>groovy</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>groovy-applib</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>groovy-metamodel</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: security: dflt -->
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: security: ldap -->
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>ldap</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: security: file -->
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>file</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes: dflt -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>monitoring</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>webapp</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>webserver</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>identity</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>javassist</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: dflt -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: xml -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>xml</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: nosql -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>nosql</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: objectstore: sql -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>sql-impl</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: dflt -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: xml -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>xml</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: viewer: dnd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>dnd</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: viewer: html -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>html</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: viewer: scimpi -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi</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-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>
<!-- isis: viewer: junit -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>junit</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: viewer: bdd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>bdd</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>
</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>
</dependency>
<!-- isis: viewer: wicket -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-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>wicket-facets</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-model</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-ui</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-viewer</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<!-- isis: viewer: json -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>json</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>
</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>
</dependencies>
@@ -478,6 +478,5 @@
<modules>
<module>tck-dom</module>
<module>tck-fixture</module>
- <module>tck-objstore-dflt</module>
</modules>
</project>
Propchange: incubator/isis/trunk/framework/tck/tck-dom/
------------------------------------------------------------------------------
--- 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-dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/pom.xml?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/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-dom</artifactId>
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/WithDefaultsEntityRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/WithDefaultsEntityRepository.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/WithDefaultsEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/WithDefaultsEntityRepository.java Sat May 19 07:28:31 2012
@@ -21,18 +21,36 @@ package org.apache.isis.tck.dom.defaults
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.QueryOnly;
+import org.apache.isis.applib.filter.Filter;
@Named("Simples")
-public interface WithDefaultsEntityRepository {
+public class WithDefaultsEntityRepository extends AbstractFactoryAndRepository {
+
+ @Override
+ public String getId() {
+ return "withDefaultsEntities";
+ }
- @QueryOnly
@MemberOrder(sequence = "1")
- public List<WithDefaultsEntity> list();
+ @QueryOnly
+ public List<WithDefaultsEntity> list() {
+ final Filter<Object> filterPersistentOnly = new Filter<Object>() {
+
+ @Override
+ public boolean accept(final Object t) {
+ return getContainer().isPersistent(t);
+ }
+ };
+ return allMatches(WithDefaultsEntity.class, filterPersistentOnly);
+ }
@MemberOrder(sequence = "3")
- public WithDefaultsEntity newTransientEntity();
+ public WithDefaultsEntity newTransientEntity() {
+ return newTransientInstance(WithDefaultsEntity.class);
+ }
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Movie.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Movie.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Movie.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Movie.java Sat May 19 07:28:31 2012
@@ -27,45 +27,42 @@ import org.apache.isis.applib.annotation
@ObjectType("movies.MOVIE")
public class Movie {
- private Person director;
- private String name;
- private final List<Role> roles = Lists.newArrayList();
-
- public void addToRoles(final Role role) {
- roles.add(role);
- }
- public Person getDirector() {
- return director;
+ public String title() {
+ return name;
}
+ // {{ name: String
+ private String name;
public String getName() {
return name;
}
-
- public List<Role> getRoles() {
- return roles;
+ public void setName(final String name) {
+ this.name = name;
}
+ // }}
- public void removeFromRoles(final Role role) {
- roles.remove(role);
+ // {{ director: Person
+ private Person director;
+ public Person getDirector() {
+ return director;
}
-
public void setDirector(final Person director) {
this.director = director;
}
-
- public void setName(final String name) {
- this.name = name;
+
+ // }}
+
+ // {{ roles: List
+ private final List<Role> roles = Lists.newArrayList();
+ public List<Role> getRoles() {
+ return roles;
}
-
- public String title() {
- return name;
+ public void addToRoles(final Role role) {
+ roles.add(role);
}
-
- /*
- * public static void aboutActionFindMovie(ActionAbout about, String name,
- * Person director, Person actor) { about.setParameter(0, "Name");
- * about.setParameter(1, "Director"); about.setParameter(2, "Actor"); }
- */
+ public void removeFromRoles(final Role role) {
+ roles.remove(role);
+ }
+ // }}
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Person.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Person.java?rev=1340365&r1=1340364&r2=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Person.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Person.java Sat May 19 07:28:31 2012
@@ -25,26 +25,30 @@ import org.apache.isis.applib.annotation
@ObjectType("movies.PERSON")
public class Person {
- private Date date;
- private String name;
-
- public Date getDate() {
- return date;
+
+ public String title() {
+ return name;
}
+ // {{ name: String
+ private String name;
public String getName() {
return name;
}
-
- public void setDate(final Date date) {
- this.date = date;
- }
-
public void setName(final String name) {
this.name = name;
}
+ // }}
+
- public String title() {
- return name;
+ // {{ Date: java.util.Date
+ private Date date;
+ public Date getDate() {
+ return date;
+ }
+ public void setDate(final Date date) {
+ this.date = date;
}
+ // }}
+
}
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Role.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/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/movies/Role.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/movies/Role.java Sat May 19 07:28:31 2012
@@ -24,26 +24,31 @@ import org.apache.isis.applib.annotation
@ObjectType("movies.ROLE")
public class Role {
- private Person actor;
- private String name;
-
- public Person getActor() {
- return actor;
+
+ public String title() {
+ return name;
}
+ // {{ name: String
+ private String name;
public String getName() {
return name;
}
-
+ public void setName(final String name) {
+ this.name = name;
+ }
+ // }}
+
+
+ // {{ actor: Person
+ private Person actor;
+ public Person getActor() {
+ return actor;
+ }
public void setActor(final Person actor) {
this.actor = actor;
}
+ // }}
- public void setName(final String name) {
- this.name = name;
- }
- public String title() {
- return name;
- }
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Empty.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterface.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Empty.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Empty.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterface.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterface.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Empty.java Sat May 19 07:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
-public interface EmptyInterface {
+public interface Empty {
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/EmptyEntityWithOwnProperty.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/EmptyEntityWithOwnProperty.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/EmptyEntityWithOwnProperty.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/EmptyInterfaceEx.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/EmptyEntityWithOwnProperty.java Sat May 19 07:28:31 2012
@@ -1,8 +1,9 @@
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
-public class EmptyInterfaceEx implements EmptyInterface {
- // {{ Special
+public class EmptyEntityWithOwnProperty implements Empty {
+
+ // {{ Special: string
private String special;
public String getSpecial() {
@@ -12,6 +13,6 @@ public class EmptyInterfaceEx implements
public void setSpecial(final String special) {
this.special = special;
}
-
// }}
+
}
\ No newline at end of file
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/ReferencingPolyTypesEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyTestClass.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/ReferencingPolyTypesEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/ReferencingPolyTypesEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyTestClass.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyTestClass.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/ReferencingPolyTypesEntity.java Sat May 19 07:28:31 2012
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +36,8 @@ import org.apache.isis.applib.AbstractDo
* @author Kevin
*
*/
-public class PolyTestClass extends AbstractDomainObject {
+public class ReferencingPolyTypesEntity extends AbstractDomainObject {
+
public String title() {
return string;
}
@@ -55,54 +56,54 @@ public class PolyTestClass extends Abstr
// }}
// {{ PolyBaseClass collection
- private List<PolyBaseClass> polyBaseClasses = new ArrayList<PolyBaseClass>();
+ private List<StringBaseEntity> polyBaseClasses = new ArrayList<StringBaseEntity>();
- public List<PolyBaseClass> getPolyBaseClasses() {
+ public List<StringBaseEntity> getPolyBaseClasses() {
return polyBaseClasses;
}
- public void setPolyBaseClasses(final List<PolyBaseClass> polyBaseClasses) {
+ public void setPolyBaseClasses(final List<StringBaseEntity> polyBaseClasses) {
this.polyBaseClasses = polyBaseClasses;
}
// }}
// {{ PolyInterfaceType: Can we store / restore properties by interface?
- private PolyInterface polyInterfaceType;
+ private Stringable polyInterfaceType;
- public PolyInterface getPolyInterfaceType() {
+ public Stringable getPolyInterfaceType() {
return polyInterfaceType;
}
- public void setPolyInterfaceType(final PolyInterface polyInterfaceType) {
+ public void setPolyInterfaceType(final Stringable polyInterfaceType) {
this.polyInterfaceType = polyInterfaceType;
}
// }}
// {{ PolyInterface collection
- private List<PolyInterface> polyInterfaces = new ArrayList<PolyInterface>();
+ private List<Stringable> stringables = new ArrayList<Stringable>();
- public List<PolyInterface> getPolyInterfaces() {
- return polyInterfaces;
+ public List<Stringable> getPolyInterfaces() {
+ return stringables;
}
- public void setPolyInterfaces(final List<PolyInterface> polyInterfaces) {
- this.polyInterfaces = polyInterfaces;
+ public void setPolyInterfaces(final List<Stringable> stringables) {
+ this.stringables = stringables;
}
// }}
// {{ PolySelfRefClass: Can we store / restore classes that contain
// self-referencing collections?
- private PolySelfRefClass polySelfRefClass;
+ private SelfReferencingEntity selfReferencingEntity;
- public PolySelfRefClass getPolySelfRefClass() {
- return polySelfRefClass;
+ public SelfReferencingEntity getPolySelfRefClass() {
+ return selfReferencingEntity;
}
- public void setPolySelfRefClass(final PolySelfRefClass polySelfRefClass) {
- this.polySelfRefClass = polySelfRefClass;
+ public void setPolySelfRefClass(final SelfReferencingEntity selfReferencingEntity) {
+ this.selfReferencingEntity = selfReferencingEntity;
}
// }}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/SelfReferencingEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySelfRefClass.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/SelfReferencingEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/SelfReferencingEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySelfRefClass.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySelfRefClass.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/SelfReferencingEntity.java Sat May 19 07:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +36,7 @@ import org.apache.isis.applib.AbstractDo
* @version $Rev$ $Date$
*/
-public class PolySelfRefClass extends AbstractDomainObject {
+public class SelfReferencingEntity extends AbstractDomainObject {
public String title() {
return string;
@@ -44,44 +44,41 @@ public class PolySelfRefClass extends Ab
// {{ String type
private String string;
-
public String getString() {
return string;
}
-
public void setString(final String string) {
this.string = string;
}
-
// }}
// {{ PolyTestClass collection
- private List<PolySelfRefClass> polySelfRefClasses = new ArrayList<PolySelfRefClass>();
+ private List<SelfReferencingEntity> polySelfRefClasses = new ArrayList<SelfReferencingEntity>();
- public List<PolySelfRefClass> getPolySelfRefClasses() {
+ public List<SelfReferencingEntity> getPolySelfRefClasses() {
return polySelfRefClasses;
}
- public void setPolySelfRefClasses(final List<PolySelfRefClass> polySelfRefClasses) {
+ public void setPolySelfRefClasses(final List<SelfReferencingEntity> polySelfRefClasses) {
this.polySelfRefClasses = polySelfRefClasses;
}
- public void addToPolySelfRefClasses(final PolySelfRefClass polySelfRefClass) {
+ public void addToPolySelfRefClasses(final SelfReferencingEntity selfReferencingEntity) {
// check for no-op
- if (polySelfRefClass == null || getPolySelfRefClasses().contains(polySelfRefClass)) {
+ if (selfReferencingEntity == null || getPolySelfRefClasses().contains(selfReferencingEntity)) {
return;
}
// associate new
- getPolySelfRefClasses().add(polySelfRefClass);
+ getPolySelfRefClasses().add(selfReferencingEntity);
}
- public void removeFromPolySelfRefClasses(final PolySelfRefClass polySelfRefClass) {
+ public void removeFromPolySelfRefClasses(final SelfReferencingEntity selfReferencingEntity) {
// check for no-op
- if (polySelfRefClass == null || !getPolySelfRefClasses().contains(polySelfRefClass)) {
+ if (selfReferencingEntity == null || !getPolySelfRefClasses().contains(selfReferencingEntity)) {
return;
}
// dissociate existing
- getPolySelfRefClasses().remove(polySelfRefClass);
+ getPolySelfRefClasses().remove(selfReferencingEntity);
}
// }}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyBaseClass.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyBaseClass.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyBaseClass.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntity.java Sat May 19 07:28:31 2012
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
import org.apache.isis.applib.AbstractDomainObject;
@@ -28,7 +28,8 @@ import org.apache.isis.applib.AbstractDo
* @author Kevin
*
*/
-public abstract class PolyBaseClass extends AbstractDomainObject {
+public abstract class StringBaseEntity extends AbstractDomainObject {
+
public String title() {
return stringBase;
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySub.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassOne.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySub.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySub.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassOne.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassOne.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySub.java Sat May 19 07:28:31 2012
@@ -20,13 +20,14 @@
/**
*
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
/**
* @author Kevin
*
*/
-public class PolySubClassOne extends PolyBaseClass {
+public class StringBaseEntitySub extends StringBaseEntity {
+
@Override
public String title() {
return stringOne;
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubThree.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassThree.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubThree.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubThree.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassThree.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassThree.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubThree.java Sat May 19 07:28:31 2012
@@ -20,13 +20,13 @@
/**
*
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
/**
* @author Kevin
*
*/
-public class PolySubClassThree extends PolySubClassTwo {
+public class StringBaseEntitySubThree extends StringBaseEntitySubTwo {
// {{ String type
private String string;
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubTwo.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassTwo.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubTwo.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubTwo.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassTwo.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolySubClassTwo.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringBaseEntitySubTwo.java Sat May 19 07:28:31 2012
@@ -20,13 +20,14 @@
/**
*
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
/**
* @author Kevin
*
*/
-public class PolySubClassTwo extends PolyBaseClass {
+public class StringBaseEntitySubTwo extends StringBaseEntity {
+
@Override
public String title() {
return stringClassTwo;
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Stringable.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterface.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Stringable.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Stringable.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterface.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterface.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/Stringable.java Sat May 19 07:28:31 2012
@@ -17,8 +17,8 @@
* under the License.
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
-public interface PolyInterface {
+public interface Stringable {
public String getString();
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnDerivedProperty.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnDerivedProperty.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnDerivedProperty.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceEx.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnDerivedProperty.java Sat May 19 07:28:31 2012
@@ -1,7 +1,8 @@
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
-public class PolyInterfaceEx implements PolyInterface {
+public class StringableEntityWithOwnDerivedProperty implements Stringable {
+
// {{ String
private String string;
@@ -13,7 +14,6 @@ public class PolyInterfaceEx implements
public void setString(final String string) {
this.string = string;
}
-
// }}
public String getSpecial() {
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperties.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplB.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperties.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperties.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplB.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplB.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperties.java Sat May 19 07:28:31 2012
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
-public class PolyInterfaceImplB extends AbstractDomainObject implements PolyInterface, EmptyInterface {
+public class StringableEntityWithOwnProperties extends AbstractDomainObject implements Stringable, Empty {
+
public String title() {
return string;
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperty.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplA.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperty.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperty.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplA.java&r1=1338467&r2=1340365&rev=1340365&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/poly/PolyInterfaceImplA.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/poly/StringableEntityWithOwnProperty.java Sat May 19 07:28:31 2012
@@ -17,36 +17,32 @@
* under the License.
*/
-package org.apache.isis.tck.dom.sqlos.poly;
+package org.apache.isis.tck.dom.poly;
import org.apache.isis.applib.AbstractDomainObject;
-public class PolyInterfaceImplA extends AbstractDomainObject implements PolyInterface {
+public class StringableEntityWithOwnProperty extends AbstractDomainObject implements Stringable {
+
public String title() {
return string;
}
// {{ String type
private String string;
-
@Override
public String getString() {
return string;
}
-
public void setString(final String string) {
this.string = string;
}
-
// }}
// {{ Special
private String special;
-
public String getSpecial() {
return special;
}
-
public void setSpecial(final String special) {
this.special = special;
}
Copied: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java (from r1338467, incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoAggregated.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java?p2=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java&p1=incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/eg/ExamplePojoAggregated.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/ExamplePojoAggregated.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java Sat May 19 07:28:31 2012
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.isis.tck.dom.eg;
+package org.apache.isis.tck.dom.refs;
import org.apache.isis.applib.annotation.Aggregated;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ObjectType;
@Aggregated
-@ObjectType("EPA")
-public class ExamplePojoAggregated extends ExamplePojo {
+@ObjectType("AGGR")
+public class AggregatedEntity extends BaseEntity {
// {{ Name
private String name;