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/30 17:44:27 UTC
[58/59] [abbrv] isis git commit: ISIS-789: removing neoapp example
after all
ISIS-789: removing neoapp example after all
... decided would live better in isisaddons
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9679840c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9679840c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9679840c
Branch: refs/heads/ISIS-789
Commit: 9679840c508c1efb232060e9ec78083fc2c0ab4b
Parents: fa30a76
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 30 15:51:07 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 30 15:51:07 2015 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 60 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket/applib/pom.xml | 2 +-
core/viewer-wicket/impl/pom.xml | 2 +-
core/viewer-wicket/model/pom.xml | 2 +-
core/viewer-wicket/pom.xml | 2 +-
core/viewer-wicket/ui/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/neoapp/dom/.gitignore | 2 -
example/application/neoapp/dom/log4j.properties | 41 -
example/application/neoapp/dom/pom.xml | 162 -
.../dom/src/main/java/META-INF/persistence.xml | 26 -
.../dom/src/main/java/dom/simple/ARecord.java | 70 -
.../dom/src/main/java/dom/simple/Host.java | 61 -
.../dom/src/main/java/dom/simple/Hosts.java | 29 -
.../dom/src/main/java/dom/simple/IpAddress.java | 54 -
.../src/main/java/dom/simple/SimpleObject.java | 101 -
.../java/dom/simple/SimpleObject.layout.json | 44 -
.../src/main/java/dom/simple/SimpleObject.png | Bin 557 -> 0 bytes
.../src/main/java/dom/simple/SimpleObjects.java | 63 -
.../test/java/dom/simple/SimpleObjectTest.java | 51 -
.../test/java/dom/simple/SimpleObjectsTest.java | 102 -
example/application/neoapp/fixture/.gitignore | 2 -
example/application/neoapp/fixture/pom.xml | 38 -
.../simple/SimpleObjectsFixturesService.java | 69 -
.../simple/SimpleObjectsTearDownFixture.java | 36 -
.../simple/objects/SimpleObjectAbstract.java | 36 -
.../simple/objects/SimpleObjectForBar.java | 31 -
.../simple/objects/SimpleObjectForBaz.java | 31 -
.../simple/objects/SimpleObjectForFoo.java | 31 -
.../simple/scenario/SimpleObjectsFixture.java | 45 -
.../application/neoapp/integtests/.gitignore | 3 -
.../neoapp/integtests/logging.properties | 103 -
example/application/neoapp/integtests/pom.xml | 122 -
.../integration/SimpleAppSystemInitializer.java | 72 -
.../integration/glue/BootstrappingGlue.java | 53 -
.../integration/glue/CatalogOfFixturesGlue.java | 46 -
.../glue/InMemoryDBForSimpleApp.java | 40 -
.../glue/simple/SimpleObjectGlue.java | 96 -
.../java/integration/specs/simple/RunSpecs.java | 38 -
.../SimpleObjectSpec_listAllAndCreate.feature | 37 -
.../integration/tests/SimpleAppIntegTest.java | 38 -
.../tests/smoke/SimpleObjectTest.java | 82 -
.../tests/smoke/SimpleObjectsTest.java | 148 -
example/application/neoapp/pom.xml | 373 --
example/application/neoapp/webapp/.gitignore | 4 -
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 30 -
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 22 -
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 19 -
.../launch/SimpleApp-SERVER-no-fixtures.launch | 47 -
.../webapp/ide/intellij/launch/README.txt | 2 -
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 28 -
.../launch/SimpleApp__enhance_only_.xml | 22 -
.../application/neoapp/webapp/lib/.gitignore | 5 -
example/application/neoapp/webapp/pom.xml | 350 --
.../src/main/java/webapp/SimpleApplication.java | 149 -
.../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 | 35 -
.../src/main/webapp/WEB-INF/isis.properties | 233 -
.../src/main/webapp/WEB-INF/logging.properties | 185 -
.../main/webapp/WEB-INF/persistor.properties | 124 -
.../WEB-INF/persistor_datanucleus.properties | 104 -
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 93 -
.../WEB-INF/viewer_restfulobjects.properties | 66 -
.../webapp/WEB-INF/viewer_wicket.properties | 84 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 309 -
.../src/main/webapp/about/images/isis-logo.png | Bin 14160 -> 0 bytes
.../webapp/src/main/webapp/about/index.html | 114 -
.../webapp/src/main/webapp/css/application.css | 19 -
.../webapp/src/main/webapp/cy2neo/bower.json | 31 -
.../webapp/src/main/webapp/cy2neo/index.html | 135 -
.../main/webapp/cy2neo/scripts/alchemyConfig.js | 33 -
.../webapp/cy2neo/scripts/codemirror-cypher.js | 190 -
.../main/webapp/cy2neo/scripts/codemirror.js | 5909 ------------------
.../src/main/webapp/cy2neo/scripts/cy2neo.js | 4 -
.../src/main/webapp/cy2neo/scripts/data.js | 766 ---
.../src/main/webapp/cy2neo/scripts/neo.js | 73 -
.../src/main/webapp/cy2neo/scripts/vendor.js | 10 -
.../webapp/cy2neo/styles/codemirror-neo.css | 25 -
.../main/webapp/cy2neo/styles/codemirror.css | 263 -
.../src/main/webapp/cy2neo/styles/cy2neo.css | 21 -
.../webapp/cy2neo/styles/fonts/FontAwesome.otf | Bin 75188 -> 0 bytes
.../cy2neo/styles/fonts/fontawesome-webfont.eot | Bin 72449 -> 0 bytes
.../cy2neo/styles/fonts/fontawesome-webfont.svg | 504 --
.../cy2neo/styles/fonts/fontawesome-webfont.ttf | Bin 141564 -> 0 bytes
.../styles/fonts/fontawesome-webfont.woff | Bin 83760 -> 0 bytes
.../webapp/cy2neo/styles/gh-fork-ribbon.css | 140 -
.../webapp/cy2neo/styles/images/maze-black.png | Bin 667 -> 0 bytes
.../src/main/webapp/images/spinning-icon.gif | Bin 5266 -> 0 bytes
.../webapp/scripts/alchemy/alchemy-white.css | 698 ---
.../src/main/webapp/scripts/alchemy/alchemy.css | 714 ---
.../src/main/webapp/scripts/alchemy/alchemy.js | 3153 ----------
.../main/webapp/scripts/alchemy/alchemy.min.css | 1 -
.../main/webapp/scripts/alchemy/alchemy.min.js | 3 -
.../webapp/scripts/alchemy/scripts/vendor.js | 10 -
.../alchemy/styles/fonts/FontAwesome.otf | Bin 75188 -> 0 bytes
.../styles/fonts/fontawesome-webfont.eot | Bin 72449 -> 0 bytes
.../styles/fonts/fontawesome-webfont.svg | 504 --
.../styles/fonts/fontawesome-webfont.ttf | Bin 141564 -> 0 bytes
.../styles/fonts/fontawesome-webfont.woff | Bin 83760 -> 0 bytes
.../alchemy/styles/images/maze-black.png | Bin 667 -> 0 bytes
.../webapp/scripts/alchemy/styles/vendor.css | 8 -
.../src/main/webapp/scripts/application.js | 3 -
.../webapp/src/test/resources/NeoBrowser.PNG | Bin 39360 -> 0 bytes
example/application/simpleapp/dom/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 4 +-
pom.xml | 1 +
tck/pom.xml | 12 +-
tck/tck-dom/pom.xml | 2 +-
tck/tck-fixture/pom.xml | 2 +-
tck/tck-integtests/pom.xml | 2 +-
tck/tck-viewer-restfulobjects/pom.xml | 2 +-
tck/tck-viewer-wicket/pom.xml | 6 +-
127 files changed, 68 insertions(+), 17687 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index ff8abb9..6560317 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index ff96578..c6cd701 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 7edf892..d078060 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 26e20d1..c983e41 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index f4ae23f..cf23a83 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b976ccc..ca7df9d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -1059,13 +1059,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1074,14 +1074,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1090,7 +1090,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1099,14 +1099,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1115,40 +1115,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1156,36 +1156,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1194,12 +1194,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
@@ -1207,41 +1207,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1251,7 +1251,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 54db5af..83d17b1 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 12336f2..30cb171 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 69496bc..8c9aa30 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<name>Isis Core Shiro Security</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 81c8f95..9a6a452 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 6fcb864..13f46cd 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index d8b60b8..5f84cab 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index f1bd33e..4543b99 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 648347e..4655aeb 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-wicket/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/applib/pom.xml b/core/viewer-wicket/applib/pom.xml
index b84004f..adc36b8 100644
--- a/core/viewer-wicket/applib/pom.xml
+++ b/core/viewer-wicket/applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/pom.xml b/core/viewer-wicket/impl/pom.xml
index 03ecc90..01cc5c4 100644
--- a/core/viewer-wicket/impl/pom.xml
+++ b/core/viewer-wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/model/pom.xml b/core/viewer-wicket/model/pom.xml
index b153e4e..8ee9b5b 100644
--- a/core/viewer-wicket/model/pom.xml
+++ b/core/viewer-wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/pom.xml b/core/viewer-wicket/pom.xml
index 8ebc914..892d230 100644
--- a/core/viewer-wicket/pom.xml
+++ b/core/viewer-wicket/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/viewer-wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/pom.xml b/core/viewer-wicket/ui/pom.xml
index 7098e6e..83867a1 100644
--- a/core/viewer-wicket/ui/pom.xml
+++ b/core/viewer-wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index e96c353..964857e 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index c00cd1a..5305a43 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/.gitignore b/example/application/neoapp/dom/.gitignore
deleted file mode 100644
index 76414b3..0000000
--- a/example/application/neoapp/dom/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target
-target-ide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/log4j.properties
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/log4j.properties b/example/application/neoapp/dom/log4j.properties
deleted file mode 100644
index ca165ac..0000000
--- a/example/application/neoapp/dom/log4j.properties
+++ /dev/null
@@ -1,41 +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.
-
-# LOG4J Configuration
-# ===================
-
-# 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
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# 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
-
-
-# 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/9679840c/example/application/neoapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/pom.xml b/example/application/neoapp/dom/pom.xml
deleted file mode 100644
index e1d22e9..0000000
--- a/example/application/neoapp/dom/pom.xml
+++ /dev/null
@@ -1,162 +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>org.apache.isis.example.application</groupId>
- <artifactId>neoapp</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>neoapp-dom</artifactId>
- <name>Neo App 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>[4.0.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.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>
-
- <profiles>
- <profile>
- <id>isis-validate</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- <configuration>
- <isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>todoapp-dom</artifactId>
- <version>1.8.0-SNAPSHOT</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/META-INF/persistence.xml b/example/application/neoapp/dom/src/main/java/META-INF/persistence.xml
deleted file mode 100644
index 8824aa1..0000000
--- a/example/application/neoapp/dom/src/main/java/META-INF/persistence.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.
--->
-<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/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/ARecord.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/ARecord.java b/example/application/neoapp/dom/src/main/java/dom/simple/ARecord.java
deleted file mode 100644
index fa3846c..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/ARecord.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package dom.simple;
-
-
-import javax.inject.Inject;
-import javax.jdo.annotations.*;
-
-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;
-
-@PersistenceCapable(identityType=IdentityType.DATASTORE)
-@DatastoreIdentity(
- strategy= IdGeneratorStrategy.IDENTITY,
- column="id")
-@Version(
- strategy=VersionStrategy.VERSION_NUMBER,
- column="version")
-@Unique(name="A_RECORD_NAME_UNQ", members = {"name"})
-@ObjectType("A_RECORD")
-@Bookmarkable
-public class ARecord implements Comparable<ARecord> {
-
- //region > name (property)
- private String name;
-
- @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 > IpAddress property
- private IpAddress ipAddress;
-
- @Column(allowsNull="false")
- @Title(sequence="2")
- @MemberOrder(sequence="2")
- public IpAddress getIpAddress() {
- return ipAddress;
- }
-
- public void setIpAddress(final IpAddress ipAddress) {
- this.ipAddress = ipAddress;
- }
- //endregion
-
-
- //region > compareTo
- @Override
- public int compareTo(ARecord other) {
- return ObjectContracts.compare(this, other, "name");
- }
- //endregion
-
- //region > injected services
- @Inject
- @SuppressWarnings("unused")
- private DomainObjectContainer container;
- //endregion
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/Host.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/Host.java b/example/application/neoapp/dom/src/main/java/dom/simple/Host.java
deleted file mode 100644
index d206f64..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/Host.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package dom.simple;
-
-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 javax.jdo.annotations.*;
-import java.util.List;
-
-@PersistenceCapable(identityType= IdentityType.DATASTORE)
-@DatastoreIdentity(
- strategy= IdGeneratorStrategy.IDENTITY,
- column="id")
-@Version(
- strategy=VersionStrategy.VERSION_NUMBER,
- column="version")
-@Unique(name="HOST_NAME_UNQ", members = {"name"})
-@ObjectType("HOST")
-@Bookmarkable
-public class Host {
-
- // region > Name property
- private String name;
-
- @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 > IpAddresses property
- private List<IpAddress> ipAddresses;
-
- @Column(allowsNull="false")
- @Title(sequence="2")
- @MemberOrder(sequence="2")
- public List<IpAddress> getIpAddresses() {
- return ipAddresses;
- }
-
- public void setIpAddresses(final List<IpAddress> ipAddresses) {
- this.ipAddresses = ipAddresses;
- }
- //endregion
-
- public void addIpAddress(IpAddress ipAddress){
- this.ipAddresses.add(ipAddress);
- }
-
- public void removeIpAddress(IpAddress ipAddress){
- this.ipAddresses.remove(ipAddress);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/Hosts.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/Hosts.java b/example/application/neoapp/dom/src/main/java/dom/simple/Hosts.java
deleted file mode 100644
index b4124f0..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/Hosts.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package dom.simple;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ParameterLayout;
-
-@DomainService(menuOrder = "10", repositoryFor = Host.class)
-public class Hosts {
-
- //region > create (action)
- @MemberOrder(sequence = "2")
- public Host create(
- final @ParameterLayout(named="Name") String name) {
- final Host obj = container.newTransientInstance(Host.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/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/IpAddress.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/IpAddress.java b/example/application/neoapp/dom/src/main/java/dom/simple/IpAddress.java
deleted file mode 100644
index 27c381c..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/IpAddress.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package dom.simple;
-
-import javax.inject.Inject;
-import javax.jdo.annotations.*;
-
-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;
-
-@PersistenceCapable(identityType=IdentityType.DATASTORE)
-@DatastoreIdentity(
- strategy= IdGeneratorStrategy.IDENTITY,
- column="id")
-@Version(
- strategy=VersionStrategy.VERSION_NUMBER,
- column="version")
-@Unique(name="IP_ADDRESS_ADDRESS_UNQ", members = {"address"})
-@ObjectType("IP_ADDRESS")
-@Bookmarkable
-public class IpAddress implements Comparable<IpAddress> {
-
- // region > Address property
- private String address;
-
- @Column(allowsNull="false")
- @Title(sequence="1")
- @MemberOrder(sequence="1")
- public String getAddress() {
- return address;
- }
-
- public void setAddress(final String address) {
- this.address = address;
- }
- //endregion
-
-
- //region > compareTo
- @Override
- public int compareTo(IpAddress other) {
- return ObjectContracts.compare(this, other, "address");
- }
- //endregion
-
- //region > injected services
- @Inject
- @SuppressWarnings("unused")
- private DomainObjectContainer container;
- //endregion
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java
deleted file mode 100644
index f43f038..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java
+++ /dev/null
@@ -1,101 +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.
- */
-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")
-@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
-@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 > label (property)
-
- private Label label;
-
- @javax.jdo.annotations.Column(allowsNull="false")
- @Title(sequence="2")
- @MemberOrder(sequence="2")
- public Label getLabel() {
- return label;
- }
-
- public void setLabel(final Label label) {
- this.label = label;
- }
-
- //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
-
- enum Label {
- NodeType1,
- NodeType2,
- AnotherNodeType
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.layout.json
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.layout.json b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.layout.json
deleted file mode 100644
index 35f57bb..0000000
--- a/example/application/neoapp/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/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.png
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.png b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.png
deleted file mode 100644
index 3f91282..0000000
Binary files a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObjects.java b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObjects.java
deleted file mode 100644
index 5540293..0000000
--- a/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObjects.java
+++ /dev/null
@@ -1,63 +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.
- */
-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.DomainService;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ParameterLayout;
-
-@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
-public class SimpleObjects {
-
- //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 @ParameterLayout(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/9679840c/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectTest.java b/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectTest.java
deleted file mode 100644
index fe6f0ac..0000000
--- a/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectTest.java
+++ /dev/null
@@ -1,51 +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.
- */
-package dom.simple;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class SimpleObjectTest {
-
- SimpleObject simpleObject;
-
- @Before
- public void setUp() throws Exception {
- simpleObject = new SimpleObject();
- }
-
- public static class Name extends SimpleObjectTest {
-
- @Test
- public void happyCase() throws Exception {
- // given
- String name = "Foobar";
- assertThat(simpleObject.getName(), is(nullValue()));
-
- // when
- simpleObject.setName(name);
-
- // then
- assertThat(simpleObject.getName(), is(name));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectsTest.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectsTest.java b/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectsTest.java
deleted file mode 100644
index 27b9ac3..0000000
--- a/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectsTest.java
+++ /dev/null
@@ -1,102 +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.
- */
-package dom.simple;
-
-import java.util.List;
-import com.google.common.collect.Lists;
-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;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class SimpleObjectsTest {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- DomainObjectContainer mockContainer;
-
- SimpleObjects simpleObjects;
-
- @Before
- public void setUp() throws Exception {
- simpleObjects = new SimpleObjects();
- simpleObjects.container = mockContainer;
- }
-
- public static class Create extends SimpleObjectsTest {
-
- @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"));
- }
-
- }
-
- public static class ListAll extends SimpleObjectsTest {
-
- @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/9679840c/example/application/neoapp/fixture/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/.gitignore b/example/application/neoapp/fixture/.gitignore
deleted file mode 100644
index 128ef84..0000000
--- a/example/application/neoapp/fixture/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target-ide
-target
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/pom.xml b/example/application/neoapp/fixture/pom.xml
deleted file mode 100644
index 8291deb..0000000
--- a/example/application/neoapp/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>org.apache.isis.example.application</groupId>
- <artifactId>neoapp</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>neoapp-fixture</artifactId>
- <name>Neo App Fixtures</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>neoapp-dom</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
deleted file mode 100644
index 690b7b6..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
+++ /dev/null
@@ -1,69 +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.
- */
-package fixture.simple;
-
-import fixture.simple.scenario.SimpleObjectsFixture;
-
-import java.util.List;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Prototype;
-import org.apache.isis.applib.fixturescripts.FixtureResult;
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.fixturescripts.SimpleFixtureScript;
-
-/**
- * Enables fixtures to be installed from the application.
- */
-@DomainService
-@DomainServiceLayout(named="Prototyping", menuBar = DomainServiceLayout.MenuBar.SECONDARY, menuOrder = "20")
-public class SimpleObjectsFixturesService extends FixtureScripts {
-
- public SimpleObjectsFixturesService() {
- super("fixture.simple");
- }
-
- @Override
- public FixtureScript default0RunFixtureScript() {
- return findFixtureScriptFor(SimpleFixtureScript.class);
- }
-
- /**
- * Raising visibility to <tt>public</tt> so that choices are available for first param
- * of {@link #runFixtureScript(FixtureScript, String)}.
- */
- @Override
- public List<FixtureScript> choices0RunFixtureScript() {
- return super.choices0RunFixtureScript();
- }
-
-
- // //////////////////////////////////////
-
- @Prototype
- @MemberOrder(sequence="20")
- public Object installFixturesAndReturnFirst() {
- final List<FixtureResult> run = findFixtureScriptFor(SimpleObjectsFixture.class).run(null);
- return run.get(0).getObject();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
deleted file mode 100644
index 2f9be56..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
+++ /dev/null
@@ -1,36 +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.
- */
-
-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 \"SimpleObject\"");
- }
-
-
- @javax.inject.Inject
- private IsisJdoSupport isisJdoSupport;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectAbstract.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectAbstract.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectAbstract.java
deleted file mode 100644
index 0edd80b..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectAbstract.java
+++ /dev/null
@@ -1,36 +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.
- */
-
-package fixture.simple.objects;
-
-import dom.simple.SimpleObject;
-import dom.simple.SimpleObjects;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-public abstract class SimpleObjectAbstract extends FixtureScript {
-
- protected SimpleObject create(final String name, ExecutionContext executionContext) {
- return executionContext.addResult(this, simpleObjects.create(name));
- }
-
- @javax.inject.Inject
- private SimpleObjects simpleObjects;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBar.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBar.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBar.java
deleted file mode 100644
index a59aea4..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBar.java
+++ /dev/null
@@ -1,31 +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.
- */
-
-package fixture.simple.objects;
-
-public class SimpleObjectForBar extends SimpleObjectAbstract {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
-
- create("Bar", executionContext);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBaz.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBaz.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBaz.java
deleted file mode 100644
index b71baeb..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBaz.java
+++ /dev/null
@@ -1,31 +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.
- */
-
-package fixture.simple.objects;
-
-public class SimpleObjectForBaz extends SimpleObjectAbstract {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
-
- create("Baz", executionContext);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForFoo.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForFoo.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForFoo.java
deleted file mode 100644
index fa3d488..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForFoo.java
+++ /dev/null
@@ -1,31 +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.
- */
-
-package fixture.simple.objects;
-
-public class SimpleObjectForFoo extends SimpleObjectAbstract {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
-
- create("Foo", executionContext);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java b/example/application/neoapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
deleted file mode 100644
index c44af4b..0000000
--- a/example/application/neoapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
+++ /dev/null
@@ -1,45 +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.
- */
-
-package fixture.simple.scenario;
-
-import fixture.simple.SimpleObjectsTearDownFixture;
-import fixture.simple.objects.SimpleObjectForBar;
-import fixture.simple.objects.SimpleObjectForBaz;
-import fixture.simple.objects.SimpleObjectForFoo;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-public class SimpleObjectsFixture extends FixtureScript {
-
- public SimpleObjectsFixture() {
- withDiscoverability(Discoverability.DISCOVERABLE);
- }
-
- @Override
- protected void execute(ExecutionContext executionContext) {
-
- executionContext.executeChild(this, new SimpleObjectsTearDownFixture());
-
- executionContext.executeChild(this, new SimpleObjectForFoo());
- executionContext.executeChild(this, new SimpleObjectForBar());
- executionContext.executeChild(this, new SimpleObjectForBaz());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/integtests/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/.gitignore b/example/application/neoapp/integtests/.gitignore
deleted file mode 100644
index 3faa3ab..0000000
--- a/example/application/neoapp/integtests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/neo4j_DB/
-target
-target-ide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/9679840c/example/application/neoapp/integtests/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/logging.properties b/example/application/neoapp/integtests/logging.properties
deleted file mode 100644
index d0b81cb..0000000
--- a/example/application/neoapp/integtests/logging.properties
+++ /dev/null
@@ -1,103 +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.
-
-
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-
-# 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
-#log4j.debug=true
-
-
-# DataNucleus
-# 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
-# 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
-
-
-
-
-# if using log4jdbc-remix as JDBC driver
-#log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-#log4j.additivity.jdbc.sqlonly=false
-#log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-#log4j.additivity.jdbc.resultsettable=false
-
-#log4j.logger.jdbc.audit=WARN,jdbc, Console
-#log4j.additivity.jdbc.audit=false
-#log4j.logger.jdbc.resultset=WARN,jdbc
-#log4j.additivity.jdbc.resultset=false
-#log4j.logger.jdbc.sqltiming=WARN,sqltiming
-#log4j.additivity.jdbc.sqltiming=false
-#log4j.logger.jdbc.connection=FATAL,connection
-#log4j.additivity.jdbc.connection=false
-