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:10 UTC
[41/59] [abbrv] isis git commit: ISIS-789: adding
example/application/neoapp
ISIS-789: adding example/application/neoapp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fa30a76a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fa30a76a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fa30a76a
Branch: refs/heads/ISIS-789
Commit: fa30a76a79c2cad2d3f3a2e65dc61a3b9a90bbc0
Parents: 859a135
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 30 15:04:20 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 30 15:04:20 2015 +0100
----------------------------------------------------------------------
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 0 -> 557 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 0 -> 69658 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 0 -> 30776 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 0 -> 14160 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 0 -> 75188 bytes
.../cy2neo/styles/fonts/fontawesome-webfont.eot | Bin 0 -> 72449 bytes
.../cy2neo/styles/fonts/fontawesome-webfont.svg | 504 ++
.../cy2neo/styles/fonts/fontawesome-webfont.ttf | Bin 0 -> 141564 bytes
.../styles/fonts/fontawesome-webfont.woff | Bin 0 -> 83760 bytes
.../webapp/cy2neo/styles/gh-fork-ribbon.css | 140 +
.../webapp/cy2neo/styles/images/maze-black.png | Bin 0 -> 667 bytes
.../src/main/webapp/images/spinning-icon.gif | Bin 0 -> 5266 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 0 -> 75188 bytes
.../styles/fonts/fontawesome-webfont.eot | Bin 0 -> 72449 bytes
.../styles/fonts/fontawesome-webfont.svg | 504 ++
.../styles/fonts/fontawesome-webfont.ttf | Bin 0 -> 141564 bytes
.../styles/fonts/fontawesome-webfont.woff | Bin 0 -> 83760 bytes
.../alchemy/styles/images/maze-black.png | Bin 0 -> 667 bytes
.../webapp/scripts/alchemy/styles/vendor.css | 8 +
.../src/main/webapp/scripts/application.js | 3 +
.../webapp/src/test/resources/NeoBrowser.PNG | Bin 0 -> 39360 bytes
97 files changed, 17618 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/dom/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/.gitignore b/example/application/neoapp/dom/.gitignore
new file mode 100644
index 0000000..76414b3
--- /dev/null
+++ b/example/application/neoapp/dom/.gitignore
@@ -0,0 +1,2 @@
+target
+target-ide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/dom/log4j.properties
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/log4j.properties b/example/application/neoapp/dom/log4j.properties
new file mode 100644
index 0000000..ca165ac
--- /dev/null
+++ b/example/application/neoapp/dom/log4j.properties
@@ -0,0 +1,41 @@
+# 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/fa30a76a/example/application/neoapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/dom/pom.xml b/example/application/neoapp/dom/pom.xml
new file mode 100644
index 0000000..e1d22e9
--- /dev/null
+++ b/example/application/neoapp/dom/pom.xml
@@ -0,0 +1,162 @@
+<?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/fa30a76a/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
new file mode 100644
index 0000000..8824aa1
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/META-INF/persistence.xml
@@ -0,0 +1,26 @@
+<?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/fa30a76a/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
new file mode 100644
index 0000000..fa3846c
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/ARecord.java
@@ -0,0 +1,70 @@
+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/fa30a76a/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
new file mode 100644
index 0000000..d206f64
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/Host.java
@@ -0,0 +1,61 @@
+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/fa30a76a/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
new file mode 100644
index 0000000..b4124f0
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/Hosts.java
@@ -0,0 +1,29 @@
+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/fa30a76a/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
new file mode 100644
index 0000000..27c381c
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/IpAddress.java
@@ -0,0 +1,54 @@
+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/fa30a76a/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
new file mode 100644
index 0000000..f43f038
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.java
@@ -0,0 +1,101 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..35f57bb
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.layout.json
@@ -0,0 +1,44 @@
+/**
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..3f91282
Binary files /dev/null and b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObject.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/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
new file mode 100644
index 0000000..5540293
--- /dev/null
+++ b/example/application/neoapp/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -0,0 +1,63 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..fe6f0ac
--- /dev/null
+++ b/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectTest.java
@@ -0,0 +1,51 @@
+/**
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..27b9ac3
--- /dev/null
+++ b/example/application/neoapp/dom/src/test/java/dom/simple/SimpleObjectsTest.java
@@ -0,0 +1,102 @@
+/**
+ * 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/fa30a76a/example/application/neoapp/fixture/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/.gitignore b/example/application/neoapp/fixture/.gitignore
new file mode 100644
index 0000000..128ef84
--- /dev/null
+++ b/example/application/neoapp/fixture/.gitignore
@@ -0,0 +1,2 @@
+/target-ide
+target
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/fixture/pom.xml b/example/application/neoapp/fixture/pom.xml
new file mode 100644
index 0000000..8291deb
--- /dev/null
+++ b/example/application/neoapp/fixture/pom.xml
@@ -0,0 +1,38 @@
+<?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/fa30a76a/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
new file mode 100644
index 0000000..690b7b6
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
@@ -0,0 +1,69 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..2f9be56
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/SimpleObjectsTearDownFixture.java
@@ -0,0 +1,36 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..0edd80b
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectAbstract.java
@@ -0,0 +1,36 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..a59aea4
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBar.java
@@ -0,0 +1,31 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..b71baeb
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForBaz.java
@@ -0,0 +1,31 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..fa3d488
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/objects/SimpleObjectForFoo.java
@@ -0,0 +1,31 @@
+/*
+ * 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/fa30a76a/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
new file mode 100644
index 0000000..c44af4b
--- /dev/null
+++ b/example/application/neoapp/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
@@ -0,0 +1,45 @@
+/*
+ * 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/fa30a76a/example/application/neoapp/integtests/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/.gitignore b/example/application/neoapp/integtests/.gitignore
new file mode 100644
index 0000000..3faa3ab
--- /dev/null
+++ b/example/application/neoapp/integtests/.gitignore
@@ -0,0 +1,3 @@
+/neo4j_DB/
+target
+target-ide
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/logging.properties b/example/application/neoapp/integtests/logging.properties
new file mode 100644
index 0000000..d0b81cb
--- /dev/null
+++ b/example/application/neoapp/integtests/logging.properties
@@ -0,0 +1,103 @@
+# 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
+
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/pom.xml b/example/application/neoapp/integtests/pom.xml
new file mode 100644
index 0000000..da29c47
--- /dev/null
+++ b/example/application/neoapp/integtests/pom.xml
@@ -0,0 +1,122 @@
+<?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-integtests</artifactId>
+ <name>Neo App 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>neoapp-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.core</groupId>
+ <artifactId>isis-core-runtime</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/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/SimpleAppSystemInitializer.java b/example/application/neoapp/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
new file mode 100644
index 0000000..fa67f2a
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
@@ -0,0 +1,72 @@
+/**
+ * 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 org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.integtestsupport.IsisSystemForTest;
+import org.apache.isis.core.runtime.persistence.PersistenceConstants;
+import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
+import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
+
+/**
+ * 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() {
+ withLoggingAt(org.apache.log4j.Level.INFO);
+ with(testConfiguration());
+ with(new DataNucleusPersistenceMechanismInstaller());
+
+ // services annotated with @DomainService
+ withServicesIn( "dom.simple"
+ ,"fixture.simple"
+ ,"org.apache.isis.core.wrapper"
+ ,"org.apache.isis.applib"
+ ,"org.apache.isis.core.metamodel.services"
+ ,"org.apache.isis.core.runtime.services"
+ ,"org.apache.isis.objectstore.jdo.datanucleus.service.support" // IsisJdoSupportImpl
+ ,"org.apache.isis.objectstore.jdo.datanucleus.service.eventbus" // EventBusServiceJdo
+ );
+ }
+
+ private static IsisConfiguration testConfiguration() {
+ final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests();
+
+ // enable stricter checking
+ testConfiguration.put(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, "true");
+
+ testConfiguration.addRegisterEntitiesPackagePrefix("dom");
+ return testConfiguration;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/application/neoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java
new file mode 100644
index 0000000..1950881
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java
@@ -0,0 +1,53 @@
+/**
+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 cucumber.api.java.After;
+import cucumber.api.java.Before;
+import integration.SimpleAppSystemInitializer;
+
+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/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java b/example/application/neoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
new file mode 100644
index 0000000..508a3a0
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java
@@ -0,0 +1,46 @@
+/**
+ * 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.scenario.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/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java b/example/application/neoapp/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
new file mode 100644
index 0000000..50f0a51
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/glue/InMemoryDBForSimpleApp.java
@@ -0,0 +1,40 @@
+/**
+ * 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
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java b/example/application/neoapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java
new file mode 100644
index 0000000..13831ae
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java
@@ -0,0 +1,96 @@
+/**
+ * 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.simple;
+
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.When;
+import dom.simple.SimpleObject;
+import dom.simple.SimpleObjects;
+
+import java.util.List;
+import java.util.UUID;
+import org.hamcrest.Description;
+import org.jmock.Expectations;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+import org.apache.isis.core.specsupport.scenarios.InMemoryDB;
+import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class SimpleObjectGlue extends CukeGlueAbstract {
+
+ @Given("^there are.* (\\d+) simple objects$")
+ public void there_are_N_simple_objects(int n) throws Throwable {
+ if(supportsMocks()) {
+ checking(new Expectations() {
+ {
+ allowing(service(SimpleObjects.class)).listAll();
+ will(returnValue(allSimpleObjects()));
+ }
+ });
+ }
+ try {
+ final List<SimpleObject> findAll = service(SimpleObjects.class).listAll();
+ assertThat(findAll.size(), is(n));
+ putVar("list", "all", findAll);
+
+ } finally {
+ assertMocksSatisfied();
+ }
+ }
+
+ @When("^I create a new simple object$")
+ public void I_create_a_new_simple_object() throws Throwable {
+ if(supportsMocks()) {
+ checking(new Expectations() {
+ {
+ oneOf(service(SimpleObjects.class)).create(with(any(String.class)));
+ will(addToInMemoryDB());
+ }
+ });
+ }
+ service(SimpleObjects.class).create(UUID.randomUUID().toString());
+ }
+
+ private Action addToInMemoryDB() {
+ return new Action() {
+
+ @Override
+ public Object invoke(Invocation invocation) throws Throwable {
+ final InMemoryDB inMemoryDB = getVar("isis", "in-memory-db", InMemoryDB.class);
+ final String name = (String)invocation.getParameter(0);
+ final SimpleObject obj = new SimpleObject();
+ obj.setName(name);
+ inMemoryDB.put(SimpleObject.class, name, obj);
+ return obj;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("add to database");
+ }
+ };
+ }
+
+ // helper
+ private List<SimpleObject> allSimpleObjects() {
+ final InMemoryDB inMemoryDB = getVar("isis", "in-memory-db", InMemoryDB.class);
+ return inMemoryDB.findAll(SimpleObject.class);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/specs/simple/RunSpecs.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/specs/simple/RunSpecs.java b/example/application/neoapp/integtests/src/test/java/integration/specs/simple/RunSpecs.java
new file mode 100644
index 0000000..b4d0913
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/specs/simple/RunSpecs.java
@@ -0,0 +1,38 @@
+/**
+ * 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.specs.simple;
+
+import cucumber.api.junit.Cucumber;
+
+import org.junit.runner.RunWith;
+
+
+/**
+ * Runs scenarios in all <tt>.feature</tt> files (this package and any subpackages).
+ */
+@RunWith(Cucumber.class)
+@Cucumber.Options(
+ format = {
+ "html:target/cucumber-html-report"
+ ,"json:target/cucumber.json"
+ },
+ glue={"classpath:integration.glue"},
+ strict = true,
+ tags = { "~@backlog", "~@ignore" })
+public class RunSpecs {
+ // intentionally empty
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/specs/simple/SimpleObjectSpec_listAllAndCreate.feature
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/specs/simple/SimpleObjectSpec_listAllAndCreate.feature b/example/application/neoapp/integtests/src/test/java/integration/specs/simple/SimpleObjectSpec_listAllAndCreate.feature
new file mode 100644
index 0000000..aa7aeb6
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/specs/simple/SimpleObjectSpec_listAllAndCreate.feature
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+@SimpleObjectsFixture
+Feature: List and Create New Simple Objectts
+
+ # the scenario is listed twice here just to demonstrate that it
+ # can be run either at @unit-level scope (using mocks) or
+ # at @integration-level scope (against the running system).
+
+ @unit
+ Scenario: Existing simple objects can be listed and new ones created
+ Given there are initially 3 simple objects
+ When I create a new simple object
+ Then there are 4 simple objects
+
+
+ @integration
+ Scenario: Existing simple objects can be listed and new ones created
+ Given there are initially 3 simple objects
+ When I create a new simple object
+ Then there are 4 simple objects
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fa30a76a/example/application/neoapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/neoapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java b/example/application/neoapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java
new file mode 100644
index 0000000..634476c
--- /dev/null
+++ b/example/application/neoapp/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.tests;
+
+import integration.SimpleAppSystemInitializer;
+
+import org.junit.BeforeClass;
+import org.apache.isis.core.integtestsupport.IntegrationTestAbstract;
+import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration;
+
+public abstract class SimpleAppIntegTest extends IntegrationTestAbstract {
+
+ @BeforeClass
+ public static void initClass() {
+ org.apache.log4j.PropertyConfigurator.configure("logging.properties");
+ SimpleAppSystemInitializer.initIsft();
+
+ // instantiating will install onto ThreadLocal
+ new ScenarioExecutionForIntegration();
+ }
+
+}