incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053925 [1/6] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternativ...
Date Thu, 30 Dec 2010 16:13:22 GMT
Author: danhaywood
Date: Thu Dec 30 16:13:13 2010
New Revision: 1053925

URL: http://svn.apache.org/viewvc?rev=1053925&view=rev
Log:
more on removing metamodel cyclic dependencies (ISIS-64)

Added:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethod.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethodParameter.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/IdentifierUtils.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/MethodFinderUtils.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/MethodFinderUtils.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/DisablingInteractionAdvisor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionAdvisorFacet.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions2/InteractionAdvisorFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ProposedHolder.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/UsabilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/VisibilityContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/DomainModelException.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/feature/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCache.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheStatic.java
      - copied, changed from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/StaticSpecificationCache.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/CreateObjectContext.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/CreateObjectContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/FacetedMethodsBuilder.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilderContext.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/FacetedMethodsBuilderContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionContext.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/IntrospectionContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionParameterAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionParameterParseable.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/ObjectAssociationAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/ObjectMemberAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/ObjectSpecificationDefault.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/CollectionFacetForObjectList.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/DescribedAsFacetForObjectList.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/DescribedAsFacetForObjectList.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/NamedFacetForObjectList.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/NamedFacetForObjectList.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/ObjectSpecificationForObjectList.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/PluralFacetForObjectList.java
      - copied, changed from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/PluralFacetForObjectList.java
Removed:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ModelException.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/adaptermap/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/consent/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/interactions/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions2/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/java5/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/dflt/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/dflt/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/objectlist/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/CreateObjectContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/FacetedMethodsBuilder.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/FacetedMethodsBuilderContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/IntrospectionContext.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionParameterAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectActionParameterParseable.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/ObjectSpecificationAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToManyAssociationImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneActionParameterImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/OneToOneAssociationImpl.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/dflt/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/spec/objectlist/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/
Modified:
    incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
    incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java
    incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
    incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java
    incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java
    incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArranger.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberIdentifierComparator.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/ordermethod/SimpleOrderSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectActionSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectInstantiator.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationLoader.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToManyAssociation.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/OneToOneAssociation.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstractTest.java
    incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/FallbackFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/choices/ActionChoicesFacetViaMethod.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/validate/ActionValidationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/validate/ActionValidationFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/CollectionFieldMethodsFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisableForContextFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisableForContextFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisableForSessionFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisableForSessionFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisabledFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/disable/DisabledFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HiddenFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HideForContextFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HideForContextFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HideForSessionFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/hide/HideForSessionFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetImpl.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetNull.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParser.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetImpl.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/derived/DerivedFacetInferred.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedFacetAnnotation.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateDefaultFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetDefault.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryDefaultFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacetUnlimited.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ProgrammableReflector.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/actions/ActionMethodsFacetFactoryTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacet.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/bytecode/ObjectResolveAndObjectChangedEnhancerAbstract.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java
    incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/AssertsValidity.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/AbstractField.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CheckboxField.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ClearValueOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CopyValueOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/EmptyField.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/PasteValueOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/RevertFieldOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/PerspectiveContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeDisplayRules.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Content.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ObjectContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserAction.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/View.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/AbstractObjectOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionHelper.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/CollectionActionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ImmediateObjectOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectActionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameter.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToManyAssociationOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/ClearOneToOneAssociationOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneField.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OptionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/UserActionSetImpl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/ExceptionMessageContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/message/TextMessageContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/DisposeObjectOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/IconizeViewOption.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/UserActionAbstract.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/window/ResizeWindowControl.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/ApplicationOptions.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/MinimizedView.java
    incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java
    incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java
    incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/content/TextParseableField_ParseTextEntry.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java
    incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
    incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
    incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
    incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java

Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Thu Dec 30 16:13:13 2010
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils.ImperativeFacetFlags;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.specloader.internal.spec.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.core.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;

Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java Thu Dec 30 16:13:13 2010
@@ -25,9 +25,9 @@ package org.apache.isis.alternatives.obj
 
 import org.apache.isis.alternatives.objectstore.sql.FieldMappingLookup;
 import org.apache.isis.alternatives.objectstore.sql.ObjectMappingLookup;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.specloader.internal.spec.OneToManyAssociationImpl;
+import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationImpl;
 
 /**
  * Used to map 1-to-many collections by creating, in the child table, 1 column per parent collection.

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Thu Dec 30 16:13:13 2010
@@ -39,16 +39,16 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.util.AdapterUtils;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.consent2.InteractionResult;
-import org.apache.isis.core.metamodel.interactions2.ObjectTitleContext;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 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.internal.spec.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.progmodel.wrapper.applib.HiddenException;
 import org.apache.isis.progmodel.wrapper.applib.InteractionException;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java Thu Dec 30 16:13:13 2010
@@ -85,10 +85,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetedmethod.IdentifierUtils;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.peer.IdentifierUtils;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -97,7 +97,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 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.internal.spec.ObjectActionImpl;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java Thu Dec 30 16:13:13 2010
@@ -44,7 +44,7 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;

Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java Thu Dec 30 16:13:13 2010
@@ -43,7 +43,7 @@ import org.apache.isis.core.commons.ensu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.peer.IdentifierUtils;
+import org.apache.isis.core.metamodel.facetedmethod.IdentifierUtils;
 import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java Thu Dec 30 16:13:13 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import org.apache.isis.core.metamodel.interactions2.ProposedHolder;
+import org.apache.isis.core.metamodel.interactions.ProposedHolder;
 import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.Specification;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java Thu Dec 30 16:13:13 2010
@@ -28,8 +28,8 @@ import java.util.Map;
 import org.apache.isis.applib.ApplicationException;
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 import org.apache.isis.core.commons.lang.WrapperUtils;
-import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.peer.MethodFinderUtils;
+import org.apache.isis.core.metamodel.exceptions.MetaModelException;
+import org.apache.isis.core.metamodel.facetedmethod.MethodFinderUtils;
 
 /**
  * TODO: remove duplication with {@link WrapperUtils} and {@link MethodFinderUtils}.
@@ -60,7 +60,7 @@ public class InvokeUtils {
             invocationException("Exception executing " + method, e);
             return null;
         } catch (final IllegalAccessException e) {
-            throw new ReflectionException("illegal access of " + method, e);
+            throw new MetaModelException("illegal access of " + method, e);
         }
     }
 
@@ -90,7 +90,7 @@ public class InvokeUtils {
         if (targetException instanceof RuntimeException) {
             throw (RuntimeException) targetException;
         } else {
-            throw new ReflectionException(targetException);
+            throw new MetaModelException(targetException);
         }
     }
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import static org.apache.isis.core.commons.matchers.IsisMatchers.nonEmptyStringOrNull;
 import static org.hamcrest.CoreMatchers.is;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java Thu Dec 30 16:13:13 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
 
 /**
  * Powertype for the {@link InteractionContext} hierarchy.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java Thu Dec 30 16:13:13 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
-import org.apache.isis.core.metamodel.interactions2.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
 
 /**
  * Whether an {@link InteractionContext} was invoked by the user, or is programmatic.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent2;
+package org.apache.isis.core.metamodel.consent;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.apache.isis.core.commons.matchers.IsisMatchers.nonEmptyString;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/ReflectionException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/exceptions/MetaModelException.java Thu Dec 30 16:13:13 2010
@@ -23,22 +23,22 @@ package org.apache.isis.core.metamodel.e
 import org.apache.isis.core.commons.exceptions.IsisException;
 
 
-public class ReflectionException extends IsisException {
+public class MetaModelException extends IsisException {
     private static final long serialVersionUID = 1L;
 
-    public ReflectionException() {
+    public MetaModelException() {
         super();
     }
 
-    public ReflectionException(final String message) {
+    public MetaModelException(final String message) {
         super(message);
     }
 
-    public ReflectionException(final Throwable cause) {
+    public MetaModelException(final Throwable cause) {
         super(cause);
     }
 
-    public ReflectionException(final String message, final Throwable cause) {
+    public MetaModelException(final String message, final Throwable cause) {
         super(message, cause);
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Thu Dec 30 16:13:13 2010
@@ -31,7 +31,7 @@ import java.util.Set;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.exceptions.MetaModelException;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -157,7 +157,7 @@ public class FacetDecoratorSet implement
 			Facet decoratingFacet, Class<? extends Facet> facetType,
 			FacetHolder originalFacetHolder) {
 		if (decoratingFacet.facetType() != facetType) {
-			throw new ReflectionException(
+			throw new MetaModelException(
 					MessageFormat
 							.format(
 									"Problem with facet decorator '{0}'; inconsistent decorating facetType() for {1}; was {2} but expectected facetType() of {3}",
@@ -169,7 +169,7 @@ public class FacetDecoratorSet implement
 		Facet facetForFacetType = originalFacetHolder.getFacet(decoratingFacet
 				.facetType());
 		if (facetForFacetType != decoratingFacet) {
-			throw new ReflectionException(
+			throw new MetaModelException(
 					MessageFormat
 							.format(
 									"Problem with facet decorator '{0}'; has not replaced original facet for facetType() of {1}",

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethod.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethod.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethod.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethod.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.peer;
+package org.apache.isis.core.metamodel.facetedmethod;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethodParameter.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethodParameter.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethodParameter.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/FacetedMethodParameter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/FacetedMethodParameter.java Thu Dec 30 16:13:13 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.peer;
+package org.apache.isis.core.metamodel.facetedmethod;
 
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.TypedHolderDefault;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/IdentifierUtils.java (from r1053850, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/IdentifierUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/IdentifierUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java&r1=1053850&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/IdentifierUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/IdentifierUtils.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.peer;
+package org.apache.isis.core.metamodel.facetedmethod;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/MethodFinderUtils.java (from r1053871, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/MethodFinderUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/MethodFinderUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/MethodFinderUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/MethodFinderUtils.java&r1=1053871&r2=1053925&rev=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/peer/MethodFinderUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetedmethod/MethodFinderUtils.java Thu Dec 30 16:13:13 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.peer;
+package org.apache.isis.core.metamodel.facetedmethod;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java Thu Dec 30 16:13:13 2010
@@ -23,7 +23,7 @@ package org.apache.isis.core.metamodel.f
 import java.util.List;
 
 import org.apache.isis.core.metamodel.facetapi.FacetFactory;
-import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
+import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/hide/HiddenFacet.java Thu Dec 30 16:13:13 2010
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.f
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
-import org.apache.isis.core.metamodel.interactions2.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 
 /**
  * Hide a property, collection or action.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacet.java?rev=1053925&r1=1053924&r2=1053925&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacet.java Thu Dec 30 16:13:13 2010
@@ -20,8 +20,8 @@
 package org.apache.isis.core.metamodel.facets.object.bounded;
 
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
-import org.apache.isis.core.metamodel.interactions2.DisablingInteractionAdvisor;
-import org.apache.isis.core.metamodel.interactions2.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 /**
  * Whether the number of instances of this class is bounded.



Mime
View raw message