Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into ide

# Conflicts:

# core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java

# core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java

# core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java

# core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java

# core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java

  1. … 6 more files in changeset.
ISIS-2158: refactors one-shot idiom into a 'commons' utility

  1. … 1 more file in changeset.
ISIS-2259: fixes package for isis-core-commons

  1. … 1019 more files in changeset.
ISIS-2226: minor cleaning up

  1. … 6 more files in changeset.
ISIS-2158: deals with some java language deprecations

  1. … 39 more files in changeset.
ISIS-2158: major(!) ... remove static reference to MetaModelContext

  1. … 485 more files in changeset.
ISIS-2158: non-invasive preparations for ISIS-1998

adding tests first (test driven development) before actually modifying

the programming model ...

1. facet processing tests

2. smoketests to test whether the generated meta-model is as expected

  1. … 24 more files in changeset.
ISIS-2158: converting some method annotation processing to new API

- more to come, all test migrated

  1. … 7 more files in changeset.
ISIS-2158: convert MixinInterceptor to use new _Annotations API

  1. … 2 more files in changeset.
ISIS-2158: attempt to simplify some of the spec-loading code

  1. … 8 more files in changeset.
ISIS-2158: fixes several bugs introduced with previous commit

  1. … 5 more files in changeset.
ISIS-2158: internal API: add shortcuts for trimmed string splitting

- also resurrecting smoketest 'SpringServiceProvisioningTest'

  1. … 7 more files in changeset.
ISIS-2158 re-enables simple-app's demo FixtureScript

- which allows to create 10 SimpleObjects from the prototyping menu

however, I think the 'fixture support extension' needs some serious

overhaul ... I'm still puzzled by these many layers of abstraction

  1. … 6 more files in changeset.
ISIS-2156 bump shiro version 1.3.2 -> 1.4.1

- despite the unresolved shiro issue [1], however the mentioned

workaround appears to work:

filterChainResolver =

org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver

[1] https://issues.apache.org/jira/browse/SHIRO-610

  1. … 6 more files in changeset.
batch update source format:

- Add missing '@Override' annotations

- Correct indentation

- Add file header (JAutodoc)

  1. … 1055 more files in changeset.
batch update source format: organize imports and reorder

0=java

1=javax

2=com

3=org

4=org.apache.isis

5=org.isisaddons

6=org.incode

7=#

  1. … 793 more files in changeset.
ISIS-2125 batch-update license headers for *.java files

  1. … 331 more files in changeset.
ISIS-2094 java-doc: consolidates all @since 2.** entries -> @since 2.0

  1. … 144 more files in changeset.
ISIS-2125: refining some internal and public API

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

  1. … 7 more files in changeset.
ISIS-2112: backporting changes from IoC_spring branch

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

    • -0
    • +48
    ./_Strings_FastSplit.java
  1. … 13 more files in changeset.
ISIS-2033: re-apply non-breaking changes from previous commit

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

  1. … 16 more files in changeset.
ISIS-2033: Internal API: introduces _Either

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

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

    • -0
    • +48
    ./_Strings_FastSplit.java
  1. … 38 more files in changeset.
  1. … 4 more files in changeset.
ISIS-2033: thread-safety for MetaModelContext

also let MetaModelContext cache its getters

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

  1. … 16 more files in changeset.
ISIS-2033: All MetaModel tests fixed.

However there is a lot of cleaning-up left to do.

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

  1. … 67 more files in changeset.
ISIS-2040: replace JndiLdapRealm (Shiro) with DefaultLdapRealm

also make core plugin 'security-shiro' optional

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

  1. … 4 more files in changeset.
ISIS-2040: module 'security': API changes: use streams instead of lists

improvements

- no need to wrap list of roles with unmodifiable

- for roles use HashSets instead of Lists

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

  1. … 18 more files in changeset.
ISIS-2040: remove deprecated LogonFixture

also introduces _Blackhole (internal API)

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

  1. … 11 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. … 425 more files in changeset.