You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/03 14:41:23 UTC
[12/19] isis git commit: Merge remote-tracking branch
'remotes/origin/master' into DN_404
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
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6f4a9be7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6f4a9be7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6f4a9be7
Branch: refs/heads/ISIS-789
Commit: 6f4a9be739ea4f8c751d6f806de05c4e0446ad18
Parents: a7423cb fb6a37c
Author: jdb6853 <jd...@hotmail.com>
Authored: Fri Jan 2 01:16:30 2015 -0600
Committer: jdb6853 <jd...@hotmail.com>
Committed: Fri Jan 2 01:16:30 2015 -0600
----------------------------------------------------------------------
.../wicket/AuthenticatedWebSessionForIsis.java | 7 +-
...enticationManagerStandardForDfltRuntime.java | 12 +--
.../IsisConfigurationForJdoIntegTests.java | 15 ++++
.../application/simpleapp/integtests/.gitignore | 1 +
example/application/simpleapp/webapp/.gitignore | 2 +-
.../main/webapp/WEB-INF/persistor.properties | 14 ++--
.../dom/src/main/java/dom/todo/ToDoItem.java | 14 ++--
.../application/todoapp/integtests/.gitignore | 1 +
.../integration/ToDoAppSystemInitializer.java | 77 +++++++++++++++++++
.../java/integration/ToDoSystemInitializer.java | 77 -------------------
.../integration/glue/BootstrappingGlue.java | 4 +-
.../tests/AbstractToDoIntegTest.java | 4 +-
.../integration/tests/ToDoItemIntegTest.java | 2 +-
example/application/todoapp/webapp/.gitignore | 2 +-
.../main/webapp/WEB-INF/persistor.properties | 5 +-
.../META-INF/maven/archetype-metadata.xml | 12 +++
.../archetype-resources/integtests/.gitignore | 1 +
.../archetype-resources/webapp/.gitignore | 1 +
.../archetype-resources/webapp/pom.xml | 10 +++
.../main/webapp/WEB-INF/persistor.properties | 11 ++-
.../projects/basic/archetype.properties | 2 +-
.../META-INF/maven/archetype-metadata.xml | 12 +++
.../dom/src/main/java/dom/todo/ToDoItem.java | 14 ++--
.../archetype-resources/integtests/.gitignore | 1 +
.../integration/ToDoAppSystemInitializer.java | 80 ++++++++++++++++++++
.../java/integration/ToDoSystemInitializer.java | 80 --------------------
.../integration/glue/BootstrappingGlue.java | 4 +-
.../tests/AbstractToDoIntegTest.java | 4 +-
.../integration/tests/ToDoItemIntegTest.java | 2 +-
.../archetype-resources/webapp/.gitignore | 1 +
.../archetype-resources/webapp/pom.xml | 10 +++
.../main/webapp/WEB-INF/persistor.properties | 9 ++-
.../projects/basic/archetype.properties | 2 +-
scripts/recreate-archetype.sh | 2 +-
34 files changed, 289 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6f4a9be7/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6f4a9be7/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6f4a9be7/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------