Clone Tools
  • last updated 22 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "ISIS-2033: introduces ManagedObjectState"

This reverts commit 525a92c0bfec2099ddce33d0526d62cf5b0474fd.

  1. … 24 more files in changeset.
ISIS-2033: introduces ManagedObjectState

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 24 more files in changeset.
  1. … 8 more files in changeset.
ISIS-2033: fixing ambiguous service-ids derived feom cdi managed beans

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 7 more files in changeset.
Merge branch 'v2' into 2033-IoC

Conflicts:

core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

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

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

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

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

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java

core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/pom.xml

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

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

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

  1. … 38 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# 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/EntityIconAndTitlePanel.java

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

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

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

  1. … 61 more files in changeset.
ISIS-2033: Major: MetaModel refactoring

removing instances of 'ServicesInjector' being passed around in

constructors

removing 'ServicesInjectorAware' interface

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 467 more files in changeset.
ISIS-2033: Major (interim): thrown away Installers and Guice

prepare for full provisioning utilizing CDI

this commit breaks provisioning and SudoService

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 179 more files in changeset.
ISIS-2040: module 'security': rename and align packages

Task-Url: https://issues.apache.org/jira/browse/ISIS-2040

    • -1
    • +1
    ./runtime/system/persistence/Utils.java
  1. … 214 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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: reduce visibility of some config classes

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: simplify config access

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* 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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: fixing some tests

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: removing arguments of @PostConstruct methods

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: lazy binding to config for wicket

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: proposed test fix

also cleaning up verbose tests

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: more test fixes

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: experimenting with AppConfig managed by Guice

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

configuration bootstrapping

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: simplify helloworld

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

Integration Test Bootstrapping works.

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* 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

framework

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

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

property 'isis.appManifest'

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* 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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: fixing junit tests ...

by having the IsisSystemEnvironment#isUnitTesting correctly setup by

JunitRuleMocker2

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: further fixing tests ...

also moving ExceptionRecognizer services that depend on the 'config'

module from 'applib' to 'runtime'

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

processing

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

wicket-viewer and headless

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

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

configuration properly

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: fixing mm verification tests

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: reinstating the ConfigurationServiceDefault

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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* 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

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

* ISIS-2039: reorg. packages

Task-Url: https://issues.apache.org/jira/browse/ISIS-2039

  1. … 424 more files in changeset.
ISIS-2031: add 'took seconds' label to bottom of tables

... when in prototyping mode

Task-Url: https://issues.apache.org/jira/browse/ISIS-2031

  1. … 8 more files in changeset.
ISIS-2007: uses Objects.requireNonNull(Object, Supplier<String>) in all cases... actually just 3

  1. … 2 more files in changeset.
ISIS-1976: polishing ServiceInjector and ServiceRegistry API

let ServiceInjector implement ServiceRegistry

service lookup result is now an Optional instead of a nullable Object

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 87 more files in changeset.
ISIS-1976: remove guava from DN-4/5 plugins

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 9 more files in changeset.
ISIS-1976: rework CollectionFacet API such that methods invoked on non-scalar types preserves their generic type nature

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 28 more files in changeset.
ISIS-1976: introduces ManagedObject to replace OA within most of metamodel

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 141 more files in changeset.
ISIS-1976: fixes 'Command' having field 'uniqueId' not initialized

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 3 more files in changeset.
ISIS-1976: cleanup 'Command' API

make it obvious which calls are non public API by gathering them in its

own 'Internal' interface

rename HasTransactionId -> HasUniqueId to better reflect its general

usage

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 36 more files in changeset.
ISIS-1976: polishing 'Version' and 'ObjectSpecId'

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

    • -3
    • +6
    ./runtime/system/persistence/Utils.java
  1. … 16 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

    • -555
    • +98
    ./runtime/system/persistence/PersistenceSession4.java
  1. … 557 more files in changeset.
ISIS-1974: needs to initialize DN eagerly, alongside SpecLoader doing its thing

  1. … 3 more files in changeset.
ISIS-1974, ISIS-1985 : Merge branch 'master' into v2

  1. … 34 more files in changeset.
ISIS-1976: lazy initialize OAs for services

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 9 more files in changeset.
ISIS-1976: prepare removal of OA's replacePojo

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 2 more files in changeset.
  1. … 8 more files in changeset.
ISIS-1974: port latest changes (2.0.0-M2) PersistenceSessionFactory5 to PersistenceSessionFactory4

Task-Url: https://issues.apache.org/jira/browse/ISIS-1974

  1. … 1 more file in changeset.
  1. … 10 more files in changeset.
ISIS-1976: moving responsibilities from PersistenceSession to ObjectAdapterProvider

introduces ObjectAdapterProvider.Delegating

removes AdapterManager

ports changes from DN5-plugin to DN-4 plugin

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

    • -532
    • +37
    ./runtime/system/persistence/PersistenceSession4.java
    • -0
    • +213
    ./runtime/system/persistence/PersistenceSession4_Decouple.java
  1. … 55 more files in changeset.
  1. … 42 more files in changeset.
ISIS-1976: decouple metamodel's facets from AdapterManager

introduces ObjectAdapterProvider

Task-Url: https://issues.apache.org/jira/browse/ISIS-1976

  1. … 80 more files in changeset.