Clone Tools
  • last updated 10 mins ago
Constraints: committers
Constraints: files
Constraints: dates
ISIS-2141 renaming /example/application -> /examples/apps

    • -875
    • +0
  1. … 789 more files in changeset.
ISIS-2001: moves action parameter validate facets to a different package

    • -2
    • +2
  1. … 10 more files in changeset.
ISIS-2033: starting a new branch for having spring boot take over

removing any modules that are in the way now; we can re-add them later


    • -875
    • +0
  1. … 452 more files in changeset.
ISIS-2050: fixes unit tests

    • -0
    • +7
  1. … 14 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# core/config/src/main/java/org/apache/isis/config/builder/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/

# core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/

# core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/

# core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/

# core/runtime/src/main/java/org/apache/isis/core/runtime/memento/

# core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/

# core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/

# example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/

    • -7
    • +0
  1. … 61 more files in changeset.
ISIS-2050: reworks order and depth of introspection.

Squashed from previous commits:

ISIS-2050: uses simpler overload that defaults IntrospectionState to TYPE_INTROSPECTED.

Also introduces overload for className as well as Class<?>

ISIS-2050: only contribute to entities and view models; improves MetaModel exporter

to also dump out the facets of any "discovered" domain types.

ISIS-2050: load specs only to TYPE (not MEMBERS) everywhere; only adds described as facet (derived from type) if is do-op.

ISIS-2050: fixes for unit tests and reorder introspection slightly in order to fix lockdown

ISIS-2050: adds ValueFacet for Joda LocalTime

Uses a very simple implementation, because I suspect that the other capabilities of ValueFacet simply aren't needed anymore...


- removes contributingDomainServiceTypes from AppManifest.Registry once more ... will just eagerly introspect type and members for all domain services

- fixes introspectUpTo algorithm

- skip type hierarchy traversal for domain services with natureOfService=DOMAIN

- improves/reduces logging

- lazily introspect up to type and members whenever any of the members (properties/collections/actions) are referenced of an ObjectSpecAbstract

ISIS-2050: introduces config property to enable/disable full introspection of metamodel

If disabled, then metamodel validation is skipped

ISIS-2050: moves introspectObjectSpecId() so called directly from constructor of ObjectSpec.

ISIS-2050: postProcessor now called by ObjectSpecAbstract after fully introspected, rather than by SpecificationLoader

ISIS-2050: passes PostProcessor into ObjectSpecificationAbstract's constructor

ISIS-2050: scales back the depth of introspection when introspecting members

- only need to introspect the type for parameters and return types.

ISIS-2050: removes SpecificationLoader#state; now responsibility of each ObjectSpecification to keep track of its own introspectionState.

ISIS-2050: eagerly introspects contributing specs, lazily introspecs the remainder.

ISIS-2050: updates AppManifest.Registry to also hold all contributingDomainServiceTypes

This is so that we can eagerly build the ObjectSpecs for these types and mixins, but leave everything else to be built lazily.

ISIS-2050: when traversing type hierarchy, now only introspect super types up to the TYPE, not their MEMBERs as well.

ISIS-2050: renames two of the IntrospectionStates

ISIS-2050: pulls upTo introspectionState into a parameter for all of SpecificationLoaders methods

... so that the caller can decide the level of introspection that needs to be performed.

ISIS-2050: extends IntrospectionState with additional states for type vs member introspection; inlining methods to simplify

... with the aim of exposing the IntrospectionState upTo so can pass through and honour the phases.

Removed the guards in introspectTypeHierarchy, don't think they are needed any more since only ever called from its caller which checks the introspectionState anyway

ISIS-2050: breaks out introspectTypeHierarchyAndMembers into two.

ISIS-2050: replaces IntrospectionStrategy with the concept of introspecting "up to" a certain state.

ISIS-2050: refactors responsibilities of SpecLoader vs ObjectSpec

just the management of introspectionState on ObjectSpec

ISIS-2050: introduces ObjectSpecIdFacetFactory

and additional process(ProcessObjectSpecIdContext) for FacetProcessor

    • -7
    • +0
  1. … 74 more files in changeset.
2039 redesign of config (#134)

* ISIS-2039: major refactoring

move config code into its own module

remove number of classes in metamodel, that hold a reference to

IsisConfiguration or its implementation

hide the mutable IsisConfigurationDefault


* ISIS-2039: reduce visibility of some config classes


* ISIS-2039: simplify config access


* ISIS-2039: cleaning up the component-provider mess

for web-modules: no longer negotiate by writing attributes to the

servlet-context, instead use a java class for that


* ISIS-2039: fixing some tests


* ISIS-2039: removing arguments of @PostConstruct methods


* ISIS-2039: lazy binding to config for wicket


* ISIS-2039: proposed test fix

also cleaning up verbose tests


* ISIS-2039: more test fixes


* ISIS-2039: experimenting with AppConfig managed by Guice


* ISIS-2039: solving the AppManifest lookup problem independently of the

configuration bootstrapping


* ISIS-2039: simplify helloworld


* ISIS-2039: moving type discovery to an earlier stage in bootstrapping

Integration Test Bootstrapping works.


* ISIS-2039: on web-context: move the config bootstrapping from wicket

module to the main ServletContextListener

such that the wicket module is no longer responsible for initiating the



* ISIS-2039: config bootstrapping: fixes the resource chain


* ISIS-2039: allow ServiceLoader lookup for AppConfig to fallback ...

to previous behavior, that is to lookup the AppManifest from config

property 'isis.appManifest'


* ISIS-2039: fixes concurrent modification with _Context

add a property 'isUnitTesting' to the IsisSystemEnvironment, to help

with the decision on how to bootstrap the configuration

also doing some cleaning up


* ISIS-2039: fixing junit tests ...

by having the IsisSystemEnvironment#isUnitTesting correctly setup by



* ISIS-2039: further fixing tests ...

also moving ExceptionRecognizer services that depend on the 'config'

module from 'applib' to 'runtime'


* ISIS-2039: fixing tests, that fail due to new domain object annot.



* ISIS-2039: unify config bootstrapping code for maven-plugin,

wicket-viewer and headless


* ISIS-2039: to fix prev. commit: let the maven-plugin bootstrap the

configuration properly


* ISIS-2039: fixing mm verification tests


* ISIS-2039: reinstating the ConfigurationServiceDefault

also renaming packages within the 'config' module -> 'o.a.i.config'


* ISIS-2039: removing the ConfigurationService interface

use the singleton IsisConfiguration instead

for the UI, the ConfigurationServiceMenu was renamed to

ConfigurationMenu which uses a ConfigurationViewService for the single

purpose of displaying config values


* ISIS-2039: reorg. packages


    • -32
    • +4
  1. … 425 more files in changeset.
ISIS-1991: removing debug code

simple-app: updating mml approved


    • -4
    • +4
  1. … 4 more files in changeset.
ISIS-1811: fixes lockdown for apps

    • -4
    • +32
  1. … 2 more files in changeset.
ISIS-1974: fixes regression with domain service layout handling

    • -3
    • +0
  1. … 5 more files in changeset.
ISIS-2003: fixes lockdown approvals for changes in metamodel

    • -264
    • +103
  1. … 6 more files in changeset.
ISIS-1974: fixes to ensure new algorithm generates same metamodel as previously.

More or less, that is.

The main change here is that some facet factories have been reimplemented in the SpecLoader PostProcessor, namely those that derive facets on object members based on the facets from the type of those members ... typical length, described as, immutable => disabled, param defaults.

- for now, the unused facets have been left in the codebase, commented out of ProgrammingModelFacetsJava5; the post-processor's name (ActionCollectionParameterDefaultsAndChoicesPostProcessor) is unchanged even though it now does much more than it used to

This results in some minor differences... ImmutableFacet is no longer always installed, for example, if DisabledFacet is present instead.

In addition to the PostProcessor changes:

- call post processing without requiring there to be an open session. Note that this requires a minor refactor in OneTo{One/Many}ActionParameterContributee - these take the servicePojo rather than the serviceAdapter

- refactor SpecificationCacheDefault, init() semantics are now cleaner

- it no longer takes a map (and the old init is now internalInit)

- SpecificationLoader#cacheBySpecId now removed - this is basically what is in the new version of init in SpecificationCacheDefault

- also search for @DomainServiceLayout, @DomainObjectLayout, @ViewModelLayout to find classes to introspect during bootstrapping

- don't introspect @Programmatic fixture scripts (unless they are explicitly discoverable by implementing DiscoverableFixtureScript)

- don't create any associations/actions for any domain services that have a nature of DOMAIN (unless they are also @HomePage domain service)

- don't create any associations/actions for fixture scripts

- OneTo{One/Many}AssociationContributee now implement getOnType (was throwing an NPE) & OneToManyAssociationMixedIn now implements getOnType (OTOAMI was already)

- these are to allow the implementatoin of the post-processor to look up the parent spec if the member is a mixin or contributee

- MetaModelExporter now includes a check that the objectSpecId -> ObjectSpecification is one-to-one.

- this is what precipitated the refactoring of SpecificationCacheDefault

- adds a guard in TypicalLengthFacetOnPropertyDerivedFromType, which was NPE'ing

- in the metamodel validator, as an ugly special case, allow ObjectSpecIdFacet to be derived from class name

- seems ok, since no longer have actoins on fixture scripts in the metamodel. Also, there are fixtures in the incode platform that fall foul of this check

- allow @Programmatic to be specified on fields

- annotate various fixture scripts as @Programmatic (so that they will be skipped completely from the metamodel)

- BuilderFixtureScript, TeardownFixtureScriptAbstract, PersonaEnumPersistAll, ClockFixture, TickingClockFixture

- fixed bug with MetaModelService6.Config class for getPackagePrefixes()


    • -36
    • +0
  1. … 37 more files in changeset.
ISIS-2003: uses folders instead of filenames for received vs approved

    • -0
    • +1075
  1. … 30 more files in changeset.