Clone Tools
  • last updated 13 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-1742 org.jmock.Expectations 'one' is deprecated

... replacing with 'oneOf'

  1. … 16 more files in changeset.
Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

# Conflicts:

# core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java

# core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java

# example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java

# example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

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

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

# example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java

# example/application/simpleapp/pom.xml

  1. … 20 more files in changeset.
ISIS-792: missing license headers for core.

  1. … 1 more file in changeset.
ISIS-569: adding missing resource

(signed.jar)

    • binary
    ./resources/signed.jar
ISIS-569: JavassistImposteriser

and remove dependency on (cglib-based) ClassImposteriser.

Also:

- update .travis.yml.

  1. … 26 more files in changeset.
ISIS-667,ISIS-684,ISIS-685: async commands, tidy-up

ISIS-684:

- rename BackgroundActionService to BackgroundCommandService

ISIS-667:

- memberIdentifier, targetClass, targetAction, targetStr consistent across PublishedEventJdo, AuditEntryJdo, CommandJdo

ISIS-685:

- @Command annotation extended, with persistence() and executeIn() attributes

- corresponding updates to CommandFacet

- Command#executor and Command#executedIn keep track of whether being run by user or background

- ActionInvocationFacetViaMethod new logic, short-circuits execution if executor = user but executedIn = background,

and return the command instead (if persistable)

- CommandService API extended to allow callers to request persistence of Command early

(as used by ActionInvocationFacetViaMethod)

  1. … 46 more files in changeset.
ISIS-619: extend IsisAction with method to instantiate classes

  1. … 1 more file in changeset.
ISIS-437: pre-release checks

* updating to latest (appropriate) versions of selected dependencies

* RAT check - adding missing license headers

* updated supplementalDataModels for missing licenses of dependencies

  1. … 7 more files in changeset.
ISIS-484: new contract test for inject service methods not overridable

  1. … 1 more file in changeset.
ISIS-462: enhance ValueTypeContractTestAbstract... ... for Comparable ... also updating commented out sections in example app

  1. … 6 more files in changeset.
ISIS-428: improving JUnitRuleMockery2

  1. … 1 more file in changeset.
ISIS-426: ComparableContractTest_compareTo

... to simplify the writing of tests of Comparable objects (domain objects or otherwise).

  1. … 2 more files in changeset.
ISIS-425: factored out AbstractApplyToAllContractTest.

  1. … 11 more files in changeset.
ISIS-423: utility to automatically test bidir relationships.

  1. … 13 more files in changeset.
ISIS-406: adding missing license headers

  1. … 64 more files in changeset.
ISIS-366: autowire JMock classundertest using setter injection

  1. … 7 more files in changeset.
ISIS-362: upgrading to JMock 2.6.0

* and adding in support for @Never, @Ignoring, @Allowing annotations etc.

(from github.com/danhaywood/java-testsupport).

* the size of the commit is because of an "organize import" throughout,

done with respect to our standard isis.importorder

(see http://isis.apache.org/contributors/development-environment.html)

  1. … 407 more files in changeset.
ISIS-188: renaming packages in line with groupId:artifactId

  1. … 1942 more files in changeset.
ISIS-188: moving framework/ subdirs up to parent

* also tidied up STATUS, and removed the incubator DISCLAIMER

  1. … 12552 more files in changeset.