ISIS-928: recreating todoapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9ca64d3f Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9ca64d3f Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9ca64d3f Branch: refs/heads/master Commit: 9ca64d3f899f31023517b057940f2cfed8066273 Parents: b3e936c Author: Dan Haywood <[email protected]> Authored: Sat Nov 15 10:26:53 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Sat Nov 15 10:26:53 2014 +0000 ---------------------------------------------------------------------- .../dom/src/main/java/app/ToDoAppDashboard.java | 1 - .../dom/src/main/java/app/ToDoItemAnalysis.java | 8 +++++- .../java/app/ToDoItemAnalysisContributions.java | 6 ++++- .../java/app/ToDoItemsByCategoryViewModel.java | 7 ++++- .../java/app/ToDoItemsByDateRangeViewModel.java | 17 ++++++------ .../dom/src/main/java/dom/todo/ToDoItem.java | 27 ++++++++++++++++++-- .../java/dom/todo/ToDoItemContributions.java | 11 +++++++- .../java/dom/todo/ToDoItemSubscriptions.java | 8 +++++- .../dom/src/main/java/dom/todo/ToDoItems.java | 11 +++++++- .../src/test/java/dom/todo/ToDoItemTest.java | 4 ++- .../fixture/todo/ToDoItemsFixturesService.java | 9 ++++++- .../integration/glue/BootstrappingGlue.java | 5 +--- .../integration/glue/CatalogOfFixturesGlue.java | 1 - .../integration/glue/todoitem/ToDoItemGlue.java | 21 ++++++--------- .../integration/tests/ToDoItemIntegTest.java | 13 ++++++++-- .../integration/tests/ToDoItemsIntegTest.java | 1 - .../prototyping/ExternalLinksService.java | 8 ++++-- .../projects/basic/archetype.properties | 2 +- 18 files changed, 116 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java index 641c06d..0acc34c 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java @@ -22,7 +22,6 @@ package app; import java.util.List; - import org.apache.isis.applib.AbstractViewModel; import org.apache.isis.applib.annotation.Disabled; import org.apache.isis.applib.annotation.Named; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java index fdf23e3..3b9d96b 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java @@ -29,8 +29,14 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +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.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Programmatic; @Named("Analysis") @DomainService(menuOrder = "20") http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java index 21ed821..aad7519 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java @@ -23,9 +23,13 @@ package app; import dom.todo.ToDoItem; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.NotContributed; import org.apache.isis.applib.annotation.NotContributed.As; +import org.apache.isis.applib.annotation.NotInServiceMenu; @DomainService @Hidden http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java index 6eddbc8..4b77658 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java @@ -33,8 +33,13 @@ import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.MultiLine; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Render; import org.apache.isis.applib.annotation.Render.Type; +import org.apache.isis.applib.annotation.Title; +import org.apache.isis.applib.annotation.ViewModel; import org.apache.isis.applib.util.ObjectContracts; @Named("By Category") http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java index 3523f8a..81b2bd0 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java @@ -21,23 +21,22 @@ */ package app; -import java.util.List; - import app.ToDoItemAnalysis.DateRange; +import dom.todo.ToDoItem; +import dom.todo.ToDoItems; +import java.util.List; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - -import dom.todo.ToDoItem; -import dom.todo.ToDoItems; - import org.joda.time.DateTime; - -import org.apache.isis.applib.AbstractViewModel; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Render; import org.apache.isis.applib.annotation.Render.Type; +import org.apache.isis.applib.annotation.Title; +import org.apache.isis.applib.annotation.ViewModel; import org.apache.isis.applib.services.clock.ClockService; import org.apache.isis.applib.util.ObjectContracts; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java index 74a84f1..7166451 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java @@ -24,7 +24,13 @@ package dom.todo; import java.math.BigDecimal; import java.net.MalformedURLException; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import javax.jdo.JDOHelper; import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.VersionStrategy; @@ -36,10 +42,27 @@ import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.Identifier; import org.apache.isis.applib.NonRecoverableException; import org.apache.isis.applib.RecoverableException; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionInteraction; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.AutoComplete; +import org.apache.isis.applib.annotation.Bookmarkable; +import org.apache.isis.applib.annotation.Bulk; import org.apache.isis.applib.annotation.Bulk.AppliesTo; import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs; +import org.apache.isis.applib.annotation.CollectionInteraction; +import org.apache.isis.applib.annotation.Disabled; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.MinLength; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.ObjectType; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.PropertyInteraction; +import org.apache.isis.applib.annotation.Prototype; +import org.apache.isis.applib.annotation.RegEx; +import org.apache.isis.applib.annotation.SortedBy; +import org.apache.isis.applib.annotation.TypicalLength; import org.apache.isis.applib.security.UserMemento; import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; import org.apache.isis.applib.services.eventbus.EventBusService; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemContributions.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemContributions.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemContributions.java index 51ce968..f0aea7a 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemContributions.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemContributions.java @@ -33,9 +33,18 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import org.joda.time.LocalDate; import org.apache.isis.applib.AbstractFactoryAndRepository; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.DescribedAs; +import org.apache.isis.applib.annotation.Disabled; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.Hidden; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.NotContributed; import org.apache.isis.applib.annotation.NotContributed.As; +import org.apache.isis.applib.annotation.NotInServiceMenu; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.query.QueryDefault; import org.apache.isis.applib.services.queryresultscache.QueryResultsCache; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java index fe641f5..8c349e4 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java @@ -32,7 +32,13 @@ import com.google.common.eventbus.Subscribe; import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.NonRecoverableException; import org.apache.isis.applib.RecoverableException; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.NotContributed; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.Prototype; import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; import org.apache.isis.applib.services.eventbus.CollectionInteractionEvent; import org.apache.isis.applib.services.eventbus.EventBusService; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java index 8ed6957..67dcd23 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java @@ -29,8 +29,17 @@ import java.util.List; import com.google.common.base.Predicates; import org.joda.time.LocalDate; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.applib.annotation.*; +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.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.annotation.Prototype; +import org.apache.isis.applib.annotation.RegEx; import org.apache.isis.applib.query.QueryDefault; import org.apache.isis.applib.services.clock.ClockService; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoItemTest.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoItemTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoItemTest.java index 5020190..1af588b 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoItemTest.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoItemTest.java @@ -28,7 +28,9 @@ import org.apache.isis.applib.services.eventbus.EventBusService; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; public abstract class ToDoItemTest { http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java index 0396bba..f85d122 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java @@ -24,7 +24,14 @@ package fixture.todo; import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent; import java.util.List; -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DescribedAs; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.MultiLine; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Optional; +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; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java index f800e25..f621ec1 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/BootstrappingGlue.java @@ -19,12 +19,9 @@ */ package integration.glue; -import integration.ToDoSystemInitializer; import cucumber.api.java.After; import cucumber.api.java.Before; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import integration.ToDoSystemInitializer; 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/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java index e1b2704..ca6d940 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java @@ -22,7 +22,6 @@ package integration.glue; import cucumber.api.java.Before; import dom.todo.ToDoItem; import fixture.todo.integtests.ToDoItemsIntegTestFixture; -import fixture.todo.scenarios.RecreateToDoItemsAndCompleteSeveralForCurrent; import org.apache.isis.core.specsupport.scenarios.InMemoryDB; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java index 63678e1..9b73ad7 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java @@ -19,32 +19,27 @@ */ package integration.glue.todoitem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -import java.util.Collections; -import java.util.List; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; import dom.todo.ToDoItem; import dom.todo.ToDoItems; +import java.util.List; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.jmock.Expectations; import org.junit.Assert; - import org.apache.isis.applib.annotation.Bulk; -import org.apache.isis.applib.annotation.Bulk.InteractionContext; import org.apache.isis.applib.services.eventbus.EventBusService; 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 ToDoItemGlue extends CukeGlueAbstract { @Given("^there are a number of incomplete ToDo items${symbol_dollar}") http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java index 90bb098..e40a39c 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java @@ -47,10 +47,19 @@ import org.apache.isis.applib.RecoverableException; import org.apache.isis.applib.clock.Clock; import org.apache.isis.applib.fixturescripts.FixtureScripts; import org.apache.isis.applib.services.clock.ClockService; -import org.apache.isis.applib.services.eventbus.*; +import org.apache.isis.applib.services.eventbus.AbstractInteractionEvent; +import org.apache.isis.applib.services.eventbus.ActionInteractionEvent; +import org.apache.isis.applib.services.eventbus.CollectionInteractionEvent; +import org.apache.isis.applib.services.eventbus.EventBusService; +import org.apache.isis.applib.services.eventbus.PropertyInteractionEvent; import org.apache.isis.applib.value.Blob; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java index 7f8d2a6..203cdfe 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java @@ -30,7 +30,6 @@ import javax.inject.Inject; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; - import org.apache.isis.applib.fixturescripts.FixtureScripts; import static org.hamcrest.CoreMatchers.is; http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java index 7697ea8..d36ae2a 100644 --- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java +++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java @@ -21,9 +21,13 @@ package webapp.prototyping; import java.net.MalformedURLException; import java.net.URL; - -import org.apache.isis.applib.annotation.*; +import org.apache.isis.applib.annotation.ActionSemantics; import org.apache.isis.applib.annotation.ActionSemantics.Of; +import org.apache.isis.applib.annotation.CssClassFa; +import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.Prototype; @DomainService(menuOrder = "40.3") public class ExternalLinksService { http://git-wip-us.apache.org/repos/asf/isis/blob/9ca64d3f/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties index dc3a9c1..ab81106 100644 --- a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Sat Nov 15 10:10:48 GMT 2014 +#Sat Nov 15 10:26:47 GMT 2014 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
