incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1331698 [1/3] - in /incubator/isis/branches/0.3.0-incubating-NEW-OIDs: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ core/metamodel/src/main/ja...
Date Sat, 28 Apr 2012 07:47:31 GMT
Author: danhaywood
Date: Sat Apr 28 07:47:28 2012
New Revision: 1331698

URL: http://svn.apache.org/viewvc?rev=1331698&view=rev
Log:
ISIS-214: working on the sqlos tests (HsqlTest now green)

Added:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacet.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacet.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacetAbstract.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForFreeStandingList.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForFreeStandingList.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedFacetSinceCollection.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedSinceCollection.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedSinceCollectionFacetFactory.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/ParentedFacetSinceAggregatedAnnotation.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedFacetAnnotation.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/ParentedFacetDerivedFromJpaEmbeddableAnnotation.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/Data.java   (with props)
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestData.java
      - copied, changed from r1307477, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestFixtures.java
      - copied, changed from r1307519, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/Utils.java   (with props)
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/InMemoryPersistenceTest.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/InMemoryPersistanceTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/XmlPersistenceTest.java
      - copied, changed from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/XmlPersistanceTest.java
Removed:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacet.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedSinceCollection.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedFacetAnnotation.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/InMemoryPersistanceTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/crosscheck/XmlPersistanceTest.java
Modified:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOid.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_array.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_collection.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/GivenJpaEmbeddableAnnotationFacetFactoryTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommand.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcConnector.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommonBase.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/config/hsql.properties
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/HsqlTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PolymorphismTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectDataVectorTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionAbstract.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryFindByPattern.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSessionContainer.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/AggregatedFacetAlways.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmContractTest.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeDisplayRules.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/util/Properties.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/DialoggedObjectOption.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/DefaultContentFactory.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java Sat Apr 28 07:47:28 2012
@@ -113,9 +113,9 @@ public interface ObjectAdapter extends O
 
 
     /**
-     * Either itself or its parent adapter (if aggregated).
+     * Either the aggregate root (either itself or, if parented, then its parent adapter).
      */
-    ObjectAdapter getAggregateRoot(ObjectAdapterLookup objectAdapterLookup);
+    ObjectAdapter getAggregateRoot();
 
 
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOid.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOid.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOid.java Sat Apr 28 07:47:28 2012
@@ -44,7 +44,7 @@ public final class CollectionOid extends
     // /////////////////////////////////////////////////////////
 
     public CollectionOid(Oid parentOid, OneToManyAssociation otma) {
-        this(parentOid, otma.getName());
+        this(parentOid, otma.getId());
         cacheState();
     }
 

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacet.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacet.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacet.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacet.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacet.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacet.java Sat Apr 28 07:47:28 2012
@@ -19,26 +19,38 @@
 
 package org.apache.isis.core.metamodel.facets.object.aggregated;
 
+import java.util.List;
+import java.util.Set;
+
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 
 /**
- * Indicates that this class is aggregated, that is, wholly contained within a
+ * Indicates that this class is parented, that is, wholly contained within a
  * larger object.
  * 
  * <p>
- * The object may or may not be {@link ImmutableFacet immutable}, and may
- * reference regular entity domain objects or other aggregated objects.
- * 
- * <p>
- * In the standard Apache Isis Programming Model, typically corresponds to
- * applying the <tt>@Aggregated</tt> annotation at the class level.
+ * There are two classes of object that are parented:
+ * <ul>
+ * <li>Aggregated objects</li>
+ * <li>Internal collections</li>
+ * </ul>
  * 
  * <p>
+ * In the standard Apache Isis Programming Model, aggregated objects typically corresponds to
+ * applying the <tt>@Aggregated</tt> annotation at the class level.  
  * In terms of an analogy, aggregated is similar to Hibernate's component types
  * (for larger mutable in-line objects) or to Hibernate's user-defined types
  * (for smaller immutable values).
+ * 
+ * <p>
+ * Internal collections are the {@link List}s, {@link Set}s etc that hold references to
+ * other root entities.
+ * 
+ * <p>
+ * The object may or may not be {@link ImmutableFacet immutable}.  If an aggregated entity, then it may
+ * reference regular entity domain objects or other aggregated objects.
  */
-public interface AggregatedFacet extends MarkerFacet {
+public interface ParentedFacet extends MarkerFacet {
 
 }

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacetAbstract.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacetAbstract.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacetAbstract.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/AggregatedFacetAbstract.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/aggregated/ParentedFacetAbstract.java Sat Apr 28 07:47:28 2012
@@ -23,13 +23,13 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 
-public abstract class AggregatedFacetAbstract extends MarkerFacetAbstract implements AggregatedFacet {
+public abstract class ParentedFacetAbstract extends MarkerFacetAbstract implements ParentedFacet {
 
     public static Class<? extends Facet> type() {
-        return AggregatedFacet.class;
+        return ParentedFacet.class;
     }
 
-    public AggregatedFacetAbstract(final FacetHolder holder) {
+    public ParentedFacetAbstract(final FacetHolder holder) {
         super(type(), holder);
     }
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java Sat Apr 28 07:47:28 2012
@@ -90,7 +90,7 @@ public class DomainObjectContainerDefaul
     @SuppressWarnings("unchecked")
     public <T> T newTransientInstance(final Class<T> ofClass) {
         final ObjectSpecification spec = getSpecificationLookup().loadSpecification(ofClass);
-        if (spec.isAggregated()) {
+        if (spec.isParented()) {
             return newAggregatedInstance(this, ofClass);
         } else {
             final ObjectAdapter adapter = doCreateTransientInstance(spec);
@@ -102,7 +102,7 @@ public class DomainObjectContainerDefaul
     @SuppressWarnings("unchecked")
     public <T> T newAggregatedInstance(final Object parent, final Class<T> ofClass) {
         final ObjectSpecification spec = getSpecificationLookup().loadSpecification(ofClass);
-        if (!spec.isAggregated()) {
+        if (!spec.isParented()) {
             throw new IsisException("Type must be annotated as @Aggregated: " + ofClass);
         }
         final ObjectAdapter adapter = doCreateAggregatedInstance(spec, parent);

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectList.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectList.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java Sat Apr 28 07:47:28 2012
@@ -30,12 +30,15 @@ import org.apache.commons.collections.it
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
-public class ObjectList extends AbstractList<ObjectAdapter> {
+/**
+ * A list returned from an action, ie not associated or owned by any entity.
+ */
+public class FreeStandingList extends AbstractList<ObjectAdapter> {
 
     private final List<ObjectAdapter> instances;
     private final ObjectSpecification instanceSpecification;
 
-    public ObjectList(final ObjectSpecification instanceSpecification, final ObjectAdapter[] instances) {
+    public FreeStandingList(final ObjectSpecification instanceSpecification, final ObjectAdapter[] instances) {
         this.instanceSpecification = instanceSpecification;
         this.instances = Collections.unmodifiableList(Arrays.asList(instances));
     }

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java Sat Apr 28 07:47:28 2012
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.help.HelpFacet;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
@@ -234,14 +234,14 @@ public interface ObjectSpecification ext
      * 
      * <p>
      * In effect, means that it doesn't have the {@link CollectionFacet}, and
-     * therefore will return NOT {@link #isCollection()}
+     * therefore will return NOT {@link #isParentedOrFreeCollection()}
      * 
      * @see #isCollection().
      */
     boolean isNotCollection();
 
     /**
-     * Determines if objects represents a collection.
+     * Determines if objects of this type are a parented (internal) or free-standing (external) collection.
      * 
      * <p>
      * In effect, means has got {@link CollectionFacet}, and therefore will
@@ -249,17 +249,7 @@ public interface ObjectSpecification ext
      * 
      * @see #isNotCollection()
      */
-    boolean isCollection();
-
-    /**
-     * Whether objects of this type are a collection or are intrinsically
-     * aggregated.
-     * 
-     * <p>
-     * In effect, means has got a {@link CollectionFacet} and/or got the
-     * {@link AggregatedFacet}.
-     */
-    boolean isCollectionOrIsAggregated();
+    boolean isParentedOrFreeCollection();
 
     /**
      * Determines if objects of this type are values.
@@ -270,20 +260,20 @@ public interface ObjectSpecification ext
     boolean isValue();
 
     /**
-     * Determines if objects of this type are aggregated.
+     * Determines if objects of this type are parented (a parented collection, or an aggregated entity).
      * 
      * <p>
-     * In effect, means has got {@link AggregatedFacet} or {@link ValueFacet}.
+     * In effect, means has got {@link ParentedFacet}.
      */
-    boolean isAggregated();
+    boolean isParented();
 
     /**
      * Determines if objects of this type are either values or aggregated.
      * 
      * @see #isValue()
-     * @see #isAggregated()
+     * @see #isParented()
      */
-    boolean isValueOrIsAggregated();
+    boolean isValueOrIsParented();
 
     /**
      * Determines if objects of this type can be set up from a text entry

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Sat Apr 28 07:47:28 2012
@@ -58,7 +58,7 @@ import org.apache.isis.core.metamodel.ru
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
 import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
-import org.apache.isis.core.metamodel.spec.ObjectList;
+import org.apache.isis.core.metamodel.spec.FreeStandingList;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationContext;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -74,7 +74,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
 import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionContext;
 import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpecificationForObjectList;
+import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpecificationForFreeStandingList;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -397,8 +397,8 @@ public class ObjectReflectorDefault impl
 
         final SpecificationContext specContext = new SpecificationContext(authenticationSessionProvider, servicesProvider, objectInstantiator, specificationLookup);
 
-        if (ObjectList.class.isAssignableFrom(cls)) {
-            return new ObjectSpecificationForObjectList(specContext);
+        if (FreeStandingList.class.isAssignableFrom(cls)) {
+            return new ObjectSpecificationForFreeStandingList(specContext);
         } else {
             final SpecificationLoader specificationLoader = this;
             final AdapterMap adapterMap = getRuntimeContext().getAdapterMap();
@@ -492,13 +492,14 @@ public class ObjectReflectorDefault impl
             str.append(spec.isAbstract() ? "A" : ".");
             str.append(spec.isService() ? "S" : ".");
             str.append(BoundedFacetUtils.isBoundedSet(spec) ? "B" : ".");
-            str.append(spec.isCollection() ? "C" : ".");
+            str.append(spec.isParentedOrFreeCollection() ? "C" : ".");
             str.append(spec.isNotCollection() ? "O" : ".");
-            str.append("."); // placeholder for future support of maps
             str.append(spec.isParseable() ? "P" : ".");
             str.append(spec.isEncodeable() ? "E" : ".");
-            str.append(spec.isValueOrIsAggregated() ? "A" : ".");
-            str.append(!spec.isCollectionOrIsAggregated() ? "I" : ".");
+            str.append(spec.isValueOrIsParented() ? "A" : ".");
+            
+            final boolean hasIdentity = !(spec.isParentedOrFreeCollection() || spec.isParented() || spec.isValue());
+            str.append( hasIdentity ? "I" : ".");
             str.append("  ");
             str.append(spec.getShortIdentifier());
             str.append("  [fqc=");

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java Sat Apr 28 07:47:28 2012
@@ -257,7 +257,7 @@ public class ObjectActionImpl extends Ob
                     parameters.add(new ObjectActionParameterParseable(i, this, paramPeer));
                 } else if (specification.isNotCollection()) {
                     parameters.add(new OneToOneActionParameterImpl(i, this, paramPeer));
-                } else if (specification.isCollection()) {
+                } else if (specification.isParentedOrFreeCollection()) {
                     throw new UnknownTypeException("collections not supported as parameters: " + getIdentifier());
                 } else {
                     throw new UnknownTypeException(specification);

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java Sat Apr 28 07:47:28 2012
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.help.HelpFacet;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 import org.apache.isis.core.metamodel.facets.object.dirty.ClearDirtyObjectFacet;
 import org.apache.isis.core.metamodel.facets.object.dirty.IsDirtyObjectFacet;
 import org.apache.isis.core.metamodel.facets.object.dirty.MarkDirtyObjectFacet;
@@ -83,7 +83,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpecificationForObjectList;
+import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpecificationForFreeStandingList;
 
 public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
 
@@ -607,7 +607,7 @@ public abstract class ObjectSpecificatio
      * The association with the given {@link ObjectAssociation#getId() id}.
      * 
      * <p>
-     * This is overridable because {@link ObjectSpecificationForObjectList}
+     * This is overridable because {@link ObjectSpecificationForFreeStandingList}
      * simply returns <tt>null</tt>.
      * 
      * <p>
@@ -615,7 +615,7 @@ public abstract class ObjectSpecificatio
      * 
      * <p>
      * TODO: could this be made final? (ie does the framework ever call this
-     * method for an {@link ObjectSpecificationForObjectList})
+     * method for an {@link ObjectSpecificationForFreeStandingList})
      */
     @Override
     public ObjectAssociation getAssociation(final String id) {
@@ -753,7 +753,7 @@ public abstract class ObjectSpecificatio
         if (returnType == null) {
             return;
         }
-        if (returnType.isCollection()) {
+        if (returnType.isParentedOrFreeCollection()) {
             final TypeOfFacet facet = serviceAction.getFacet(TypeOfFacet.class);
             if (facet != null) {
                 final ObjectSpecification elementType = facet.valueSpec();
@@ -900,23 +900,23 @@ public abstract class ObjectSpecificatio
     }
 
     @Override
-    public boolean isAggregated() {
-        return containsFacet(AggregatedFacet.class);
+    public boolean isParented() {
+        return containsFacet(ParentedFacet.class);
     }
 
     @Override
-    public boolean isCollection() {
+    public boolean isParentedOrFreeCollection() {
         return containsFacet(CollectionFacet.class);
     }
 
     @Override
     public boolean isNotCollection() {
-        return !isCollection();
+        return !isParentedOrFreeCollection();
     }
 
     @Override
-    public boolean isValueOrIsAggregated() {
-        return isValue() || isAggregated();
+    public boolean isValueOrIsParented() {
+        return isValue() || isParented();
     }
 
     // //////////////////////////////////////////////////////////////////////
@@ -924,11 +924,6 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     @Override
-    public boolean isCollectionOrIsAggregated() {
-        return false;
-    }
-
-    @Override
     public Object createObject() {
         throw new UnsupportedOperationException(getFullIdentifier());
     }

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java Sat Apr 28 07:47:28 2012
@@ -169,7 +169,7 @@ public class OneToOneAssociationImpl ext
         if (setterFacet == null) {
             return;
         }
-        if (ownerAdapter.isPersistent() && newReferencedAdapter != null && newReferencedAdapter.isTransient() && !newReferencedAdapter.getSpecification().isAggregated()) {
+        if (ownerAdapter.isPersistent() && newReferencedAdapter != null && newReferencedAdapter.isTransient() && !newReferencedAdapter.getSpecification().isParented()) {
             // TODO: move to facet ?
             throw new IsisException("can't set a reference to a transient object from a persistent one: " + newReferencedAdapter.titleString() + " (transient)");
         }

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java Sat Apr 28 07:47:28 2012
@@ -418,11 +418,6 @@ public class ObjectSpecificationDefault 
         return null;
     }
 
-    @Override
-    public boolean isCollectionOrIsAggregated() {
-        return isCollection() || isValueOrIsAggregated();
-    }
-
     // //////////////////////////////////////////////////////////////////////
     // createObject
     // //////////////////////////////////////////////////////////////////////
@@ -526,7 +521,7 @@ public class ObjectSpecificationDefault 
     public String toString() {
         final ToString str = new ToString(this);
         str.append("class", getFullIdentifier());
-        str.append("type", (isCollection() ? "Collection" : "Object"));
+        str.append("type", (isParentedOrFreeCollection() ? "Collection" : "Object"));
         str.append("persistable", persistability());
         str.append("superclass", superclass() == null ? "Object" : superclass().getFullIdentifier());
         return str.toString();

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForFreeStandingList.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForFreeStandingList.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForFreeStandingList.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForFreeStandingList.java Sat Apr 28 07:47:28 2012
@@ -24,26 +24,26 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.collections.CollectionFacetAbstract;
-import org.apache.isis.core.metamodel.spec.ObjectList;
+import org.apache.isis.core.metamodel.spec.FreeStandingList;
 
-public class CollectionFacetForObjectList extends CollectionFacetAbstract {
+public class CollectionFacetForFreeStandingList extends CollectionFacetAbstract {
 
-    public CollectionFacetForObjectList(final FacetHolder holder) {
+    public CollectionFacetForFreeStandingList(final FacetHolder holder) {
         super(holder);
     }
 
     /**
      * Expected to be called with a {@link ObjectAdapter} wrapping a
-     * {@link ObjectList}.
+     * {@link FreeStandingList}.
      */
     @Override
     public List<ObjectAdapter> collection(final ObjectAdapter wrappedObjectList) {
-        return (ObjectList) wrappedObjectList.getObject();
+        return (FreeStandingList) wrappedObjectList.getObject();
     }
 
     /**
      * Expected to be called with a {@link ObjectAdapter} wrapping a
-     * {@link ObjectList}.
+     * {@link FreeStandingList}.
      */
     @Override
     public ObjectAdapter firstElement(final ObjectAdapter wrappedInstanceCollectionVector) {
@@ -53,7 +53,7 @@ public class CollectionFacetForObjectLis
 
     /**
      * Expected to be called with a {@link ObjectAdapter} wrapping a
-     * {@link ObjectList}.
+     * {@link FreeStandingList}.
      */
     @Override
     public int size(final ObjectAdapter wrappedInstanceCollectionVector) {

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForFreeStandingList.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForFreeStandingList.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForFreeStandingList.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForFreeStandingList.java Sat Apr 28 07:47:28 2012
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetDefaultToObject;
 import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.ObjectList;
+import org.apache.isis.core.metamodel.spec.FreeStandingList;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationContext;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -37,9 +37,9 @@ import org.apache.isis.core.metamodel.sp
 
 /**
  * A custom {@link ObjectSpecification} that is designed to treat the
- * {@link ObjectList} class as a "standalone" collection.
+ * {@link FreeStandingList} class as a "standalone" collection.
  */
-public class ObjectSpecificationForObjectList extends ObjectSpecificationAbstract {
+public class ObjectSpecificationForFreeStandingList extends ObjectSpecificationAbstract {
 
     /**
      * Used as {@link #getShortIdentifier()}, {@link #getName()} and
@@ -49,23 +49,10 @@ public class ObjectSpecificationForObjec
     private static final String DESCRIBED_AS = "Typed instances";
     private static final String ICON_NAME = "instances";
 
-    public ObjectSpecificationForObjectList(final SpecificationContext specificationContext) {
-        super(ObjectList.class, NAME, specificationContext);
+    public ObjectSpecificationForFreeStandingList(final SpecificationContext specificationContext) {
+        super(FreeStandingList.class, NAME, specificationContext);
     }
 
-    // /////////////////////////////////////////////////////////
-    // Intrinsic to class
-    // /////////////////////////////////////////////////////////
-
-    /**
-     * Review: wouldn't it be better to have a FacetFactory that specifically
-     * recognized {@link ObjectList} as a type and installed a
-     * {@link CollectionFacet} for it.
-     */
-    @Override
-    public boolean isCollectionOrIsAggregated() {
-        return true;
-    }
 
     // /////////////////////////////////////////////////////////
     // Introspection
@@ -75,7 +62,7 @@ public class ObjectSpecificationForObjec
     public void introspectTypeHierarchyAndMembers() {
         setSuperclass(Object.class);
 
-        addFacet(new CollectionFacetForObjectList(this));
+        addFacet(new CollectionFacetForFreeStandingList(this));
         addFacet(new TypeOfFacetDefaultToObject(this, getSpecificationLookup()) {
         });
 
@@ -129,7 +116,7 @@ public class ObjectSpecificationForObjec
 
     @Override
     public String getTitle(final ObjectAdapter object, final Localization localization) {
-        return ((ObjectList) object.getObject()).titleString();
+        return ((FreeStandingList) object.getObject()).titleString();
     }
 
     @Override

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java Sat Apr 28 07:47:28 2012
@@ -90,7 +90,7 @@ public final class Dump {
             debugBuilder.appendln("Description", specification.getDescription());
             debugBuilder.blankLine();
             debugBuilder.appendln("Features", featureList(specification));
-            debugBuilder.appendln("Type", specification.isCollection() ? "Collection" : "Object");
+            debugBuilder.appendln("Type", specification.isParentedOrFreeCollection() ? "Collection" : "Object");
             if (specification.superclass() != null) {
                 debugBuilder.appendln("Superclass", specification.superclass().getFullIdentifier());
             }
@@ -100,7 +100,7 @@ public final class Dump {
             debugBuilder.appendln("Service", specification.isService());
             debugBuilder.appendln("Encodable", specification.isEncodeable());
             debugBuilder.appendln("Parseable", specification.isParseable());
-            debugBuilder.appendln("Aggregated", specification.isValueOrIsAggregated());
+            debugBuilder.appendln("Aggregated", specification.isValueOrIsParented());
         } catch (final RuntimeException e) {
             debugBuilder.appendException(e);
         }
@@ -210,13 +210,16 @@ public final class Dump {
                         debugBuilder.appendln("Help", help.substring(0, Math.min(30, help.length())) + (help.length() > 30 ? "..." : ""));
                     }
 
+                    
                     debugBuilder.appendln("ID", field.getIdentifier());
                     debugBuilder.appendln("Short ID", field.getId());
                     debugBuilder.appendln("Name", field.getName());
                     final String type = field.isOneToManyAssociation() ? "Collection" : field.isOneToOneAssociation() ? "Object" : "Unknown";
                     debugBuilder.appendln("Type", type);
-                    debugBuilder.appendln("Has identity", !field.getSpecification().isCollectionOrIsAggregated());
-                    debugBuilder.appendln("Spec", field.getSpecification().getFullIdentifier());
+                    final ObjectSpecification fieldSpec = field.getSpecification();
+                    final boolean hasIdentity = !(fieldSpec.isParentedOrFreeCollection() || fieldSpec.isParented() || fieldSpec.isValue());
+                    debugBuilder.appendln("Has identity", hasIdentity);
+                    debugBuilder.appendln("Spec", fieldSpec.getFullIdentifier());
 
                     debugBuilder.appendln("Flags", (field.isAlwaysHidden() ? "" : "Visible ") + (field.isNotPersisted() ? "Not Persisted " : " ") + (field.isMandatory() ? "Mandatory " : ""));
 
@@ -425,7 +428,7 @@ public final class Dump {
     private static void simpleObject(final ObjectAdapter collectionAdapter, final DebugBuilder debugBuilder) {
         debugBuilder.appendln(collectionAdapter.titleString());
         final ObjectSpecification objectSpec = collectionAdapter.getSpecification();
-        if (objectSpec.isCollection()) {
+        if (objectSpec.isParentedOrFreeCollection()) {
             final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collectionAdapter);
             int i = 1;
             for (final ObjectAdapter element : facet.collection(collectionAdapter)) {
@@ -476,7 +479,7 @@ public final class Dump {
             debugBuilder.appendln("..."); // only go 3 levels?
         } else {
             debugBuilder.append("\n");
-            if (adapter.getSpecification().isCollection()) {
+            if (adapter.getSpecification().isParentedOrFreeCollection()) {
                 collectionGraph(adapter, level, ignoreAdapters, authenticationSession, debugBuilder);
             } else if (adapter.getSpecification().isNotCollection()) {
                 objectGraph(adapter, level, ignoreAdapters, debugBuilder, authenticationSession);

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java Sat Apr 28 07:47:28 2012
@@ -52,7 +52,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 
-public class TestProxySpecification extends FacetHolderImpl implements ObjectSpecification {
+public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSpecification {
 
     private ObjectAction action;
     public List<ObjectAssociation> fields = Lists.newArrayList();
@@ -65,7 +65,7 @@ public class TestProxySpecification exte
     private boolean hasNoIdentity;
     private RuntimeContextNoRuntime runtimeContext;
 
-    public TestProxySpecification(final Class<?> type) {
+    public ObjectSpecificationStub(final Class<?> type) {
         this(type.getName());
         runtimeContext = new RuntimeContextNoRuntime();
     }
@@ -79,7 +79,7 @@ public class TestProxySpecification exte
         }
     }
 
-    public TestProxySpecification(final String name) {
+    public ObjectSpecificationStub(final String name) {
         this.name = name;
         title = "";
         persistable = Persistability.USER_PERSISTABLE;
@@ -292,7 +292,7 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public boolean isValueOrIsAggregated() {
+    public boolean isValueOrIsParented() {
         return false;
     }
 
@@ -302,7 +302,7 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public boolean isAggregated() {
+    public boolean isParented() {
         return false;
     }
 
@@ -374,11 +374,6 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public boolean isCollectionOrIsAggregated() {
-        return hasNoIdentity;
-    }
-
-    @Override
     public Object createObject() {
         try {
             final Class<?> cls = Class.forName(name);
@@ -402,7 +397,7 @@ public class TestProxySpecification exte
     }
 
     @Override
-    public boolean isCollection() {
+    public boolean isParentedOrFreeCollection() {
         return false;
     }
 
@@ -413,7 +408,7 @@ public class TestProxySpecification exte
 
     @Override
     public boolean isNotCollection() {
-        return !isCollection();
+        return !isParentedOrFreeCollection();
     }
 
     @Override

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedFacetSinceCollection.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedSinceCollection.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedFacetSinceCollection.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedFacetSinceCollection.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedSinceCollection.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedSinceCollection.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedFacetSinceCollection.java Sat Apr 28 07:47:28 2012
@@ -20,11 +20,11 @@
 package org.apache.isis.core.progmodel.facets.collections.aggregated;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacetAbstract;
 
-public class AggregatedSinceCollection extends AggregatedFacetAbstract {
+public class ParentedFacetSinceCollection extends ParentedFacetAbstract {
 
-    public AggregatedSinceCollection(final FacetHolder holder) {
+    public ParentedFacetSinceCollection(final FacetHolder holder) {
         super(holder);
     }
 

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedSinceCollectionFacetFactory.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedSinceCollectionFacetFactory.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedSinceCollectionFacetFactory.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/AggregatedIfCollectionFacetFactory.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/aggregated/ParentedSinceCollectionFacetFactory.java Sat Apr 28 07:47:28 2012
@@ -23,22 +23,22 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.progmodel.facets.collections.collection.CollectionFacetFactory;
 
 /**
  * All {@link CollectionTypeRegistry collection types} are intrinsically
- * {@link AggregatedFacet aggregeted}.
- * 
+ * {@link ParentedFacet parented}.
  * 
+ * <p> 
  * Must be registered in the {@link ProgrammingModel} after
  * {@link CollectionFacetFactory}.
  */
-public class AggregatedIfCollectionFacetFactory extends FacetFactoryAbstract {
+public class ParentedSinceCollectionFacetFactory extends FacetFactoryAbstract {
 
-    public AggregatedIfCollectionFacetFactory() {
+    public ParentedSinceCollectionFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
     }
 
@@ -47,7 +47,7 @@ public class AggregatedIfCollectionFacet
         if (!processClassContaxt.getFacetHolder().containsFacet(CollectionFacet.class)) {
             return;
         }
-        FacetUtil.addFacet(new AggregatedSinceCollection(processClassContaxt.getFacetHolder()));
+        FacetUtil.addFacet(new ParentedFacetSinceCollection(processClassContaxt.getFacetHolder()));
     }
 
 }

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java Sat Apr 28 07:47:28 2012
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 
 public class AggregatedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 
@@ -38,8 +38,8 @@ public class AggregatedAnnotationFacetFa
         FacetUtil.addFacet(create(annotation, processClassContext.getFacetHolder()));
     }
 
-    private AggregatedFacet create(final Aggregated annotation, final FacetHolder holder) {
-        return annotation == null ? null : new AggregatedFacetAnnotation(holder);
+    private ParentedFacet create(final Aggregated annotation, final FacetHolder holder) {
+        return annotation == null ? null : new ParentedFacetSinceAggregatedAnnotation(holder);
     }
 
 }

Copied: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/ParentedFacetSinceAggregatedAnnotation.java (from r1307476, incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/ParentedFacetSinceAggregatedAnnotation.java?p2=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/ParentedFacetSinceAggregatedAnnotation.java&p1=incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedFacetAnnotation.java&r1=1307476&r2=1331698&rev=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedFacetAnnotation.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/ParentedFacetSinceAggregatedAnnotation.java Sat Apr 28 07:47:28 2012
@@ -20,11 +20,11 @@
 package org.apache.isis.core.progmodel.facets.object.aggregated.annotation;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacetAbstract;
 
-public class AggregatedFacetAnnotation extends AggregatedFacetAbstract {
+public class ParentedFacetSinceAggregatedAnnotation extends ParentedFacetAbstract {
 
-    public AggregatedFacetAnnotation(final FacetHolder holder) {
+    public ParentedFacetSinceAggregatedAnnotation(final FacetHolder holder) {
         super(holder);
     }
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java Sat Apr 28 07:47:28 2012
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.ebc.EqualByContentFacet;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
@@ -70,7 +70,7 @@ import org.apache.isis.core.progmodel.fa
  * <li> {@link EqualByContentFacet} - if specified explicitly in the annotation
  * </ul>
  * <p>
- * Note that {@link AggregatedFacet} is <i>not</i> installed.
+ * Note that {@link ParentedFacet} is <i>not</i> installed.
  */
 public class ValueFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterMapAware, DependencyInjectorAware {
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java Sat Apr 28 07:47:28 2012
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
 import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.actions.defaults.method.ActionDefaultsFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethod;
@@ -77,9 +77,9 @@ import org.apache.isis.core.progmodel.fa
 
 public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
 
-    private final ObjectSpecification voidSpec = new TestProxySpecification("VOID");
-    private final ObjectSpecification stringSpec = new TestProxySpecification("java.lang.String");
-    private final ObjectSpecification customerSpec = new TestProxySpecification("Customer");
+    private final ObjectSpecification voidSpec = new ObjectSpecificationStub("VOID");
+    private final ObjectSpecification stringSpec = new ObjectSpecificationStub("java.lang.String");
+    private final ObjectSpecification customerSpec = new ObjectSpecificationStub("Customer");
 
     public void testActionInvocationFacetIsInstalledAndMethodRemoved() {
         final ActionInvocationFacetFactory facetFactory = new ActionInvocationFacetFactory();

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java Sat Apr 28 07:47:28 2012
@@ -22,10 +22,10 @@ package org.apache.isis.core.progmodel.f
 import org.apache.isis.applib.annotation.Aggregated;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
+import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.object.aggregated.annotation.AggregatedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.aggregated.annotation.AggregatedFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.object.aggregated.annotation.ParentedFacetSinceAggregatedAnnotation;
 
 public class AggregatedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
 
@@ -51,9 +51,9 @@ public class AggregatedAnnotationFacetFa
 
         facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
 
-        final Facet facet = facetedMethod.getFacet(AggregatedFacet.class);
+        final Facet facet = facetedMethod.getFacet(ParentedFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof AggregatedFacetAnnotation);
+        assertTrue(facet instanceof ParentedFacetSinceAggregatedAnnotation);
 
         assertNoMethodsRemoved();
     }

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java Sat Apr 28 07:47:28 2012
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.object.mask.MaskFacet;
 import org.apache.isis.core.progmodel.facets.object.mask.annotation.MaskAnnotationForTypeFacetFactory;
@@ -39,7 +39,7 @@ import org.apache.isis.core.progmodel.fa
 
 public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
 
-    private final ObjectSpecification customerNoSpec = new TestProxySpecification(String.class);
+    private final ObjectSpecification customerNoSpec = new ObjectSpecificationStub(String.class);
 
     @Override
     protected void setUp() throws Exception {

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java Sat Apr 28 07:47:28 2012
@@ -35,7 +35,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.actions.typeof.annotation.TypeOfAnnotationForActionsFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.validate.method.ActionValidationFacetViaValidateMethodFacetFactory;
 import org.apache.isis.core.progmodel.facets.collections.accessor.CollectionAccessorFacetFactory;
-import org.apache.isis.core.progmodel.facets.collections.aggregated.AggregatedIfCollectionFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.aggregated.ParentedSinceCollectionFacetFactory;
 import org.apache.isis.core.progmodel.facets.collections.clear.CollectionClearFacetFactory;
 import org.apache.isis.core.progmodel.facets.collections.collection.CollectionFacetFactory;
 import org.apache.isis.core.progmodel.facets.collections.disabled.fromimmutable.DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory;
@@ -398,7 +398,7 @@ public class ProgrammingModelFacetsJava5
         // written to not trample over TypeOf if already installed
         addFactory(CollectionFacetFactory.class);
         // must come after CollectionFacetFactory
-        addFactory(AggregatedIfCollectionFacetFactory.class);
+        addFactory(ParentedSinceCollectionFacetFactory.class);
 
         // so we can dogfood the NO applib "value" types
         addFactory(ValueFacetFactory.class);

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_array.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_array.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_array.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_array.java Sat Apr 28 07:47:28 2012
@@ -37,7 +37,7 @@ public class ObjectReflectorDefaultTest_
 
     @Test
     public void testType() throws Exception {
-        Assert.assertTrue(specification.isCollection());
+        Assert.assertTrue(specification.isParentedOrFreeCollection());
     }
 
     @Test

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_collection.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_collection.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_collection.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTest_collection.java Sat Apr 28 07:47:28 2012
@@ -39,7 +39,7 @@ public class ObjectReflectorDefaultTest_
 
     @Test
     public void testType() throws Exception {
-        Assert.assertTrue(specification.isCollection());
+        Assert.assertTrue(specification.isParentedOrFreeCollection());
     }
 
     @Test

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/dflt/src/main/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStore.java Sat Apr 28 07:47:28 2012
@@ -411,7 +411,7 @@ public class InMemoryObjectStore impleme
             elements = recursiveElements;
         }
 
-        if (object.getSpecification().isCollection()) {
+        if (object.getSpecification().isParentedOrFreeCollection()) {
             return "\n" + debugCollectionGraph(object, level, elements);
         } else {
             return "\n" + debugObjectGraph(object, level, elements);

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java Sat Apr 28 07:47:28 2012
@@ -42,7 +42,7 @@ public class JpaEmbeddableAnnotationFace
 
         final FacetHolder facetHolder = processMethodContext.getFacetHolder();
         FacetUtil
-                .addFacet(new AggregatedFacetDerivedFromJpaEmbeddableAnnotation(
+                .addFacet(new ParentedFacetDerivedFromJpaEmbeddableAnnotation(
                         facetHolder));
         FacetUtil.addFacet(new JpaEmbeddableFacetAnnotation(facetHolder));
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java?rev=1331698&r1=1331697&r2=1331698&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java Sat Apr 28 07:47:28 2012
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.fa
  * <p>
  * The JPA {@link Embeddable} annotation has no attributes. However, in addition
  * to this facet it does also implicitly map to
- * {@link AggregatedFacetDerivedFromJpaEmbeddableAnnotation}.
+ * {@link ParentedFacetDerivedFromJpaEmbeddableAnnotation}.
  */
 public interface JpaEmbeddableFacet extends MarkerFacet {
 



Mime
View raw message