ISIS-928: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0d9b74aa Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0d9b74aa Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0d9b74aa Branch: refs/heads/master Commit: 0d9b74aa5c90864f39b18a92089714b48e8e0e69 Parents: 9ca64d3 Author: Dan Haywood <[email protected]> Authored: Sat Nov 15 10:30:02 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Sat Nov 15 10:30:02 2014 +0000 ---------------------------------------------------------------------- .../dom/src/main/java/dom/simple/SimpleObjects.java | 1 - .../src/test/java/dom/simple/SimpleObjectTest_name.java | 6 +++--- .../test/java/dom/simple/SimpleObjectsTest_create.java | 12 ++++++------ .../test/java/dom/simple/SimpleObjectsTest_listAll.java | 9 +++------ .../test/java/integration/glue/BootstrappingGlue.java | 2 +- .../java/integration/glue/simple/SimpleObjectGlue.java | 12 +++++------- .../test/java/integration/tests/SimpleAppIntegTest.java | 1 - .../webapp/src/main/java/webapp/SimpleApplication.java | 1 - .../test/resources/projects/basic/archetype.properties | 2 +- 9 files changed, 19 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java index b8f69c3..9243652 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java @@ -22,7 +22,6 @@ 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; http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java index f9704da..f1749ef 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java @@ -19,13 +19,13 @@ */ 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; -import org.junit.Before; -import org.junit.Test; - public class SimpleObjectTest_name { private SimpleObject simpleObject; http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java index e2bf17f..7995839 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java @@ -19,18 +19,18 @@ */ package dom.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; 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_create { http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java index 2b928ad..b3fd77e 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_listAll.java @@ -19,23 +19,20 @@ */ package dom.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - import java.util.List; - import com.google.common.collect.Lists; - import org.jmock.Expectations; import org.jmock.auto.Mock; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + public class SimpleObjectsTest_listAll { @Rule http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java index 711adc6..545114d 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java @@ -19,9 +19,9 @@ O * Licensed to the Apache Software Foundation (ASF) under one or more */ package integration.glue; -import integration.SimpleAppSystemInitializer; 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; http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java index ccfc9ec..9e93a2e 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/simple/SimpleObjectGlue.java @@ -19,25 +19,23 @@ */ package integration.glue.simple; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.List; -import java.util.UUID; - 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.* (${symbol_escape}${symbol_escape}d+) simple objects${symbol_dollar}") http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java index 98c61b8..38d0ffe 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/SimpleAppIntegTest.java @@ -24,7 +24,6 @@ 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; http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java index a747bc0..6cda6fd 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java @@ -43,7 +43,6 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; import org.apache.wicket.request.http.WebRequest; - import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication; import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis; http://git-wip-us.apache.org/repos/asf/isis/blob/0d9b74aa/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties index 516b48a..1046b2e 100644 --- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Sat Nov 15 10:09:48 GMT 2014 +#Sat Nov 15 10:29:53 GMT 2014 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
