Clone Tools
  • last updated 19 mins ago
Constraints: committers
Constraints: files
Constraints: dates
ISIS-2126 moving JDO specific facets 'metamodel' -> 'jdo-common'

  1. … 108 more files in changeset.
ISIS-2126 aligning most pkg names for module 'metamodel'

- o.a.i.core.metamodel.* -> o.a.i.metamodel.*

  1. … 3127 more files in changeset.
ISIS-2112: backporting from '2033-IoC_Spring' branch


  1. … 1097 more files in changeset.
ISIS-2033: moving jdo facets 'metamodel' -> 'jdo-common'


  1. … 101 more files in changeset.
ISIS-2033: re-apply non-breaking changes from previous commit


  1. … 16 more files in changeset.
Revert "ISIS-2033: intermediate breaking commit"

This reverts commit ded1cec9883aec14583a9709e408a1584ab2b53d.

  1. … 126 more files in changeset.
ISIS-2033: intermediate breaking commit


  1. … 126 more files in changeset.
ISIS-2094: fixes error message relating to @Column#allowsNull

  1. … 1 more file in changeset.
ISIS-2033: move menus that depend on config from applib to runtime

also do some automatic organize imports


  1. … 118 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. … 60 more files in changeset.
ISIS-2033: Major: MetaModel refactoring

removing instances of 'ServicesInjector' being passed around in


removing 'ServicesInjectorAware' interface


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

  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


    • -2
    • +1
    • -2
    • +1
  1. … 421 more files in changeset.
Merge remote-tracking branch 'origin/master' into v2

  1. … 141 more files in changeset.
adds FacetWithAttributes interface

makes existing facets implement

  1. … 158 more files in changeset.
  1. … 313 more files in changeset.
ISIS-1976: fixes compile/merge issue

    • -1
    • +1
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

    • -14
    • +15
    • -12
    • +10
    • -8
    • +12
    • -2
    • +3
  1. … 554 more files in changeset.
ISIS-1974, ISIS-1985 : Merge branch 'master' into v2

    • -1
    • +1
    • -1
    • +1
  1. … 32 more files in changeset.
    • -1
    • +1
    • -1
    • +1
  1. … 1 more file in changeset.
ISIS-1632: adds meta-annotation support for Jdo @Column and others

others being @Digits and @Nullable.

The @Column support was needed because otherwise the metamodel validator (MetaModelValidatorForConflictingOptionality) was throwing an incompatible nullability issue for SimpleObject#name (which is annotated using @Name that itself is annotated with @Column(allowsNull="false") ).

    • -2
    • +3
    • -10
    • +11
  1. … 4 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

    • -16
    • +16
    • -29
    • +29
  1. … 1396 more files in changeset.
ISIS-1841 major refactoring: splitting out dn support into plugins

    • -2
    • +2
  1. … 181 more files in changeset.
ISIS-1841 refactor check for enhanced classes into utility class

    • -3
    • +4
  1. … 3 more files in changeset.
ISIS-1465: adds missing headers

  1. … 16 more files in changeset.
ISIS-1789: metamodel validator for queries now is a no-op if the language is not "JDOQL"

    • -0
    • +44
ISIS-1632: converts facet factories to support meta annotations ... code now compiles

but haven't tried unit tests yet, let alone integ tests etc..


- removed support for boolean flags in annotations, replaced with enums. Need to review to ensure is complete.

  1. … 91 more files in changeset.
ISIS-1632 , ISIS-1763: converts some more facet factories to handle Lists of annotations (WORK IN PROGRESS, CODE STILL DOES NOT COMPILE)

    • -1
    • +1
  1. … 30 more files in changeset.
ISIS-1632: converts a number of facet factories to handle Lists of annotations (WORK IN PROGRESS, CODE STILL DOES NOT COMPILE)

  1. … 19 more files in changeset.
ISIS-1632: generalises Annotations utility to return a list of annotations rather than first matching. (INCOMPLETE, DOESN'T EVEN COMPILE)

The idea here is that the calling code can look for the first non-default value for whichever attribute of the annotation that they might be interested in.

    • -1
    • +1
    • -2
    • +6
  1. … 35 more files in changeset.