Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -0
    • +234
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 27 more files in changeset.
ISIS-928: mothballing the todoapp (example app and archetype)

    • -23
    • +0
    ./ide/eclipse/launch/ToDoApp-PROTOTYPE.launch
    • -23
    • +0
    ./ide/eclipse/launch/ToDoApp-SERVER.launch
    • -23
    • +0
    ./ide/intellij/launch/TodoApp__enhance_only_.xml
    • -150
    • +0
    ./src/main/java/webapp/ToDoApplication.java
  1. … 420 more files in changeset.
ISIS-1027: allow @Property and @Collection to be specified for actions to that the corresponding facets are copied over when contributed as contributed property or contributed collection.

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 36 more files in changeset.
ISIS-1027: refactoring the metamodel validation for detecting duplicates ObjectSpecIdFacet.

Previously this was performed by the ObjectReflectorDefafult, called by the default "not quite no-op" MetaModelValidatorDefault". Have now moved to DomainObjectAnnotationFacetFactory, and removed the API from ObjectReflector.

In addition, updated isis.properties comments for simpleapp and todoapp.

    • -10
    • +16
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 9 more files in changeset.
ISIS-1027: more stuff...

... undeprecating Isis' own services (eg EventBusServiceJdo)

... adding in validators for XxxAnnotationFacetFactory

... moving Bounded and ObjectType annotation processing into DomainObjectAnnotationFacetFactory

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 65 more files in changeset.
ISIS-1027: first cut impl, still to test

    • -0
    • +7
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 88 more files in changeset.
ISIS-983: comment out the fixture for the todoapp

in isis.properties

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
ISIS-983: fixing regression in fixtures

... whereby they were always being installed if specified in isis.properties.

Should now only occur if specified on the cmd line.

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 4 more files in changeset.
ISIS-1025: support different logo URLs for signin page vs header page.

    • -1
    • +2
    ./src/main/java/webapp/ToDoApplication.java
    • binary
    ./src/main/webapp/images/todoapp-logo-160x40.png
  1. … 6 more files in changeset.
ISIS-1025: fixing merge issues, also reworking todoapp logos.

    • binary
    ./src/main/webapp/images/todoapp-logo-160x40.pdn
    • binary
    ./src/main/webapp/images/todoapp-logo-160x40.png
    • binary
    ./src/main/webapp/images/todoapp-logo-header.pdn
    • binary
    ./src/main/webapp/images/todoapp-logo-header.png
    • binary
    ./src/main/webapp/images/todoapp-logo-signin.pdn
    • binary
    ./src/main/webapp/images/todoapp-logo-signin.png
  1. … 1 more file in changeset.
ISIS-1016: updating todoapp to demonstrate brandLogo.

    • -0
    • +1
    ./src/main/java/webapp/ToDoApplication.java
    • binary
    ./src/main/webapp/images/spinning-icon.gif
    • binary
    ./src/main/webapp/images/todoapp-logo-160x40.pdn
    • binary
    ./src/main/webapp/images/todoapp-logo-160x40.png
    • binary
    ./src/main/webapp/images/todoapp-logo.pdn
ISIS-970: unit testing of @Action annotation

Includes:

- HiddenFacet is now multi-typed (as a minor improvement so that all hidden facets are held (as HidingInteractionAdvisors) and added to, rather than potentially being replaced as the "blessed" facet impl.

- slight alteration (simplification) of the design of @Action(restrictoTo=...)

  1. … 98 more files in changeset.
ISIS-990: UserProfileService along with example usage in todoapp.

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 2 more files in changeset.
ISIS-987: correcting the (commented out) properties in simpleapp and todoapp for EmailServiceDefault.

    • -0
    • +7
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 1 more file in changeset.
ISIS-970: fixing merge conflicts and fixing unit and integ tests

    • -5
    • +41
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 27 more files in changeset.
ISIS-1000: generalizing CssClassFacet to accept an (optional) ObjectAdapter

This allows the same facet to be used for the object-level cssClass() (corresponding to CssClassFacetMethod) as well as the member-level @XxxLayout(cssClass=...) annotations. It also opens up the possibility of member-level CSS being dynamic (per object instance) in the future.

Also, updated todoapp to demonstrate the feature (completed items are rendered in tables with a line-through and lightgrey).

  1. … 22 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.
Reverted some unnecessary changes

    • -3
    • +2
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 2 more files in changeset.
ISIS-970: remove support for @ActionLayout(prototype=...) and parsing from xxx.layout.json; add support for @Action(restrictTo=Environment[]).

  1. … 17 more files in changeset.
ISIS-970: completed the ActionAnnotationFacetFactory, with additional refactoring for DomainObjectFacetFactory

... so that these do all the processing of auditing, commands, publishing.

ActionAnnotationFacetFactory also does all the processing of @Bulk

In addition:

- gone through the todoapp and simpleapp, updated annotations.

    • -8
    • +9
    ./src/main/java/webapp/ToDoApplication.java
  1. … 119 more files in changeset.
Refactored PersistenceCapable to Persistable

    • -5
    • +6
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 15 more files in changeset.
ISIS-987 Provide some sort of mechanism to allow users to self-register for an Isis application.

Add register (email), verify, register user data flow.

  1. … 33 more files in changeset.
ISIS-987: UserRegistrationService, along with initial (very crude) implementation of the RegisterPage.

for now, can test using:

http://localhost:8080/wicket/wicket/bookmarkable/org.apache.isis.viewer.wicket.ui.pages.register.RegisterPage?username=fred

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

  1. … 5 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. … 11 more files in changeset.
ISIS-983 Enabled Embedded Neo4J support

Added datanucleus-neo4j in a neo4j pom profile [simpleapp, todoapp]

Added neo4j example setting in persistor.properties [simpleapp, todoapp]

Added .gitignore to ignore embedded neo4j generated testDB folder

[simpleapp, todoapp]

  1. … 2 more files in changeset.
ISIS-982: changing the names of the generated war files for simpleapp and todoapp.

  1. … 1 more file in changeset.
ISIS-284: moving isis-maven-plugin from todo app's webapp module and instead in the dom module. Supported this by extending the ServicesInstaller API, adding setIgnoreFailures.

Also added into simpleapp example.

  1. … 8 more files in changeset.
ISIS-284: moved isis-maven-plugin into core; deleted unused code; todoapp example now references the plugin in its webapp project.

  1. … 19 more files in changeset.
ISIS-928: minor updates to todoapp and simpleapp (doc changes, tiny bug fix)

    • -6
    • +2
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 2 more files in changeset.