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 2014/07/18 07:27:39 UTC
[50/52] git commit: ISIS-839: renaming archetype directories.
ISIS-839: renaming archetype directories.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b6954e56
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b6954e56
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b6954e56
Branch: refs/heads/master
Commit: b6954e568ea012caefe706f5258e1128c21cd487
Parents: 8cbe55c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 17 13:44:26 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 17 13:47:50 2014 +0100
----------------------------------------------------------------------
example/archetype/simple-app/pom.xml | 50 -
.../appended-resources/supplemental-models.xml | 26 -
.../META-INF/maven/archetype-metadata.xml | 157 ----
.../archetype-resources/dom/log4j.properties | 44 -
.../resources/archetype-resources/dom/pom.xml | 123 ---
.../dom/src/main/java/META-INF/persistence.xml | 29 -
.../src/main/java/dom/simple/SimpleObject.java | 82 --
.../java/dom/simple/SimpleObject.layout.json | 44 -
.../src/main/java/dom/simple/SimpleObjects.java | 81 --
.../src/main/resources/images/SimpleObject.png | Bin 557 -> 0 bytes
.../java/dom/simple/SimpleObjectTest_name.java | 50 -
.../dom/simple/SimpleObjectsTest_create.java | 79 --
.../dom/simple/SimpleObjectsTest_listAll.java | 75 --
.../archetype-resources/fixture/.gitignore | 1 -
.../archetype-resources/fixture/pom.xml | 38 -
.../fixture/simple/SimpleObjectsFixture.java | 55 --
.../simple/SimpleObjectsTearDownFixture.java | 39 -
.../integtests/logging.properties | 106 ---
.../archetype-resources/integtests/pom.xml | 122 ---
.../integration/SimpleAppSystemInitializer.java | 70 --
.../integration/glue/BootstrappingGlue.java | 56 --
.../integration/glue/CatalogOfFixturesGlue.java | 49 -
.../glue/InMemoryDBForSimpleApp.java | 43 -
.../glue/simple/SimpleObjectGlue.java | 101 --
.../java/integration/specs/simple/RunSpecs.java | 41 -
.../SimpleObjectSpec_listAllAndCreate.feature | 37 -
.../integration/tests/SimpleAppIntegTest.java | 42 -
.../SimpleObjectsTest_listAll_and_create.java | 66 --
.../main/resources/archetype-resources/pom.xml | 377 --------
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 33 -
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 25 -
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 -
.../launch/SimpleApp-SERVER-no-fixtures.launch | 25 -
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../archetype-resources/webapp/pom.xml | 343 -------
.../ComponentFactoryRegistrarForSimpleApp.java | 36 -
.../src/main/java/webapp/SimpleApplication.java | 145 ---
.../webapp/prototyping/DeveloperUtilities.java | 51 --
.../SimpleObjectsFixturesService.java | 71 --
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 0 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 0 bytes
.../src/main/resources/webapp/welcome.html | 38 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 266 ------
.../src/main/webapp/WEB-INF/logging.properties | 188 ----
.../main/webapp/WEB-INF/persistor.properties | 108 ---
.../WEB-INF/persistor_datanucleus.properties | 87 --
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 93 --
.../WEB-INF/viewer_restfulobjects.properties | 26 -
.../webapp/WEB-INF/viewer_wicket.properties | 58 --
.../webapp/src/main/webapp/WEB-INF/web.xml | 312 -------
.../src/main/webapp/about/images/isis-logo.png | Bin 14160 -> 0 bytes
.../webapp/src/main/webapp/about/index.html | 125 ---
.../webapp/src/main/webapp/css/application.css | 72 --
.../src/main/webapp/images/spinning-icon.gif | Bin 5266 -> 0 bytes
.../src/main/webapp/scripts/application.js | 3 -
.../projects/basic/archetype.properties | 5 -
.../src/test/resources/projects/basic/goal.txt | 0
example/archetype/simpleapp/pom.xml | 50 +
.../appended-resources/supplemental-models.xml | 26 +
.../META-INF/maven/archetype-metadata.xml | 157 ++++
.../archetype-resources/dom/log4j.properties | 44 +
.../resources/archetype-resources/dom/pom.xml | 123 +++
.../dom/src/main/java/META-INF/persistence.xml | 29 +
.../src/main/java/dom/simple/SimpleObject.java | 82 ++
.../java/dom/simple/SimpleObject.layout.json | 44 +
.../src/main/java/dom/simple/SimpleObjects.java | 81 ++
.../src/main/resources/images/SimpleObject.png | Bin 0 -> 557 bytes
.../java/dom/simple/SimpleObjectTest_name.java | 50 +
.../dom/simple/SimpleObjectsTest_create.java | 79 ++
.../dom/simple/SimpleObjectsTest_listAll.java | 75 ++
.../archetype-resources/fixture/.gitignore | 1 +
.../archetype-resources/fixture/pom.xml | 38 +
.../fixture/simple/SimpleObjectsFixture.java | 55 ++
.../simple/SimpleObjectsTearDownFixture.java | 39 +
.../integtests/logging.properties | 106 +++
.../archetype-resources/integtests/pom.xml | 122 +++
.../integration/SimpleAppSystemInitializer.java | 70 ++
.../integration/glue/BootstrappingGlue.java | 56 ++
.../integration/glue/CatalogOfFixturesGlue.java | 49 +
.../glue/InMemoryDBForSimpleApp.java | 43 +
.../glue/simple/SimpleObjectGlue.java | 101 ++
.../java/integration/specs/simple/RunSpecs.java | 41 +
.../SimpleObjectSpec_listAllAndCreate.feature | 37 +
.../integration/tests/SimpleAppIntegTest.java | 42 +
.../SimpleObjectsTest_listAll_and_create.java | 66 ++
.../main/resources/archetype-resources/pom.xml | 377 ++++++++
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 33 +
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 25 +
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 +
.../launch/SimpleApp-SERVER-no-fixtures.launch | 25 +
.../archetype-resources/webapp/lib/.gitignore | 5 +
.../archetype-resources/webapp/pom.xml | 343 +++++++
.../ComponentFactoryRegistrarForSimpleApp.java | 36 +
.../src/main/java/webapp/SimpleApplication.java | 145 +++
.../webapp/prototyping/DeveloperUtilities.java | 51 ++
.../SimpleObjectsFixturesService.java | 71 ++
.../src/main/jettyconsole/isis-banner.pdn | Bin 0 -> 69658 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 0 -> 30776 bytes
.../src/main/resources/webapp/welcome.html | 38 +
.../WEB-INF/authentication_file.passwords | 28 +
.../WEB-INF/authentication_file.properties | 28 +
.../webapp/WEB-INF/authorization_file.allow | 28 +
.../WEB-INF/authorization_file.properties | 50 +
.../src/main/webapp/WEB-INF/isis.properties | 266 ++++++
.../src/main/webapp/WEB-INF/logging.properties | 188 ++++
.../main/webapp/WEB-INF/persistor.properties | 108 +++
.../WEB-INF/persistor_datanucleus.properties | 87 ++
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 93 ++
.../WEB-INF/viewer_restfulobjects.properties | 26 +
.../webapp/WEB-INF/viewer_wicket.properties | 58 ++
.../webapp/src/main/webapp/WEB-INF/web.xml | 312 +++++++
.../src/main/webapp/about/images/isis-logo.png | Bin 0 -> 14160 bytes
.../webapp/src/main/webapp/about/index.html | 125 +++
.../webapp/src/main/webapp/css/application.css | 72 ++
.../src/main/webapp/images/spinning-icon.gif | Bin 0 -> 5266 bytes
.../src/main/webapp/scripts/application.js | 3 +
.../projects/basic/archetype.properties | 5 +
.../src/test/resources/projects/basic/goal.txt | 0
example/archetype/todo-app/pom.xml | 50 -
.../appended-resources/supplemental-models.xml | 26 -
.../META-INF/maven/archetype-metadata.xml | 165 ----
.../archetype-resources/dom/log4j.properties | 44 -
.../resources/archetype-resources/dom/pom.xml | 123 ---
.../dom/src/main/java/META-INF/persistence.xml | 29 -
.../dom/src/main/java/app/ToDoAppDashboard.java | 92 --
.../main/java/app/ToDoAppDashboard.layout.json | 26 -
.../main/java/app/ToDoAppDashboardService.java | 65 --
.../dom/src/main/java/app/ToDoItemAnalysis.java | 129 ---
.../java/app/ToDoItemAnalysisContributions.java | 56 --
.../java/app/ToDoItemsByCategoryViewModel.java | 170 ----
.../ToDoItemsByCategoryViewModel.layout.json | 43 -
.../java/app/ToDoItemsByDateRangeViewModel.java | 161 ----
.../ToDoItemsByDateRangeViewModel.layout.json | 33 -
.../dom/src/main/java/dom/todo/ToDoItem.java | 913 -------------------
.../src/main/java/dom/todo/ToDoItem.layout.json | 182 ----
.../dom/todo/ToDoItemChangedPayloadFactory.java | 50 -
.../java/dom/todo/ToDoItemContributions.java | 245 -----
.../java/dom/todo/ToDoItemSubscriptions.java | 184 ----
.../dom/src/main/java/dom/todo/ToDoItems.java | 239 -----
.../dom/src/main/resources/images/Dashboard.png | Bin 684 -> 0 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1363 -> 0 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 971 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 971 -> 0 bytes
.../test/java/dom/todo/ToDoTest_completed.java | 71 --
.../java/dom/todo/ToDoTest_notYetCompleted.java | 71 --
.../archetype-resources/fixture/.gitignore | 1 -
.../archetype-resources/fixture/pom.xml | 38 -
.../fixture/todo/ToDoItemsFixturesService.java | 59 --
.../integtests/ToDoItemsIntegTestFixture.java | 43 -
.../todo/scenarios/DeleteToDoItemsFor.java | 39 -
.../todo/scenarios/DeleteToDoItemsForSven.java | 33 -
...teToDoItemsAndCompleteSeveralForCurrent.java | 33 -
.../todo/scenarios/RecreateToDoItemsFor.java | 39 -
.../scenarios/RecreateToDoItemsForDick.java | 32 -
.../todo/scenarios/RecreateToDoItemsForJoe.java | 32 -
.../scenarios/RecreateToDoItemsForSven.java | 32 -
.../fixture/todo/simple/ToDoItemsDelete.java | 56 --
.../fixture/todo/simple/ToDoItemsRecreate.java | 98 --
.../ToDoItemsRecreateAndCompleteSeveral.java | 75 --
.../src/main/java/fixture/todo/simple/Util.java | 39 -
.../integtests/logging.properties | 104 ---
.../archetype-resources/integtests/pom.xml | 122 ---
.../java/integration/ToDoSystemInitializer.java | 91 --
.../integration/glue/BootstrappingGlue.java | 59 --
.../integration/glue/CatalogOfFixturesGlue.java | 51 --
.../integration/glue/InMemoryDBForToDoApp.java | 43 -
.../integration/glue/todoitem/ToDoItemGlue.java | 173 ----
.../integration/specs/todoitem/RunSpecs.java | 41 -
.../ToDoItemSpec_findAndComplete.feature | 39 -
...findCompletedAndMarkAsNotYetComplete.feature | 35 -
.../java/integration/tests/ToDoIntegTest.java | 41 -
...oDoItemContributionsTest_updateCategory.java | 106 ---
.../tests/actions/ToDoItemTest_completed.java | 174 ----
.../tests/actions/ToDoItemTest_duplicate.java | 83 --
.../actions/ToDoItemTest_notYetCompleted.java | 79 --
.../ToDoItemContributionsTest_similarTo.java | 71 --
.../colls/ToDoItemTest_dependencies_add.java | 181 ----
.../colls/ToDoItemTest_dependencies_remove.java | 176 ----
.../ToDoItemContributionsTest_priority.java | 75 --
.../tests/props/ToDoItemTest_attachment.java | 82 --
.../tests/props/ToDoItemTest_category.java | 62 --
.../tests/props/ToDoItemTest_cost.java | 100 --
.../tests/props/ToDoItemTest_description.java | 220 -----
.../tests/props/ToDoItemTest_dueBy.java | 106 ---
.../tests/props/ToDoItemTest_notes.java | 90 --
.../tests/props/ToDoItemTest_ownedBy.java | 61 --
.../tests/props/ToDoItemTest_subcategory.java | 62 --
.../tests/repo/ToDoItemsTest_finders.java | 84 --
.../repo/ToDoItemsTest_newToDo_and_delete.java | 68 --
.../tests/smoke/ToDoItemTest_title.java | 116 ---
.../main/resources/archetype-resources/pom.xml | 395 --------
.../launch/ToDoApp-PROTOTYPE-jrebel.launch | 26 -
.../ToDoApp-PROTOTYPE-with-fixtures.launch | 22 -
.../ide/eclipse/launch/ToDoApp-PROTOTYPE.launch | 25 -
.../ide/eclipse/launch/ToDoApp-SERVER.launch | 25 -
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../archetype-resources/webapp/pom.xml | 354 -------
.../ComponentFactoryRegistrarForToDoApp.java | 36 -
.../java/webapp/PageClassListForToDoApp.java | 64 --
.../src/main/java/webapp/ToDoApplication.java | 145 ---
.../src/main/java/webapp/admin/Admin.java | 175 ----
.../java/webapp/admin/AdminContributions.java | 113 ---
.../webapp/prototyping/DeveloperUtilities.java | 53 --
.../prototyping/ExternalLinksService.java | 62 --
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 --
.../BackgroundCommandExecutionQuartzJob.java | 31 -
.../webapp/scheduler/SchedulerConstants.java | 30 -
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 0 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 0 bytes
.../webapp/src/main/resources/webapp/realm1.ini | 68 --
.../webapp/src/main/resources/webapp/realm2.ini | 66 --
.../webapp/scheduler/quartz-config.xml | 65 --
.../webapp/scheduler/quartz.properties | 28 -
.../src/main/resources/webapp/welcome.html | 38 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 275 ------
.../src/main/webapp/WEB-INF/logging.properties | 191 ----
.../main/webapp/WEB-INF/persistor.properties | 107 ---
.../WEB-INF/persistor_datanucleus.properties | 88 --
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 95 --
.../WEB-INF/viewer_restfulobjects.properties | 29 -
.../webapp/WEB-INF/viewer_wicket.properties | 58 --
.../webapp/src/main/webapp/WEB-INF/web.xml | 330 -------
.../src/main/webapp/about/images/isis-logo.png | Bin 14160 -> 0 bytes
.../webapp/src/main/webapp/about/index.html | 215 -----
.../webapp/src/main/webapp/css/application.css | 80 --
.../src/main/webapp/images/spinning-icon.gif | Bin 5266 -> 0 bytes
.../src/main/webapp/scripts/application.js | 3 -
.../projects/basic/archetype.properties | 5 -
.../src/test/resources/projects/basic/goal.txt | 0
example/archetype/todoapp/pom.xml | 50 +
.../appended-resources/supplemental-models.xml | 26 +
.../META-INF/maven/archetype-metadata.xml | 165 ++++
.../archetype-resources/dom/log4j.properties | 44 +
.../resources/archetype-resources/dom/pom.xml | 123 +++
.../dom/src/main/java/META-INF/persistence.xml | 29 +
.../dom/src/main/java/app/ToDoAppDashboard.java | 92 ++
.../main/java/app/ToDoAppDashboard.layout.json | 26 +
.../main/java/app/ToDoAppDashboardService.java | 65 ++
.../dom/src/main/java/app/ToDoItemAnalysis.java | 129 +++
.../java/app/ToDoItemAnalysisContributions.java | 56 ++
.../java/app/ToDoItemsByCategoryViewModel.java | 170 ++++
.../ToDoItemsByCategoryViewModel.layout.json | 43 +
.../java/app/ToDoItemsByDateRangeViewModel.java | 161 ++++
.../ToDoItemsByDateRangeViewModel.layout.json | 33 +
.../dom/src/main/java/dom/todo/ToDoItem.java | 913 +++++++++++++++++++
.../src/main/java/dom/todo/ToDoItem.layout.json | 182 ++++
.../dom/todo/ToDoItemChangedPayloadFactory.java | 50 +
.../java/dom/todo/ToDoItemContributions.java | 245 +++++
.../java/dom/todo/ToDoItemSubscriptions.java | 184 ++++
.../dom/src/main/java/dom/todo/ToDoItems.java | 239 +++++
.../dom/src/main/resources/images/Dashboard.png | Bin 0 -> 684 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 0 -> 1363 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 0 -> 971 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 0 -> 971 bytes
.../test/java/dom/todo/ToDoTest_completed.java | 71 ++
.../java/dom/todo/ToDoTest_notYetCompleted.java | 71 ++
.../archetype-resources/fixture/.gitignore | 1 +
.../archetype-resources/fixture/pom.xml | 38 +
.../fixture/todo/ToDoItemsFixturesService.java | 59 ++
.../integtests/ToDoItemsIntegTestFixture.java | 43 +
.../todo/scenarios/DeleteToDoItemsFor.java | 39 +
.../todo/scenarios/DeleteToDoItemsForSven.java | 33 +
...teToDoItemsAndCompleteSeveralForCurrent.java | 33 +
.../todo/scenarios/RecreateToDoItemsFor.java | 39 +
.../scenarios/RecreateToDoItemsForDick.java | 32 +
.../todo/scenarios/RecreateToDoItemsForJoe.java | 32 +
.../scenarios/RecreateToDoItemsForSven.java | 32 +
.../fixture/todo/simple/ToDoItemsDelete.java | 56 ++
.../fixture/todo/simple/ToDoItemsRecreate.java | 98 ++
.../ToDoItemsRecreateAndCompleteSeveral.java | 75 ++
.../src/main/java/fixture/todo/simple/Util.java | 39 +
.../integtests/logging.properties | 104 +++
.../archetype-resources/integtests/pom.xml | 122 +++
.../java/integration/ToDoSystemInitializer.java | 91 ++
.../integration/glue/BootstrappingGlue.java | 59 ++
.../integration/glue/CatalogOfFixturesGlue.java | 51 ++
.../integration/glue/InMemoryDBForToDoApp.java | 43 +
.../integration/glue/todoitem/ToDoItemGlue.java | 173 ++++
.../integration/specs/todoitem/RunSpecs.java | 41 +
.../ToDoItemSpec_findAndComplete.feature | 39 +
...findCompletedAndMarkAsNotYetComplete.feature | 35 +
.../java/integration/tests/ToDoIntegTest.java | 41 +
...oDoItemContributionsTest_updateCategory.java | 106 +++
.../tests/actions/ToDoItemTest_completed.java | 174 ++++
.../tests/actions/ToDoItemTest_duplicate.java | 83 ++
.../actions/ToDoItemTest_notYetCompleted.java | 79 ++
.../ToDoItemContributionsTest_similarTo.java | 71 ++
.../colls/ToDoItemTest_dependencies_add.java | 181 ++++
.../colls/ToDoItemTest_dependencies_remove.java | 176 ++++
.../ToDoItemContributionsTest_priority.java | 75 ++
.../tests/props/ToDoItemTest_attachment.java | 82 ++
.../tests/props/ToDoItemTest_category.java | 62 ++
.../tests/props/ToDoItemTest_cost.java | 100 ++
.../tests/props/ToDoItemTest_description.java | 220 +++++
.../tests/props/ToDoItemTest_dueBy.java | 106 +++
.../tests/props/ToDoItemTest_notes.java | 90 ++
.../tests/props/ToDoItemTest_ownedBy.java | 61 ++
.../tests/props/ToDoItemTest_subcategory.java | 62 ++
.../tests/repo/ToDoItemsTest_finders.java | 84 ++
.../repo/ToDoItemsTest_newToDo_and_delete.java | 68 ++
.../tests/smoke/ToDoItemTest_title.java | 116 +++
.../main/resources/archetype-resources/pom.xml | 395 ++++++++
.../launch/ToDoApp-PROTOTYPE-jrebel.launch | 26 +
.../ToDoApp-PROTOTYPE-with-fixtures.launch | 22 +
.../ide/eclipse/launch/ToDoApp-PROTOTYPE.launch | 25 +
.../ide/eclipse/launch/ToDoApp-SERVER.launch | 25 +
.../archetype-resources/webapp/lib/.gitignore | 5 +
.../archetype-resources/webapp/pom.xml | 354 +++++++
.../ComponentFactoryRegistrarForToDoApp.java | 36 +
.../java/webapp/PageClassListForToDoApp.java | 64 ++
.../src/main/java/webapp/ToDoApplication.java | 145 +++
.../src/main/java/webapp/admin/Admin.java | 175 ++++
.../java/webapp/admin/AdminContributions.java | 113 +++
.../webapp/prototyping/DeveloperUtilities.java | 53 ++
.../prototyping/ExternalLinksService.java | 62 ++
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 ++
.../BackgroundCommandExecutionQuartzJob.java | 31 +
.../webapp/scheduler/SchedulerConstants.java | 30 +
.../src/main/jettyconsole/isis-banner.pdn | Bin 0 -> 69658 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 0 -> 30776 bytes
.../webapp/src/main/resources/webapp/realm1.ini | 68 ++
.../webapp/src/main/resources/webapp/realm2.ini | 66 ++
.../webapp/scheduler/quartz-config.xml | 65 ++
.../webapp/scheduler/quartz.properties | 28 +
.../src/main/resources/webapp/welcome.html | 38 +
.../WEB-INF/authentication_file.passwords | 28 +
.../WEB-INF/authentication_file.properties | 28 +
.../webapp/WEB-INF/authorization_file.allow | 28 +
.../WEB-INF/authorization_file.properties | 50 +
.../src/main/webapp/WEB-INF/isis.properties | 275 ++++++
.../src/main/webapp/WEB-INF/logging.properties | 191 ++++
.../main/webapp/WEB-INF/persistor.properties | 107 +++
.../WEB-INF/persistor_datanucleus.properties | 88 ++
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 95 ++
.../WEB-INF/viewer_restfulobjects.properties | 29 +
.../webapp/WEB-INF/viewer_wicket.properties | 58 ++
.../webapp/src/main/webapp/WEB-INF/web.xml | 330 +++++++
.../src/main/webapp/about/images/isis-logo.png | Bin 0 -> 14160 bytes
.../webapp/src/main/webapp/about/index.html | 215 +++++
.../webapp/src/main/webapp/css/application.css | 80 ++
.../src/main/webapp/images/spinning-icon.gif | Bin 0 -> 5266 bytes
.../src/main/webapp/scripts/application.js | 3 +
.../projects/basic/archetype.properties | 5 +
.../src/test/resources/projects/basic/goal.txt | 0
352 files changed, 14497 insertions(+), 14497 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/pom.xml b/example/archetype/simple-app/pom.xml
deleted file mode 100644
index 47267fa..0000000
--- a/example/archetype/simple-app/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.isis.archetype</groupId>
- <artifactId>simple_wicket_restful_jdo-archetype</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
- <name>simple_wicket_restful_jdo-archetype</name>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <relativePath>../../../core/pom.xml</relativePath>
- </parent>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/appended-resources/supplemental-models.xml b/example/archetype/simple-app/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index 01c58d8..0000000
--- a/example/archetype/simple-app/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<supplementalDataModels
- xmlns="http://maven.apache.org/supplemental-model/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0
- http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-
-</supplementalDataModels>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simple-app/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 59a6ecc..0000000
--- a/example/archetype/simple-app/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="simple_wicket_restful_jdo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modules>
- <module id="${rootArtifactId}-dom" dir="dom" name="${rootArtifactId}-dom">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.json</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.png</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory/>
- <includes>
- <include>log4j.properties</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-fixture" dir="fixture" name="${rootArtifactId}-fixture">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory/>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-integtests" dir="integtests" name="${rootArtifactId}-integtests">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.feature</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory/>
- <includes>
- <include>logging.properties</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-webapp" dir="webapp" name="${rootArtifactId}-webapp">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.html</include>
- <include>**/*.properties</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/jettyconsole</directory>
- <includes>
- <include>**/*.png</include>
- <include>**/*.pdn</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.passwords</include>
- <include>**/*.allow</include>
- <include>**/*.png</include>
- <include>**/*.js</include>
- <include>**/*.ini</include>
- <include>**/*.gif</include>
- <include>**/*.css</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>lib</directory>
- <includes>
- <include>**/*.gitignore</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>ide/eclipse</directory>
- <includes>
- <include>**/*.launch</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- </modules>
-</archetype-descriptor>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/log4j.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/log4j.properties b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/log4j.properties
deleted file mode 100644
index 2040d89..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/log4j.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound} LOG4J Configuration
-${symbol_pound} ===================
-
-${symbol_pound} Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-${symbol_pound}log4j.appender.A1.Threshold=INFO
-
-${symbol_pound} Categories
-${symbol_pound} Each category can be set to a "level", and to direct to an appender
-
-${symbol_pound} Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-${symbol_pound} Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/pom.xml
deleted file mode 100644
index ecbd6a7..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <name>Simple Wicket/Restful/JDO DOM</name>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- <props>${basedir}/datanucleus.properties</props>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[3.2.0-release,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Bytecode libraries (for mocking) -->
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
deleted file mode 100644
index c5d8e78..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
- <persistence-unit name="simple">
- </persistence-unit>
-</persistence>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
deleted file mode 100644
index d203eb6..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
+++ /dev/null
@@ -1,82 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package dom.simple;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.VersionStrategy;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.util.ObjectContracts;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.DatastoreIdentity(
- strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
- column="id")
-@javax.jdo.annotations.Version(
- strategy=VersionStrategy.VERSION_NUMBER,
- column="version")
-@ObjectType("SIMPLE")
-@Bookmarkable
-public class SimpleObject implements Comparable<SimpleObject> {
-
- //region > name (property)
- // //////////////////////////////////////
-
- private String name;
-
- @javax.jdo.annotations.Column(allowsNull="false")
- @Title(sequence="1")
- @MemberOrder(sequence="1")
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- //endregion
-
-
- //region > compareTo
- // //////////////////////////////////////
-
- @Override
- public int compareTo(SimpleObject other) {
- return ObjectContracts.compare(this, other, "name");
- }
-
- //endregion
-
- //region > injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- @SuppressWarnings("unused")
- private DomainObjectContainer container;
-
- //endregion
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
deleted file mode 100644
index aeeb8a2..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-{
- columns: [
- {
- span: 6,
- memberGroups: {
- General: {
- members: {
- name: {}
- }
- }
- }
- },
- {
- span: 0,
- memberGroups: {}
- },
- {
- span: 0,
- memberGroups: {}
- },
- {
- span: 6,
- collections: {}
- }
- ],
- actions: {}
-}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
deleted file mode 100644
index 40bdc5a..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
+++ /dev/null
@@ -1,81 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package dom.simple;
-
-import java.util.List;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-
-public class SimpleObjects {
-
- //region > identification in the UI
- // //////////////////////////////////////
-
- public String getId() {
- return "simple";
- }
-
- public String iconName() {
- return "SimpleObject";
- }
-
- //endregion
-
- //region > listAll (action)
- // //////////////////////////////////////
-
- @Bookmarkable
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "1")
- public List<SimpleObject> listAll() {
- return container.allInstances(SimpleObject.class);
- }
-
- //endregion
-
- //region > create (action)
- // //////////////////////////////////////
-
- @MemberOrder(sequence = "2")
- public SimpleObject create(
- final @Named("Name") String name) {
- final SimpleObject obj = container.newTransientInstance(SimpleObject.class);
- obj.setName(name);
- container.persistIfNotAlready(obj);
- return obj;
- }
-
- //endregion
-
- //region > injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- DomainObjectContainer container;
-
- //endregion
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png
deleted file mode 100644
index 3f91282..0000000
Binary files a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
deleted file mode 100644
index b905ca5..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
+++ /dev/null
@@ -1,50 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dom.simple;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class SimpleObjectTest_name {
-
- private SimpleObject simpleObject;
-
- @Before
- public void setUp() throws Exception {
- simpleObject = new SimpleObject();
- }
-
- @Test
- public void happyCase() throws Exception {
- // given
- assertThat(simpleObject.getName(), is(nullValue()));
-
- // when
- simpleObject.setName("Foobar");
-
- // then
- assertThat(simpleObject.getName(), is("Foobar"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
deleted file mode 100644
index d260af4..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
+++ /dev/null
@@ -1,79 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dom.simple;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
-
-import org.jmock.Expectations;
-import org.jmock.Sequence;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class SimpleObjectsTest_create {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private DomainObjectContainer mockContainer;
-
- private SimpleObjects simpleObjects;
-
- @Before
- public void setUp() throws Exception {
- simpleObjects = new SimpleObjects();
- simpleObjects.container = mockContainer;
- }
-
- @Test
- public void happyCase() throws Exception {
-
- // given
- final SimpleObject simpleObject = new SimpleObject();
-
- final Sequence seq = context.sequence("create");
- context.checking(new Expectations() {
- {
- oneOf(mockContainer).newTransientInstance(SimpleObject.class);
- inSequence(seq);
- will(returnValue(simpleObject));
-
- oneOf(mockContainer).persistIfNotAlready(simpleObject);
- inSequence(seq);
- }
- });
-
- // when
- final SimpleObject obj = simpleObjects.create("Foobar");
-
- // then
- assertThat(obj, is(simpleObject));
- assertThat(obj.getName(), is("Foobar"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java b/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java
deleted file mode 100644
index 2b928ad..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java
+++ /dev/null
@@ -1,75 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dom.simple;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class SimpleObjectsTest_listAll {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private DomainObjectContainer mockContainer;
-
- private SimpleObjects simpleObjects;
-
- @Before
- public void setUp() throws Exception {
- simpleObjects = new SimpleObjects();
- simpleObjects.container = mockContainer;
- }
-
- @Test
- public void happyCase() throws Exception {
-
- // given
- final List<SimpleObject> all = Lists.newArrayList();
-
- context.checking(new Expectations() {
- {
- oneOf(mockContainer).allInstances(SimpleObject.class);
- will(returnValue(all));
- }
- });
-
- // when
- final List<SimpleObject> list = simpleObjects.listAll();
-
- // then
- assertThat(list, is(all));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/.gitignore b/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/.gitignore
deleted file mode 100644
index a48e45b..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target-ide
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/pom.xml b/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/pom.xml
deleted file mode 100644
index 204bc79..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <name>Simple Wicket/Restful/JDO Fixtures</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-dom</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java b/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
deleted file mode 100644
index 4b03a11..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
+++ /dev/null
@@ -1,55 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package fixture.simple;
-
-import dom.simple.SimpleObject;
-import dom.simple.SimpleObjects;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-public class SimpleObjectsFixture extends FixtureScript {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
-
- // prereqs
- execute(new SimpleObjectsTearDownFixture(), executionContext);
-
- // create
- create("Foo");
- create("Bar");
- create("Baz");
- }
-
- // //////////////////////////////////////
-
- private SimpleObject create(final String name) {
- return simpleObjects.create(name);
- }
-
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private SimpleObjects simpleObjects;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java b/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
deleted file mode 100644
index be3eac0..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
+++ /dev/null
@@ -1,39 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package fixture.simple;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
-
-public class SimpleObjectsTearDownFixture extends FixtureScript {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- isisJdoSupport.executeUpdate("delete from ${symbol_escape}"SimpleObject${symbol_escape}"");
- }
-
-
- @javax.inject.Inject
- private IsisJdoSupport isisJdoSupport;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/logging.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/logging.properties b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/logging.properties
deleted file mode 100644
index 0800305..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/logging.properties
+++ /dev/null
@@ -1,106 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-
-${symbol_pound}
-${symbol_pound} Isis uses log4j is used to provide system logging
-${symbol_pound}
-log4j.rootCategory=INFO, Console
-
-${symbol_pound} The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-${symbol_pound}log4j.debug=true
-
-
-${symbol_pound} DataNucleus
-${symbol_pound} the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=WARN, Console
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console
-${symbol_pound} the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-
-
-${symbol_pound} if using log4jdbc-remix as JDBC driver
-${symbol_pound}log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-${symbol_pound}log4j.additivity.jdbc.sqlonly=false
-${symbol_pound}log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-${symbol_pound}log4j.additivity.jdbc.resultsettable=false
-
-${symbol_pound}log4j.logger.jdbc.audit=WARN,jdbc, Console
-${symbol_pound}log4j.additivity.jdbc.audit=false
-${symbol_pound}log4j.logger.jdbc.resultset=WARN,jdbc
-${symbol_pound}log4j.additivity.jdbc.resultset=false
-${symbol_pound}log4j.logger.jdbc.sqltiming=WARN,sqltiming
-${symbol_pound}log4j.additivity.jdbc.sqltiming=false
-${symbol_pound}log4j.logger.jdbc.connection=FATAL,connection
-${symbol_pound}log4j.additivity.jdbc.connection=false
-
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/pom.xml
deleted file mode 100644
index 4b47301..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <name>Simple Wicket/Restful/JDO Integration Tests</name>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- </build>
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-fixture</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-specsupport</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-wrapper</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <!--
- uncomment to enable enhanced cucumber-jvm reporting
- http://www.masterthought.net/section/cucumber-reporting
- <dependency>
- <groupId>com.googlecode.totallylazy</groupId>
- <artifactId>totallylazy</artifactId>
- <version>991</version>
- </dependency>
-
- <dependency>
- <groupId>net.masterthought</groupId>
- <artifactId>cucumber-reporting</artifactId>
- <version>0.0.21</version>
- </dependency>
- <dependency>
- <groupId>net.masterthought</groupId>
- <artifactId>maven-cucumber-reporting</artifactId>
- <version>0.0.4</version>
- </dependency>
- -->
- </dependencies>
-
- <!--
- uncomment for enhanced cucumber-jvm reporting
- http://www.masterthought.net/section/cucumber-reporting
- <repositories>
- <repository>
- <id>repo.bodar.com</id>
- <url>http://repo.bodar.com</url>
- </repository>
- </repositories>
- -->
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
deleted file mode 100644
index 5bfef2b..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package integration;
-
-import dom.simple.SimpleObjects;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.integtestsupport.IsisSystemForTest;
-import org.apache.isis.core.wrapper.WrapperFactoryDefault;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
-import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
-import org.apache.isis.objectstore.jdo.datanucleus.service.support.IsisJdoSupportImpl;
-
-/**
- * Holds an instance of an {@link IsisSystemForTest} as a {@link ThreadLocal} on the current thread,
- * initialized with ToDo app's domain services.
- */
-public class SimpleAppSystemInitializer {
-
- private SimpleAppSystemInitializer(){}
-
- public static IsisSystemForTest initIsft() {
- IsisSystemForTest isft = IsisSystemForTest.getElseNull();
- if(isft == null) {
- isft = new SimpleAppSystemBuilder().build().setUpSystem();
- IsisSystemForTest.set(isft);
- }
- return isft;
- }
-
- private static class SimpleAppSystemBuilder extends IsisSystemForTest.Builder {
-
- public SimpleAppSystemBuilder() {
- //withFixtures( ... reference data fixtures ...); // if we had any...
- withLoggingAt(org.apache.log4j.Level.INFO);
- with(testConfiguration());
- with(new DataNucleusPersistenceMechanismInstaller());
-
- withServices(
- new SimpleObjects(),
- new WrapperFactoryDefault(),
- new IsisJdoSupportImpl()
- );
- }
-
- private static IsisConfiguration testConfiguration() {
- final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests();
- testConfiguration.addRegisterEntitiesPackagePrefix("dom");
- return testConfiguration;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java
deleted file mode 100644
index 711adc6..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java
+++ /dev/null
@@ -1,56 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
-O * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package integration.glue;
-
-import integration.SimpleAppSystemInitializer;
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-
-import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
-public class BootstrappingGlue extends CukeGlueAbstract {
-
- // //////////////////////////////////////
-
- @Before(value={"@unit"}, order=100)
- public void beforeScenarioUnitScope() {
- before(ScenarioExecutionScope.UNIT);
- }
-
- @Before(value={"@integration"}, order=100)
- public void beforeScenarioIntegrationScope() {
- org.apache.log4j.PropertyConfigurator.configure("logging.properties");
- SimpleAppSystemInitializer.initIsft();
-
- before(ScenarioExecutionScope.INTEGRATION);
- }
-
- @After
- public void afterScenario(cucumber.api.Scenario sc) {
- assertMocksSatisfied();
- after(sc);
- }
-
- // //////////////////////////////////////
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
deleted file mode 100644
index c09082e..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
+++ /dev/null
@@ -1,49 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package integration.glue;
-
-import cucumber.api.java.Before;
-import dom.simple.SimpleObject;
-import fixture.simple.SimpleObjectsFixture;
-
-import org.apache.isis.core.specsupport.scenarios.InMemoryDB;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
-public class CatalogOfFixturesGlue extends CukeGlueAbstract {
-
-
- @Before(value={"@unit", "@SimpleObjectsFixture"}, order=20000)
- public void unitFixtures() throws Throwable {
- final InMemoryDB inMemoryDB = new InMemoryDBForSimpleApp(this.scenarioExecution());
- inMemoryDB.getElseCreate(SimpleObject.class, "Foo");
- inMemoryDB.getElseCreate(SimpleObject.class, "Bar");
- inMemoryDB.getElseCreate(SimpleObject.class, "Baz");
- putVar("isis", "in-memory-db", inMemoryDB);
- }
-
- // //////////////////////////////////////
-
- @Before(value={"@integration", "@SimpleObjectsFixture"}, order=20000)
- public void integrationFixtures() throws Throwable {
- scenarioExecution().install(new SimpleObjectsFixture());
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6954e56/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
----------------------------------------------------------------------
diff --git a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java b/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
deleted file mode 100644
index 3aefb12..0000000
--- a/example/archetype/simple-app/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
+++ /dev/null
@@ -1,43 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package integration.glue;
-
-import dom.simple.SimpleObject;
-
-import org.apache.isis.core.specsupport.scenarios.InMemoryDB;
-import org.apache.isis.core.specsupport.scenarios.ScenarioExecution;
-
-public class InMemoryDBForSimpleApp extends InMemoryDB {
-
- public InMemoryDBForSimpleApp(ScenarioExecution scenarioExecution) {
- super(scenarioExecution);
- }
-
- /**
- * Hook to initialize if possible.
- */
- @Override
- protected void init(Object obj, String str) {
- if(obj instanceof SimpleObject) {
- SimpleObject toDoItem = (SimpleObject) obj;
- toDoItem.setName(str);
- }
- }
-}
\ No newline at end of file