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

This reverts commit 525a92c0bfec2099ddce33d0526d62cf5b0474fd.

    • -2
    • +10
    ./mementos/ObjectAdapterMemento.java
  1. … 22 more files in changeset.
ISIS-2033: introduces ManagedObjectState

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

    • -10
    • +2
    ./mementos/ObjectAdapterMemento.java
  1. … 22 more files in changeset.
ISIS-2033: cleanup, ObjectAdapterMemento's ConcurrencyChecking removed

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

  1. … 9 more files in changeset.
    • -78
    • +67
    ./mementos/ObjectAdapterMemento_Legacy.java
  1. … 4 more files in changeset.
ISIS-2033: properly integrates ObjectAdapterMemento with contexts

this fixes simple-app: both JDO and Spring/JPA demo menus work

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

    • -13
    • +16
    ./mementos/ObjectAdapterMemento.java
    • -102
    • +84
    ./mementos/ObjectAdapterMemento_Legacy.java
  1. … 3 more files in changeset.
ISIS-2033: adds ContextManager for Values

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

    • -4
    • +30
    ./mementos/ObjectAdapterMemento.java
    • -24
    • +3
    ./mementos/ObjectAdapterMemento_Legacy.java
    • -3
    • +3
    ./models/HintPageParameterSerializer.java
  1. … 10 more files in changeset.
ISIS-2033: makes ObjectAdapterMemento an Interface

also implements CDIContextManager

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

    • -637
    • +53
    ./mementos/ObjectAdapterMemento.java
    • -0
    • +645
    ./mementos/ObjectAdapterMemento_Legacy.java
    • -1
    • +1
    ./models/ScalarModelWithMultiPending.java
  1. … 18 more files in changeset.
    • -13
    • +7
    ./mementos/ObjectAdapterMemento.java
  1. … 1 more file in changeset.
ISIS-2033: lets UniversalOid no longer inherit from RootOid

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

    • -23
    • +32
    ./mementos/ObjectAdapterMemento.java
  1. … 23 more files in changeset.
ISIS-2033: implementing authority lookup in ContextManager

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

    • -595
    • +615
    ./mementos/ObjectAdapterMemento.java
  1. … 13 more files in changeset.
ISIS-2033: major refactoring: IsisSession/UniversalObjectManager

Working towards IsisSession/UniversalObjectManager being the

generalization of the current Persistence stack.

ConverterForObjectAdapter depicts the new API.

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

    • -29
    • +12
    ./models/EntityCollectionModel.java
  1. … 22 more files in changeset.
ISIS-2033: moves some responsibility from IsisSessionFactory to IsisSession

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

  1. … 12 more files in changeset.
ISIS-2033: fixes standalone collection in wicket-viewer

when entities are provided by spring-data context

(breaks when entities are provided by jdo)

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

    • -22
    • +43
    ./models/EntityCollectionModel.java
  1. … 6 more files in changeset.
ISIS-2033: refining PersistenceSession

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

    • -7
    • +10
    ./models/EntityCollectionModel.java
  1. … 7 more files in changeset.
ISIS-2033: renaming PersistenceSession.getService(s)Injector

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

    • -9
    • +11
    ./models/EntityCollectionModel.java
  1. … 11 more files in changeset.
  1. … 2 more files in changeset.
ISIS-2033: introduces a new Oid 'UniversalOid'

to access/reference Beans and Entities managed ba external IoC

containers or PersistenceContexts

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

    • -4
    • +18
    ./mementos/ObjectAdapterMemento.java
  1. … 36 more files in changeset.
ISIS-1989: fixes tooltips for disabled action button

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v2' into 2033-IoC

Conflicts:

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

core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_validateServices.java

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

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

  1. … 11 more files in changeset.
ISIS-2078: correctly honours promptStyle for menu items (service actions), and adds a new config property for the default dialogMode if set to DIALOG.

...so that entities can use sidebar by default, but services/menus can use modal dialog, say.

  1. … 8 more files in changeset.
    • -1
    • +1
    ./models/HintPageParameterSerializer.java
  1. … 44 more files in changeset.
ISIS-2077: extends @ActionLayout to allow modal vs sidebar promptStyle to be selected on an action-by-action basis

(Rather than only globally selected via a configuration property)

  1. … 8 more files in changeset.
ISIS-2078: extends @ActionLayout to allow modal vs sidebar promptStyle to be selected on an action-by-action basis

(Rather than only globally selected via a configuration property)

  1. … 8 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.
ISIS-2066: minor: code simplification

ISIS-2070: renames 'whereAmI' config properties, with 'isis.viewer.wicket.' prefix

  1. … 2 more files in changeset.
ISIS-2066: fixes NPE occurring when invoke an action that returns null

fix as per the idiom described here: https://stackoverflow.com/a/32476601/56880

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. … 468 more files in changeset.
ISIS-2033: remove AppManifestProvider interface and do some cleanup

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

  1. … 24 more files in changeset.