Clone Tools
  • last updated 21 mins ago
Constraints: committers
Constraints: files
Constraints: dates
ISIS-1899: adds missing license headers

  1. … 7 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/

  1. … 57 more files in changeset.
ISIS-2050: extended ConfigProperty and also ModuleOrBuilderAbstract so can configure latter from former

  1. … 1 more file in changeset.
ISIS-2050: changes fullIntrospection boolean property into an enum property: LAZY vs LAZY_UNLESS_PRODUCTION vs FULL

Set the default to 'LAZY_UNLESS_PRODUCTION'

  1. … 1 more file in changeset.
ISIS-2050: adds new subtypes of ConfigProperty

    • -0
    • +10
    • -0
    • +10
ISIS-2050: only contribute associations to entities and view models.

Same logic as contributing actions.

  1. … 1 more file 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

    • -0
    • +11
    • -0
    • +10
  1. … 71 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


  1. … 420 more files in changeset.
  1. … 39 more files in changeset.
ISIS-1976: removes OA map, stream for metamodel, excising guava

Key achievements:

Metamodel: almost all guava Function and Predicate idioms removed

Metamodel: slight API improvements, such that some of the internal meta-data that is kept in Java

Collections is no longer copied into immutable lists for any calling client, instead Java Streams are returned (which treat the underlying collections un-modifiable by design)

the ObjectAdapter per-session map/cache is history

the legacy modules have been removed, for convenince and ease of migration the legacy/transition-1-2- module remains and shall provide legacy glue code

shiro was moved to plugins, and its artifact renamed, to be inline with the other plugins

  1. … 558 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

  1. … 1408 more files in changeset.
ISIS-1841 comments: further remove visual clutter

  1. … 80 more files in changeset.
ISIS-1841 comments: reduce visual clutter

replace 'region .. endregion' comment markers with just headers

  1. … 122 more files in changeset.
ISIS-1858: converts logging calls to use slf4j placeholders rather than string concatenation.

Removes some isDebugEnabled and isInfoEnabled guards where no longer really necessary.

  1. … 59 more files in changeset.
ISIS-1800: also blanks out apiKey and authToken when reporting configuration properties

  1. … 3 more files in changeset.
ISIS-1742: deletes commented out code, .ucd file, fixes javadoc references

  1. … 2 more files in changeset.
ISIS-1543: obfuscate passwords if logged

  1. … 1 more file in changeset.
ISIS-1459: deprecates IsisConfigurationForJdoIntegTests, replaces with AppManifest.Util helper class

  1. … 3 more files in changeset.
ISIS-1429: removes unused code (constant in ConfigurationConstants).

ISIS-1291: adds @Programmatic where necessary for new and internal domain services

... so that this stuff isn't unnecessarily loaded into themetamodel.

In a similar vein, aAlso change IsisConfiguration so that it doesn't implement Iterable, because otherwise the default interface methods (spliterator, forEach) show up in the metamodel. Instead, extend to provide an "asIterable()" method.

  1. … 8 more files in changeset.
ISIS-1422: refactoring (no functional change) - completely eliminated ValueSemanticsProviderContext, just use ServicesInjector throughout, and don't pass IsisConfiguration to VSP either, since derivable from ServicesInjector.


- made ConfigurationServiceInternal extend from IsisConfiguration (IsisConfigurationDefault is the only impl anyway)

- removed unnecessary casts to IsisConfiguration

- removed components passed into AutoCompleteFacetAbstract, since all derivable from ServicesInjector.

  1. … 185 more files in changeset.
ISIS-1420: support file

  1. … 9 more files in changeset.
ISIS-1291: moved ConfigurationServiceInternal.

also debated whether to move SpecificationLoader and ServicesInjector back to orig location, decided not to.

  1. … 22 more files in changeset.
ISIS-1407: removed SpecificationLoaderAware.


- minor extension to ServiceRegistry2

- collapsed ServicesInjector, ServicesInjectorSpi and ServicesInjectorDefault to just ServicesInjector.

  1. … 271 more files in changeset.
ISIS-1406: simpleapp integ tests also now running

  1. … 2 more files in changeset.
ISIS-1406: lots more refactoring around IsisConfiguration and IsisConfigurationBuilder.


- simplified IsisConfigurationBuilder, now a single class (rather than an interface with 4 different impls, only 2 of which were used).

- removed IsisRunner, so that the command line options are now a responsibility of the IsisConfigurationBuilder

- IsisConfigurationBuilder is passed from o.a.i.WebServer to IsisWicketApplication (not just the "primers"

- removed OptionValidator, wasn't being used

- FacetFactoryAbstract responsible for providing IsisConfiguration to all subclass impls

- InstallerLookup simplified, no longer responsible for appending to the IsisConfigurationBuilder

- InstallerAbstract impls now all have the IsisConfiguration injected into them (constructor injection).

- removed duplication between IsisWebAppBootstrapper and IsisWicketApplication

As of this commit the app runs, but the fixtures are not being automatically installed.

    • -25
    • +0
    • -76
    • +0
    • -57
    • +0
    • -26
    • +0
    • -289
    • +0
  1. … 94 more files in changeset.
ISIS-1406: refactoring IsisConfigurationBuilder and IsisConfiguration (WIP)

    • -4
    • +35
  1. … 10 more files in changeset.
ISIS-1405: removing IsisConfigurationAware.

  1. … 88 more files in changeset.
ISIS-1402: removing Debuggable interface and implementations, and supporting unused debug methods.

  1. … 41 more files in changeset.
ISIS-1194: fixing backward compatibility issues.

  1. … 9 more files in changeset.