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/03/03 21:22:54 UTC
[02/20] isis git commit: Merge pull request #1 from apache/master
Merge pull request #1 from apache/master
merging back from main
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb6a37cf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb6a37cf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb6a37cf
Branch: refs/heads/ISIS-789
Commit: fb6a37cf242eef2ac0b09b72cb233e2785647082
Parents: 81dbfd8 bbef048
Author: Jeremy <jd...@hotmail.com>
Authored: Wed Dec 24 00:57:55 2014 -0600
Committer: Jeremy <jd...@hotmail.com>
Committed: Wed Dec 24 00:57:55 2014 -0600
----------------------------------------------------------------------
.../wicket/AuthenticatedWebSessionForIsis.java | 7 +-
...enticationManagerStandardForDfltRuntime.java | 12 +--
.../IsisConfigurationForJdoIntegTests.java | 15 ++++
.../application/simpleapp/integtests/.gitignore | 1 +
example/application/simpleapp/webapp/.gitignore | 2 +-
example/application/simpleapp/webapp/pom.xml | 16 ++--
.../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 +-
example/application/todoapp/webapp/pom.xml | 16 ++--
.../main/webapp/WEB-INF/persistor.properties | 12 ++-
.../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 +-
36 files changed, 309 insertions(+), 225 deletions(-)
----------------------------------------------------------------------