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/03/15 22:00:06 UTC
svn commit: r1301195 [1/4] - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/
core/metamodel/src/main/j...
Author: danhaywood
Date: Thu Mar 15 21:00:02 2012
New Revision: 1301195
URL: http://svn.apache.org/viewvc?rev=1301195&view=rev
Log:
ISIS-216: ObjectType facet now installed on all objectSpecs, and added in MetaModelValidator logic to check that are unique
Added:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/ObjectTypeFacet.java
- copied, changed from r1300908, incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacet.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java
- copied, changed from r1300360, incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/specloader/
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/specloader/progmodelfacets/
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/specloader/progmodelfacets/JpaProgrammingModelFacets.java (with props)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/specloader/validator/
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/specloader/validator/JpaMetaModelValidator.java (with props)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/util/
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/util/JpaIdPropertyFilter.java (with props)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/util/JpaPropertyUtils.java (with props)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/util/JpaVersionPropertyFilter.java (with props)
Removed:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/specloader/
Modified:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookup.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAbstract.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/ (props changed)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-applib/ (props changed)
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacetAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementCollectionAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaFetchTypeFacetDerivedFromJpaElementCollectionsAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/TypeOfFacetDerivedFromJpaElementCollectionAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/JpaDiscriminatorValueAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/ObjectTypeFacetInferredFromJpaDiscriminatorValueAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetImpl.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/JpaNamedQueriesFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/JpaNamedQueryAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/JpaNamedQueryFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/JpaNamedQueryFacetAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/JpaNamedQueryFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/NamedQuery.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/JpaBasicAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/JpaBasicFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/JpaBasicFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/JpaFetchTypeFacetDerivedFromJpaBasicAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/MandatoryFacetDerivedFromJpaBasicAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/OptionalFacetDerivedFromJpaBasicAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/JpaColumnAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/JpaColumnFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/JpaColumnFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJpaColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/OptionalFacetDerivedFromJpaColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/DisabledFacetDerivedFromJpaIdAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/JpaIdAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/JpaIdFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/JpaIdFacetAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/JpaIdFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/JpaIdFacetImpl.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/OptionalFacetDerivedFromJpaIdAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/JpaJoinColumnAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/JpaJoinColumnFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/JpaJoinColumnFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/MandatoryFacetDerivedFromJpaJoinColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/OptionalFacetDerivedFromJpaJoinColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/JpaFetchTypeFacetDerivedFromJpaManyToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/JpaManyToOneAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/JpaManyToOneFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/JpaManyToOneFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/MandatoryFacetDerivedFromJpaManyToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/OptionalFacetDerivedFromJpaManyToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/JpaFetchTypeFacetDerivedFromJpaOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/JpaOneToOneAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/JpaOneToOneFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/JpaOneToOneFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/MandatoryFacetDerivedFromJpaOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/OptionalFacetDerivedFromJpaOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/DerivedFacetDerivedFromJpaTransientAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/JpaTransientAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/JpaTransientFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/JpaTransientFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/DisabledFacetDerivedFromJpaVersionAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/JpaVersionAnnotationFacetFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/JpaVersionFacet.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/JpaVersionFacetAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/OptionalFacetDerivedFromJpaVersionAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/GivenJpaProgrammingModelWhenInitializedThenFacetsContentsTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/GivenJpaProgrammingModelWhenInitializingTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/GivenJpaElementCollectionAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/SimpleObjectWithElementCollection.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/GivenJpaDiscriminatorValueAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/GivenJpaEmbeddableAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/SimpleObjectWithEmbeddable.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/GivenJpaEntityAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenFeatureTypesTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasAnnotationsTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/GivenJpaNamedQueryAnnotationFacetFactoryWhenHasNoAnnotationsTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/SimpleObjectWithNamedQueries.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/SimpleObjectWithNamedQueriesAndNamedQuery.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/SimpleObjectWithNamedQuery.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/object/namedquery/SimpleObjectWithNoNamedQueries.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/GivenJpaBasicAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithBasicAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithBasicFetchTypeEager.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithBasicFetchTypeLazy.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithBasicOptionalFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithBasicOptionalTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/basic/SimpleObjectWithNoBasicAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithNoOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithOneToOneAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithOneToOneFetchEager.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithOneToOneFetchLazy.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithOneToOneOptionalFalse.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/onetoone/SimpleObjectWithOneToOneOptionalTrue.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/GivenJpaTransientAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/SimpleObjectWithNoTransientAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/transience/SimpleObjectWithTransientAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/GivenJpaVersionAnnotationFacetFactoryTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/SimpleObjectWithNoVersionAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/version/SimpleObjectWithVersionAnnotation.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/src/docbkx/ (props changed)
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java
Copied: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/ObjectTypeFacet.java (from r1300908, incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/ObjectTypeFacet.java?p2=incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/ObjectTypeFacet.java&p1=incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacet.java&r1=1300908&r2=1301195&rev=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacet.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objecttype/ObjectTypeFacet.java Thu Mar 15 21:00:02 2012
@@ -1,4 +1,4 @@
-package org.apache.isis.core.progmodel.facets.object.objecttype;
+package org.apache.isis.core.metamodel.facets.object.objecttype;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java Thu Mar 15 21:00:02 2012
@@ -63,6 +63,7 @@ public abstract class RuntimeContextAbst
getQuerySubmitter().injectInto(candidate);
getServicesProvider().injectInto(candidate);
getSpecificationLookup().injectInto(candidate);
+
}
@Override
@@ -92,6 +93,11 @@ public abstract class RuntimeContextAbst
public Collection<ObjectSpecification> allSpecifications() {
return specificationLoader.allSpecifications();
}
+
+ @Override
+ public ObjectSpecification lookupByObjectType(String objectType) {
+ return specificationLoader.lookupByObjectType(objectType);
+ }
});
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java Thu Mar 15 21:00:02 2012
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
public interface SpecificationLoader extends ApplicationScopedComponent, DebuggableWithTitle, SpecificationLookup {
@@ -67,4 +68,9 @@ public interface SpecificationLoader ext
*/
boolean loadSpecifications(List<Class<?>> typesToLoad);
+ /**
+ * Populated as a result of running {@link MetaModelValidator#validate() validation} after all specs have been loaded.
+ */
+ void validateSpecifications();
+
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookup.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookup.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookup.java Thu Mar 15 21:00:02 2012
@@ -29,4 +29,5 @@ public interface SpecificationLookup ext
*/
ObjectSpecification loadSpecification(Class<?> cls);
+ ObjectSpecification lookupByObjectType(String objectType);
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLookupDelegator.java Thu Mar 15 21:00:02 2012
@@ -43,4 +43,16 @@ public class SpecificationLookupDelegato
return specificationLookupDelegate.allSpecifications();
}
+ @Override
+ public ObjectSpecification lookupByObjectType(String objectType) {
+ return specificationLookupDelegate.lookupByObjectType(objectType);
+ }
+
+ @Override
+ public void injectInto(Object candidate) {
+ super.injectInto(candidate);
+ if(specificationLookupDelegate != null) {
+ specificationLookupDelegate.injectInto(candidate);
+ }
+ }
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Thu Mar 15 21:00:02 2012
@@ -23,13 +23,16 @@ import static org.apache.isis.core.commo
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.log4j.Logger;
@@ -47,6 +50,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacetUtils;
+import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectTypeFacet;
import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
@@ -66,14 +70,13 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
-import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCache;
-import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCacheDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.CreateObjectContext;
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.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
/**
@@ -172,7 +175,7 @@ public class ObjectReflectorDefault impl
/**
* Defaulted in the constructor.
*/
- private final SpecificationCache cache;
+ private final SpecificationCacheDefault cache = new SpecificationCacheDefault();
// /////////////////////////////////////////////////////////////
// Constructor
@@ -205,8 +208,6 @@ public class ObjectReflectorDefault impl
this.metaModelValidator = metaModelValidator;
this.facetProcessor = new FacetProcessor(configuration, collectionTypeRegistry, programmingModel);
-
- this.cache = new SpecificationCacheDefault();
}
@Override
@@ -300,7 +301,7 @@ public class ObjectReflectorDefault impl
}
// /////////////////////////////////////////////////////////////
- // install, load, allSpecifications
+ // install, load, allSpecifications, lookup
// /////////////////////////////////////////////////////////////
/**
@@ -339,7 +340,7 @@ public class ObjectReflectorDefault impl
Assert.assertNotNull(type);
final String typeName = type.getName();
- final SpecificationCache specificationCache = getCache();
+ final SpecificationCacheDefault specificationCache = getCache();
synchronized (specificationCache) {
final ObjectSpecification spec = specificationCache.get(typeName);
if (spec != null) {
@@ -446,6 +447,12 @@ public class ObjectReflectorDefault impl
return spec;
}
+ @Override
+ public ObjectSpecification lookupByObjectType(String objectType) {
+ return getCache().getByObjectType(objectType);
+ }
+
+
// ////////////////////////////////////////////////////////////////////
// injectInto
// ////////////////////////////////////////////////////////////////////
@@ -468,7 +475,6 @@ public class ObjectReflectorDefault impl
getClassSubstitutor().injectInto(candidate);
getCollectionTypeRegistry().injectInto(candidate);
-
}
// /////////////////////////////////////////////////////////////
@@ -520,7 +526,7 @@ public class ObjectReflectorDefault impl
return facetProcessor;
}
- private SpecificationCache getCache() {
+ private SpecificationCacheDefault getCache() {
return cache;
}
@@ -592,4 +598,25 @@ public class ObjectReflectorDefault impl
return facetDecoratorSet.getFacetDecorators();
}
+ @Override
+ public void validateSpecifications() {
+ final Map<String, ObjectSpecification> specByObjectType = Maps.newHashMap();
+ for (final ObjectSpecification objSpec : allSpecifications()) {
+ final ObjectTypeFacet facet = objSpec.getFacet(ObjectTypeFacet.class);
+ if (facet == null) {
+ continue;
+ }
+ final String objectTypeValue = facet.value();
+ final ObjectSpecification existingSpec = specByObjectType.put(objectTypeValue, objSpec);
+ if (existingSpec == null) {
+ continue;
+ }
+ throw new MetaModelInvalidException(MessageFormat.format("Cannot have two entities with same object type (@ObjectType facet or equivalent) Value; " + "both {0} and {1} are annotated with value of ''{2}''.", existingSpec.getFullIdentifier(), objSpec.getFullIdentifier(), objectTypeValue));
+ }
+
+ getCache().setCacheByObjectType(specByObjectType);
+ }
+
+
+
}
Copied: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java (from r1300360, incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java?p2=incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java&p1=incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java&r1=1300360&r2=1301195&rev=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java Thu Mar 15 21:00:02 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.specloader.speccache;
+package org.apache.isis.core.metamodel.specloader;
import java.util.Collection;
import java.util.Collections;
@@ -26,28 +26,42 @@ import java.util.Map;
import com.google.common.collect.Maps;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-public class SpecificationCacheDefault implements SpecificationCache {
+class SpecificationCacheDefault {
+
private final Map<String, ObjectSpecification> specByClassName = Maps.newHashMap();
+ private Map<String, ObjectSpecification> specByObjectType;
- @Override
public ObjectSpecification get(final String className) {
return specByClassName.get(className);
}
- @Override
public void cache(final String className, final ObjectSpecification spec) {
specByClassName.put(className, spec);
}
- @Override
public void clear() {
specByClassName.clear();
}
- @Override
public Collection<ObjectSpecification> allSpecifications() {
return Collections.unmodifiableCollection(specByClassName.values());
}
+ public ObjectSpecification getByObjectType(String objectType) {
+ if (specByObjectType == null) {
+ throw new IllegalStateException("SpecificationCache by object type has not yet been initialized");
+ }
+ return specByObjectType.get(objectType);
+ }
+
+ /**
+ * Populated as a result of running {@link MetaModelValidator#validate() validation} after all specs have been loaded.
+ */
+ void setCacheByObjectType(Map<String, ObjectSpecification> specByObjectType) {
+ this.specByObjectType = Maps.newHashMap();
+ this.specByObjectType.putAll(specByObjectType);
+ }
+
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java Thu Mar 15 21:00:02 2012
@@ -19,13 +19,14 @@
package org.apache.isis.core.metamodel.specloader.validator;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import com.google.common.collect.Lists;
+
public class MetaModelValidatorComposite extends MetaModelValidatorAbstract {
- private final List<MetaModelValidator> validators = new ArrayList<MetaModelValidator>();
+ private final List<MetaModelValidator> validators = Lists.newArrayList();
@Override
public void validate() throws MetaModelInvalidException {
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactory.java Thu Mar 15 21:00:02 2012
@@ -24,6 +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.objecttype.ObjectTypeFacet;
public class ObjectTypeAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAbstract.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeFacetAbstract.java Thu Mar 15 21:00:02 2012
@@ -3,6 +3,7 @@ package org.apache.isis.core.progmodel.f
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectTypeFacet;
public abstract class ObjectTypeFacetAbstract extends
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java Thu Mar 15 21:00:02 2012
@@ -28,6 +28,11 @@ public class MetaModelValidatorDefault e
*/
@Override
public void validate() {
+ validateSpecifications();
+ }
+
+ private void validateSpecifications() {
+ getSpecificationLoader().validateSpecifications();
}
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java Thu Mar 15 21:00:02 2012
@@ -28,7 +28,6 @@ import org.apache.isis.core.metamodel.ru
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.core.metamodel.specloader.speccache.SpecificationCache;
public class ProgrammableReflector implements ObjectReflector {
@@ -80,10 +79,6 @@ public class ProgrammableReflector imple
public void shutdown() {
}
- public void setCache(final SpecificationCache cache) {
- throw new NotYetImplementedException();
- }
-
@Override
public boolean loaded(final Class<?> cls) {
throw new NotYetImplementedException();
@@ -113,11 +108,6 @@ public class ProgrammableReflector imple
}
@Override
- public void setServiceClasses(final List<Class<?>> serviceClasses) {
- throw new NotYetImplementedException();
- }
-
- @Override
public boolean loadSpecifications(final List<Class<?>> typesToLoad, final Class<?> typeToIgnore) {
return false;
}
@@ -127,4 +117,19 @@ public class ProgrammableReflector imple
return false;
}
+ @Override
+ public ObjectSpecification lookupByObjectType(String objectType) {
+ return null;
+ }
+
+ @Override
+ public void setServiceClasses(final List<Class<?>> serviceClasses) {
+ throw new NotYetImplementedException();
+ }
+
+ @Override
+ public void validateSpecifications() {
+ throw new NotYetImplementedException();
+ }
+
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeAnnotationFacetFactoryTest.java Thu Mar 15 21:00:02 2012
@@ -29,6 +29,7 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectTypeFacet;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java Thu Mar 15 21:00:02 2012
@@ -30,6 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectTypeFacet;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 21:00:02 2012
@@ -0,0 +1,3 @@
+.settings
+target
+.project
Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-applib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 21:00:02 2012
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacet.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacet.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets;
import javax.persistence.FetchType;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacetAbstract.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacetAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/JpaFetchTypeFacetAbstract.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets;
import javax.persistence.FetchType;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementCollectionAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementCollectionAnnotationFacetFactory.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementCollectionAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementCollectionAnnotationFacetFactory.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.collection.elements;
import javax.persistence.ElementCollection;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacet.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacet.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.collection.elements;
import org.apache.isis.core.metamodel.facetapi.Facet;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacetAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacetAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaElementsCollectionFacetAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.collection.elements;
import org.apache.isis.core.metamodel.facetapi.Facet;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaFetchTypeFacetDerivedFromJpaElementCollectionsAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaFetchTypeFacetDerivedFromJpaElementCollectionsAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaFetchTypeFacetDerivedFromJpaElementCollectionsAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/JpaFetchTypeFacetDerivedFromJpaElementCollectionsAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.collection.elements;
import javax.persistence.FetchType;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/TypeOfFacetDerivedFromJpaElementCollectionAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/TypeOfFacetDerivedFromJpaElementCollectionAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/TypeOfFacetDerivedFromJpaElementCollectionAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/collection/elements/TypeOfFacetDerivedFromJpaElementCollectionAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.collection.elements;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/JpaDiscriminatorValueAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/JpaDiscriminatorValueAnnotationFacetFactory.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/JpaDiscriminatorValueAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/JpaDiscriminatorValueAnnotationFacetFactory.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.isis.extensions.jpa.metamodel.facets.object.discriminator;
import javax.persistence.DiscriminatorValue;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/ObjectTypeFacetInferredFromJpaDiscriminatorValueAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/ObjectTypeFacetInferredFromJpaDiscriminatorValueAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/ObjectTypeFacetInferredFromJpaDiscriminatorValueAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/discriminator/ObjectTypeFacetInferredFromJpaDiscriminatorValueAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.discriminator;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/AggregatedFacetDerivedFromJpaEmbeddableAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.embeddable;
import javax.persistence.Embeddable;
Modified: incubator/isis/trunk/framework/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/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableAnnotationFacetFactory.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.embeddable;
import javax.persistence.Embeddable;
Modified: incubator/isis/trunk/framework/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/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacet.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.embeddable;
import javax.persistence.Embeddable;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacetAnnotation.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacetAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/embeddable/JpaEmbeddableFacetAnnotation.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.embeddable;
import org.apache.isis.core.metamodel.facetapi.Facet;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityAnnotationFacetFactory.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityAnnotationFacetFactory.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.entity;
import javax.persistence.Entity;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacet.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacet.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.entity;
import javax.persistence.Entity;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAbstract.java?rev=1301195&r1=1301194&r2=1301195&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/main/java/org/apache/isis/extensions/jpa/metamodel/facets/object/entity/JpaEntityFacetAbstract.java Thu Mar 15 21:00:02 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.isis.extensions.jpa.metamodel.facets.object.entity;
import org.apache.isis.core.metamodel.facetapi.Facet;