Clone Tools
  • last updated 19 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added back some changes removed by mistake during last merge.

  1. … 2 more files in changeset.
Merge branch 'DN_404'

Resolved Conflicts. All tests passing.

Conflicts:

core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java

core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java

example/application/neoapp/dom/pom.xml

example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java

example/application/neoapp/fixture/.gitignore

example/application/neoapp/fixture/pom.xml

example/application/neoapp/integtests/pom.xml

example/application/neoapp/pom.xml

example/application/neoapp/webapp/.gitignore

example/application/neoapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch

example/application/neoapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch

example/application/neoapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch

example/application/neoapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch

example/application/neoapp/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml

example/application/neoapp/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml

example/application/neoapp/webapp/pom.xml

example/application/neoapp/webapp/src/main/java/webapp/SimpleApplication.java

example/application/neoapp/webapp/src/main/webapp/WEB-INF/isis.properties

example/application/neoapp/webapp/src/main/webapp/WEB-INF/logging.properties

example/application/neoapp/webapp/src/main/webapp/WEB-INF/persistor.properties

example/application/neoapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties

example/application/neoapp/webapp/src/main/webapp/about/index.html

example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties

example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java

example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java

example/application/todoapp/webapp/pom.xml

example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties

example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties

  1. … 27 more files in changeset.
ISIS-928: mothballing the todoapp (example app and archetype)

  1. … 421 more files in changeset.
ISIS-970: changing 'interaction' to 'domainEvent', with...

... corresponding new XxxDomainEvent classes deprecating XxxInteractionEvent

  1. … 67 more files in changeset.
ISIS-928: minor improvements to example apps (mostly fixing .gitignore and .gitattributes), some other tiny corrections

  1. … 12 more files in changeset.
Merge remote-tracking branch 'remotes/origin/master' into DN_404

Conflicts:

example/application/simpleapp/webapp/pom.xml

example/application/todoapp/webapp/pom.xml

example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties

  1. … 2 more files in changeset.
Reverted some unnecessary changes

  1. … 4 more files in changeset.
ISIS-970: moving the new ActionInvocationContext from applib.annotatoin to applib.services.actinvoc

  1. … 10 more files in changeset.
ISIS-970: refactoring the Bulk.InteractionContext and BulkInteractionContext services: no longer does former inherit from latter...

... instead these are two separate services, with BulkInteractionContext renamed to ActionInvocationContext.

Refactored ToDoItem to use ActionInvocationContext rather than Bulk.InteractionContext

  1. … 11 more files in changeset.
Refactored PersistenceCapable to Persistable

  1. … 16 more files in changeset.
ISIS-983: changing "testDB" to "neo4j_DB" throughout.

  1. … 6 more files in changeset.
ISIS-983: testing neo4j support for todoapp and simpleapp.

changes:

- the todoapp has been changed to use a Set (rather than SortedSet) for ToDoItem#dependencies... would seem that DataNucleus' neo4j support returns an object of the incorrect type.

- the neo4j settings in persistor.properties has been moved to the end (and is commented out).

- replaced tabs for spaces in pom.xml.

With these change the webapps run ok:

* edit in neo4j setting in WEB-INF/persistor.properties

* build using "mvn clean install -P neo4j"

* run using "mvn antrun:run -Pself-host,neo4j -o"

However, note that the integration tests were tested and do NOT pass:

- the issue for simpleapp was that looks like unique index constraints are not implemented,

- the issue for todoapp looked down to ordering of the dependencies collection.

This commit also:

- renames ToDoSystemInitializer to ToDoAppSystemInitializer (for consistency with simpleapp)

- adds a new putDataNucleusProperty in IsisConfigurationForJdoIntegTests

  1. … 7 more files in changeset.
ISIS-928: minor incidental changes to the todoapp (additional tests)

  1. … 2 more files in changeset.
ISIS-973: simplifying and refining fixture script framework.

  1. … 10 more files in changeset.
ISIS-964: fix for todoapp integ test (already in the archetype)

ISIS-960: handle exception for subscriber when invoked no-arg action. More robust exception handler strategy.

If a no-arg action is invoked which generates an exception in a subscriber, then the Wicket UI should detect this and re-render the original object with any messages generated.

In addition, the exception handler strategy previously would only abort the transcation if a NonRecoverableException or a RecoverableException was thrown. This is too narrow; should abort the transaction for any exception thrown

  1. … 2 more files in changeset.
ISIS-953: enhancements to FixtureScript.ExecutionContext

Also:

- refactoring the todoapp and simpleapp to use FixtureScripts, lookup(...), and using composite fixtures.

  1. … 53 more files in changeset.
ISIS-928: optimize imports for todoapp and simpleapp... don't use wildcards. This addresses the issue for Eclipse/Java 8 compiler of the type 'Optional' being ambiguous in java.util.* and org.apache.isis.applib.annotation.*

  1. … 20 more files in changeset.
ISIS-948, ISIS-947: refactoring event bus, removing special case handling of event bus in Isis core runtime; adding in ability to inject into request-scoped services and for request-scoped services to be event bus subscribers.

Some of the new reference counting logic has moved from EventBusDefault into EventBusService (abstract class in applib).

Also (for ISIS-947) includes enhancements to ServiceInstantiator so that can call toString(), equals() and hashCode() even if there is no session.

In addition:

- ToDoItemSubscriptions (for todoapp) moved to menu item, rather than contributed (better intent traded against slightly worse workflow during demos).

  1. … 12 more files in changeset.
ISIS-936: moved prod source from isis-core-objectstore-jdo-datanucleus to isis-core-runtime. moved tests to core/tck/isis-core-tck-integtests.

Have also (temporarily) skipped the tests in isis-core-tck-restfulobjects URLs have changed for objects and further refactorings anticipated...

  1. … 155 more files in changeset.
ISIS-928: demonstrating use of hidden() and disabled() in the todoapp.

  1. … 1 more file in changeset.
ISIS-872: post-merge fixes for various pom.xml, bumping up to 1.8.0-SNAPSHOT.

  1. … 18 more files in changeset.
ISIS-537: moving version to 1.8.0-SNAPSHOT (was 2.0.0-SNAPSHOT)

  1. … 43 more files in changeset.
ISIS-908: fixture scripts now perform additional logging of the fixture results, as well as new lookup method.

  1. … 11 more files in changeset.
ISIS-404: unwrap domain object in DomainObjectContainerDefault before calling down into framework to determine persistence state of the wrapping adapter.

Have chosen to implement here in the service (at the outer most layer) to minimize any risk of unforeseen consequences if did the wrapper deeper in the guts of the framework, in particular the adapter manager identity hash maps.

  1. … 3 more files in changeset.
ISIS-865: further fixes for 'ensureSafeSemantics'; also ensure that integration tests' command are set to be executed as "USER" (rather than "OTHER").

The further fixes for 'ensureSafeSemantics' are mostly comments; the actual fix was in the todo integration tests that were failing because of a missing call to 'nextTransaction()'. There is a bit more 'belt-n-braces' resetting to null:

- of the command's event (at xactn completion)

- of the xactn's changedProperties hash (at xactn completion)

  1. … 5 more files in changeset.
ISIS-865: checks if any (non-Command) objects have been dirtied in an xactn initiated by an action with safe-semantics; if so, and if "isis.persistor.ensureSafeSemantics" is "true", will abort xactn.

Whichever way setting, will log with ERROR severity.

NB: this feature requires a CommandService impl that supports the new Command2 API.

Also supported in integ tests.

The default is taken to be "false", ie only log error, don't abort xactn. This is for backward compatibility with 1.6.0 and previous versions.

  1. … 10 more files in changeset.
ISIS-537 Set the version to 2.0.0-SNAPSHOT to avoid using wrong artefacts why reworking the kitchensink app to Bootstrap basen one

  1. … 54 more files in changeset.
ISIS-887: Removing references to isis modules from simpleapp and todoapp.

In addition:

- removed auth*_file config files

* removed ToDoItem's schedule* actions

* removed Quartz scheduler config from todoapp

also:

* removed empty ComponentFactoryRegistrarForToDoApp

* removed empty PageClassListForToDoApp

  1. … 35 more files in changeset.
ISIS-833: reverting isis-module-wrapper -> isis-core-wrapper.

  1. … 61 more files in changeset.