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/05/18 08:03:14 UTC
[1/2] isis git commit: ISIS-1133: minor simplifications to the
simpleapp, noted while writing docs; optimizing imports
Repository: isis
Updated Branches:
refs/heads/master 6176226b6 -> 332988f74
ISIS-1133: minor simplifications to the simpleapp, noted while writing docs; optimizing imports
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5eda0ca2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5eda0ca2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5eda0ca2
Branch: refs/heads/master
Commit: 5eda0ca2ee15baded4dfc0b6b1ec790bcf33a9fb
Parents: 6176226
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 18 06:50:52 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 18 06:56:51 2015 +0100
----------------------------------------------------------------------
.../fixture-scripts/prototyping-menu.png | Bin 48699 -> 0 bytes
.../fixturescripts/SimpleFixtureScript.java | 55 -------------------
.../dom/app/homepage/HomePageViewModel.java | 7 ++-
.../dom/modules/simple/SimpleObject.java | 1 +
.../dom/modules/simple/SimpleObjects.java | 1 +
.../dom/modules/simple/SimpleObjectTest.java | 2 -
.../dom/modules/simple/SimpleObjectsTest.java | 4 +-
.../fixture/DomainAppFixturesService.java | 8 +--
.../modules/simple/SimpleObjectCreate.java | 8 +--
.../scenarios/RecreateSimpleObjects.java | 10 ++--
.../integtests/specglue/BootstrappingGlue.java | 6 +-
.../specglue/CatalogOfFixturesGlue.java | 4 +-
.../modules/simple/SimpleObjectGlue.java | 10 ++--
.../domainapp/integtests/specs/RunSpecs.java | 4 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 2 +-
.../modules/simple/SimpleObjectIntegTest.java | 2 -
.../domainapp/webapp/SimpleApplication.java | 14 +++--
.../fixture/DomainAppFixturesService.java | 8 +--
.../modules/simple/SimpleObjectCreate.java | 8 +--
.../scenarios/RecreateSimpleObjects.java | 10 ++--
.../bootstrap/SimpleAppSystemInitializer.java | 3 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 2 +-
.../integtests/tests/SimpleAppIntegTest.java | 7 ++-
.../modules/simple/SimpleObjectIntegTest.java | 19 +------
.../modules/simple/SimpleObjectsIntegTest.java | 16 ++----
.../projects/basic/archetype.properties | 2 +-
26 files changed, 75 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/adocs/documentation/src/main/asciidoc/user-guide/images/testing/fixture-scripts/prototyping-menu.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/images/testing/fixture-scripts/prototyping-menu.png b/adocs/documentation/src/main/asciidoc/user-guide/images/testing/fixture-scripts/prototyping-menu.png
deleted file mode 100644
index d9e111c..0000000
Binary files a/adocs/documentation/src/main/asciidoc/user-guide/images/testing/fixture-scripts/prototyping-menu.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
deleted file mode 100644
index db11683..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.applib.fixturescripts;
-
-import org.apache.isis.applib.annotation.DomainObjectLayout;
-
-@DomainObjectLayout(named="Simple Script")
-public abstract class SimpleFixtureScript extends FixtureScript {
-
- private static Discoverability defaultDiscoverability() {
- return Discoverability.NON_DISCOVERABLE;
- }
-
- /**
- * Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture, with
- * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
- *
- * <p>
- * Use {@link #withDiscoverability(Discoverability)} to override.
- */
- public SimpleFixtureScript() {
- this(null, null);
- }
-
- /**
- * Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture.
- *
- * <p>
- * Use {@link #withDiscoverability(Discoverability)} to override.
- *
- * @param friendlyName - if null, will be derived from class name
- * @param localName - if null, will be derived from class name
- */
- public SimpleFixtureScript(final String friendlyName, final String localName) {
- super(friendlyName, localName, defaultDiscoverability());
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
index 836c70e..83015d0 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
@@ -18,12 +18,13 @@
*/
package domainapp.dom.app.homepage;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.dom.modules.simple.SimpleObjects;
-
import java.util.List;
+
import org.apache.isis.applib.annotation.ViewModel;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
+
@ViewModel
public class HomePageViewModel {
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
index 546f433..1800e52 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
@@ -20,6 +20,7 @@ package domainapp.dom.modules.simple;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
+
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
index d0841ae..0634dd1 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
@@ -19,6 +19,7 @@
package domainapp.dom.modules.simple;
import java.util.List;
+
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
index 78cefc5..e29b3f2 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -19,8 +19,6 @@ package domainapp.dom.modules.simple;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
index 3be73c9..a41d25a 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -17,18 +17,20 @@
package domainapp.dom.modules.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.assertj.core.api.Assertions.assertThat;
public class SimpleObjectsTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
index 8d63c63..6048e1f 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
@@ -18,9 +18,8 @@
*/
package domainapp.fixture;
-import domainapp.fixture.scenarios.RecreateSimpleObjects;
-
import java.util.List;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
@@ -30,7 +29,8 @@ import org.apache.isis.applib.annotation.RestrictTo;
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;
+
+import domainapp.fixture.scenarios.RecreateSimpleObjects;
/**
* Enables fixtures to be installed from the application.
@@ -49,7 +49,7 @@ public class DomainAppFixturesService extends FixtureScripts {
@Override
public FixtureScript default0RunFixtureScript() {
- return findFixtureScriptFor(SimpleFixtureScript.class);
+ return findFixtureScriptFor(RecreateSimpleObjects.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
index 3f82072..926217d 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
@@ -19,11 +19,11 @@
package domainapp.fixture.modules.simple;
-import domainapp.dom.modules.simple.SimpleObjects;
-import domainapp.dom.modules.simple.SimpleObject;
-
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
+
public class SimpleObjectCreate extends FixtureScript {
//region > name (input)
@@ -59,7 +59,7 @@ public class SimpleObjectCreate extends FixtureScript {
String name = checkParam("name", ec, String.class);
- this.simpleObject = simpleObjects.create(name);
+ this.simpleObject = wrap(simpleObjects).create(name);
// also make available to UI
ec.addResult(this, simpleObject);
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index f272e57..072769e 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -19,16 +19,18 @@
package domainapp.fixture.scenarios;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
-import domainapp.fixture.modules.simple.SimpleObjectCreate;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import com.google.common.collect.Lists;
+
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.fixture.modules.simple.SimpleObjectCreate;
+import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
+
public class RecreateSimpleObjects extends FixtureScript {
public final List<String> NAMES = Collections.unmodifiableList(Arrays.asList(
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
index 3e27e9b..b175d47 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
@@ -16,13 +16,13 @@ O * Licensed to the Apache Software Foundation (ASF) under one or more
*/
package domainapp.integtests.specglue;
+import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
+import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+
import cucumber.api.java.After;
import cucumber.api.java.Before;
import domainapp.integtests.bootstrap.SimpleAppSystemInitializer;
-import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
public class BootstrappingGlue extends CukeGlueAbstract {
@Before(value={"@integration"}, order=100)
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
index f2d12c2..a2d5c89 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
@@ -16,11 +16,11 @@
*/
package domainapp.integtests.specglue;
+import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+
import cucumber.api.java.Before;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
public class CatalogOfFixturesGlue extends CukeGlueAbstract {
@Before(value={"@integration", "@SimpleObjectsFixture"}, order=20000)
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
index b98d0f4..63d96bd 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
@@ -16,15 +16,15 @@
*/
package domainapp.integtests.specglue.modules.simple;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.When;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.dom.modules.simple.SimpleObjects;
-
import java.util.List;
import java.util.UUID;
+
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.When;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
index d19cb37..910b5a8 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
@@ -16,11 +16,11 @@
*/
package domainapp.integtests.specs;
+import org.junit.runner.RunWith;
+
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
/**
* Runs scenarios in all <tt>.feature</tt> files (this package and any subpackages).
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
index 88f26e6..346aa25 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
@@ -15,7 +15,7 @@
# limitations under the License.
#
@SimpleObjectsFixture
-Feature: List and Create New Simple Objectts
+Feature: List and Create New Simple Objects
@integration
Scenario: Existing simple objects can be listed and new ones created
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
index 5b8b6a0..610136b 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
@@ -58,10 +58,8 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
@Test
public void accessible() throws Exception {
-
// when
final String name = simpleObjectWrapped.getName();
- //
// then
assertThat(name).isEqualTo(fs.NAMES.get(0));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApplication.java b/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
index db45790..57d1e0b 100644
--- a/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
+++ b/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
@@ -18,16 +18,13 @@
*/
package domainapp.webapp;
-import de.agilecoders.wicket.core.Bootstrap;
-import de.agilecoders.wicket.core.settings.IBootstrapSettings;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
+
import com.google.common.base.Joiner;
import com.google.common.io.Resources;
import com.google.inject.AbstractModule;
@@ -35,14 +32,21 @@ import com.google.inject.Module;
import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
+
import org.apache.wicket.Session;
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;
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
+
/**
* As specified in <tt>web.xml</tt>.
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
index 6c89c64..1cc395d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
@@ -21,9 +21,8 @@
*/
package domainapp.fixture;
-import domainapp.fixture.scenarios.RecreateSimpleObjects;
-
import java.util.List;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
@@ -33,7 +32,8 @@ import org.apache.isis.applib.annotation.RestrictTo;
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;
+
+import domainapp.fixture.scenarios.RecreateSimpleObjects;
/**
* Enables fixtures to be installed from the application.
@@ -52,7 +52,7 @@ public class DomainAppFixturesService extends FixtureScripts {
@Override
public FixtureScript default0RunFixtureScript() {
- return findFixtureScriptFor(SimpleFixtureScript.class);
+ return findFixtureScriptFor(RecreateSimpleObjects.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
index a970d0d..d7fa90e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
@@ -22,11 +22,11 @@
package domainapp.fixture.modules.simple;
-import domainapp.dom.modules.simple.SimpleObjects;
-import domainapp.dom.modules.simple.SimpleObject;
-
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
+
public class SimpleObjectCreate extends FixtureScript {
//region > name (input)
@@ -62,7 +62,7 @@ public class SimpleObjectCreate extends FixtureScript {
String name = checkParam("name", ec, String.class);
- this.simpleObject = simpleObjects.create(name);
+ this.simpleObject = wrap(simpleObjects).create(name);
// also make available to UI
ec.addResult(this, simpleObject);
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index 1161437..07f1eee 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -22,16 +22,18 @@
package domainapp.fixture.scenarios;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
-import domainapp.fixture.modules.simple.SimpleObjectCreate;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import com.google.common.collect.Lists;
+
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.fixture.modules.simple.SimpleObjectCreate;
+import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
+
public class RecreateSimpleObjects extends FixtureScript {
public final List<String> NAMES = Collections.unmodifiableList(Arrays.asList(
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java
index fcf53cc..0d3b7dd 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java
@@ -22,12 +22,11 @@
package domainapp.integtests.bootstrap;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.integtestsupport.IntegrationTestAbstract;
import org.apache.isis.core.integtestsupport.IsisSystemForTest;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
-public class SimpleAppSystemInitializer extends IntegrationTestAbstract {
+public class SimpleAppSystemInitializer {
public static void initIsft() {
IsisSystemForTest isft = IsisSystemForTest.getElseNull();
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
index 88f26e6..346aa25 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/modules/simple/SimpleObjectSpec_listAllAndCreate.feature
@@ -15,7 +15,7 @@
# limitations under the License.
#
@SimpleObjectsFixture
-Feature: List and Create New Simple Objectts
+Feature: List and Create New Simple Objects
@integration
Scenario: Existing simple objects can be listed and new ones created
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/SimpleAppIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/SimpleAppIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/SimpleAppIntegTest.java
index 440391b..ee8651b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/SimpleAppIntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/SimpleAppIntegTest.java
@@ -21,19 +21,20 @@
*/
package domainapp.integtests.tests;
-import domainapp.integtests.bootstrap.SimpleAppSystemInitializer;
-
import org.junit.BeforeClass;
+
import org.apache.isis.core.integtestsupport.IntegrationTestAbstract;
import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration;
+import domainapp.integtests.bootstrap.SimpleAppSystemInitializer;
+
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();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
index fc79389..773b421 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
@@ -22,35 +22,24 @@
package domainapp.integtests.tests.modules.simple;
import javax.inject.Inject;
+
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
+
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.InvalidException;
+
import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.dom.modules.simple.SimpleObjects;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectIntegTest extends SimpleAppIntegTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Inject
FixtureScripts fixtureScripts;
- @Inject
- SimpleObjects simpleObjects;
- @Inject
- TranslationService translationService;
RecreateSimpleObjects fs;
SimpleObject simpleObjectPojo;
@@ -72,10 +61,8 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
@Test
public void accessible() throws Exception {
-
// when
final String name = simpleObjectWrapped.getName();
- //
// then
assertThat(name).isEqualTo(fs.NAMES.get(0));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
index 75840e6..4e0925d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
@@ -23,36 +23,32 @@ package domainapp.integtests.tests.modules.simple;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.List;
+
import javax.inject.Inject;
+
import com.google.common.base.Throwables;
+
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.apache.isis.applib.DomainObjectContainer;
+
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
+
import domainapp.dom.modules.simple.SimpleObject;
import domainapp.dom.modules.simple.SimpleObjects;
import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
-import static org.hamcrest.CoreMatchers.is;
import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Inject
FixtureScripts fixtureScripts;
@Inject
SimpleObjects simpleObjects;
- @Inject
- DomainObjectContainer container;
public static class ListAll extends SimpleObjectsIntegTest {
@@ -119,7 +115,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
nextTransaction();
// then
- expectedException.expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class));
+ expectedExceptions.expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class));
// when
wrap(simpleObjects).create("Faz");
http://git-wip-us.apache.org/repos/asf/isis/blob/5eda0ca2/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 b52d0ba..33f3793 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 @@
-#Fri May 01 16:12:50 BST 2015
+#Mon May 18 06:50:43 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[2/2] isis git commit: ISIS-1052: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-1052: 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/332988f7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/332988f7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/332988f7
Branch: refs/heads/master
Commit: 332988f743daab8697a9e34ee4b7b5ff91248918
Parents: 5eda0ca
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 18 06:57:20 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 18 06:57:20 2015 +0100
----------------------------------------------------------------------
.../domainapp/dom/app/homepage/HomePageViewModel.java | 7 ++++---
.../domainapp/dom/modules/simple/SimpleObject.java | 1 +
.../domainapp/dom/modules/simple/SimpleObjects.java | 1 +
.../dom/modules/simple/SimpleObjectTest.java | 2 --
.../dom/modules/simple/SimpleObjectsTest.java | 4 +++-
.../integtests/specglue/BootstrappingGlue.java | 6 +++---
.../integtests/specglue/CatalogOfFixturesGlue.java | 4 ++--
.../specglue/modules/simple/SimpleObjectGlue.java | 10 +++++-----
.../java/domainapp/integtests/specs/RunSpecs.java | 4 ++--
.../main/java/domainapp/webapp/SimpleApplication.java | 14 +++++++++-----
.../resources/projects/basic/archetype.properties | 2 +-
11 files changed, 31 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
index ddf36fd..53ab48b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.java
@@ -21,12 +21,13 @@
*/
package domainapp.dom.app.homepage;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.dom.modules.simple.SimpleObjects;
-
import java.util.List;
+
import org.apache.isis.applib.annotation.ViewModel;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
+
@ViewModel
public class HomePageViewModel {
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
index e2cd264..6875727 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java
@@ -23,6 +23,7 @@ package domainapp.dom.modules.simple;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
+
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
index 049f292..741cce0 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
@@ -22,6 +22,7 @@
package domainapp.dom.modules.simple;
import java.util.List;
+
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
index d609568..d211eec 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -22,8 +22,6 @@ package domainapp.dom.modules.simple;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
index 75b5eff..a9d4c65 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -20,18 +20,20 @@
package domainapp.dom.modules.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.assertj.core.api.Assertions.assertThat;
public class SimpleObjectsTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
index 0b2807d..aeeadd8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java
@@ -19,13 +19,13 @@ O * Licensed to the Apache Software Foundation (ASF) under one or more
*/
package domainapp.integtests.specglue;
+import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
+import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+
import cucumber.api.java.After;
import cucumber.api.java.Before;
import domainapp.integtests.bootstrap.SimpleAppSystemInitializer;
-import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
public class BootstrappingGlue extends CukeGlueAbstract {
@Before(value={"@integration"}, order=100)
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
index 1ece7f1..afc04e2 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java
@@ -19,11 +19,11 @@
*/
package domainapp.integtests.specglue;
+import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+
import cucumber.api.java.Before;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
-import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
-
public class CatalogOfFixturesGlue extends CukeGlueAbstract {
@Before(value={"@integration", "@SimpleObjectsFixture"}, order=20000)
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
index cdaa2c5..791d856 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java
@@ -19,15 +19,15 @@
*/
package domainapp.integtests.specglue.modules.simple;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.When;
-import domainapp.dom.modules.simple.SimpleObject;
-import domainapp.dom.modules.simple.SimpleObjects;
-
import java.util.List;
import java.util.UUID;
+
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.When;
+import domainapp.dom.modules.simple.SimpleObject;
+import domainapp.dom.modules.simple.SimpleObjects;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
index eb10242..4a1fd9b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
@@ -19,11 +19,11 @@
*/
package domainapp.integtests.specs;
+import org.junit.runner.RunWith;
+
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
/**
* Runs scenarios in all <tt>.feature</tt> files (this package and any subpackages).
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/SimpleApplication.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
index 7adf884..ae67547 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/SimpleApplication.java
@@ -21,16 +21,13 @@
*/
package domainapp.webapp;
-import de.agilecoders.wicket.core.Bootstrap;
-import de.agilecoders.wicket.core.settings.IBootstrapSettings;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
-import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
+
import com.google.common.base.Joiner;
import com.google.common.io.Resources;
import com.google.inject.AbstractModule;
@@ -38,14 +35,21 @@ import com.google.inject.Module;
import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
+
import org.apache.wicket.Session;
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;
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
+import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
+
/**
* As specified in <tt>web.xml</tt>.
http://git-wip-us.apache.org/repos/asf/isis/blob/332988f7/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 33f3793..9e4742c 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 @@
-#Mon May 18 06:50:43 BST 2015
+#Mon May 18 06:57:14 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it