Author: danhaywood
Date: Tue Feb 24 06:40:28 2015
New Revision: 1661851
URL: http://svn.apache.org/r1661851
Log:
fixing references to todoapp
Modified:
isis/site/trunk/content/components/viewers/wicket/brand-logo.md
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
isis/site/trunk/content/core/specsupport-and-integtestsupport.md
isis/site/trunk/content/documentation.md
isis/site/trunk/content/intro/tutorials/apacheconeu-2014.md
isis/site/trunk/content/reference/services/background-service.md
isis/site/trunk/content/reference/services/event-bus-service.md
Modified: isis/site/trunk/content/components/viewers/wicket/brand-logo.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/brand-logo.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/brand-logo.md (original)
+++ isis/site/trunk/content/components/viewers/wicket/brand-logo.md Tue Feb 24
06:40:28 2015
@@ -5,7 +5,7 @@ display a png logo instead.
##Screenshots
-The screenshot below shows the todo application with a 'brand logo' image in
its header:
+The screenshot below shows the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF) with a
'brand logo' image in its header:
Modified:
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
Tue Feb 24 06:40:28 2015
@@ -21,7 +21,7 @@ These customizations should generally be
## Targetting individual members
-For example, the `ToDoItem` object of the Isis addons [ToDo
app](../../../intro/getting-started/quickstart-archetype.html) has a `notes`
property. The HTML for this will be something like:
+For example, the `ToDoItem` object of the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF) has a
`notes` property. The HTML for this will be something like:
<div>
<div class="property ToDoItem-notes">
Modified: isis/site/trunk/content/core/specsupport-and-integtestsupport.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/specsupport-and-integtestsupport.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/core/specsupport-and-integtestsupport.md (original)
+++ isis/site/trunk/content/core/specsupport-and-integtestsupport.md Tue Feb 24
06:40:28 2015
@@ -252,16 +252,16 @@ The [`RunSpecs`](https://github.com/apac
// intentionally empty
}
-The JSON formatter allows integration with enhanced reports, for example as
provided by
[Masterthought.net](http://www.masterthought.net/section/cucumber-reporting)
(screenshots at end of page). (Commented out) configuration for this is
provided in the example todo app `integtests` module's
[pom.xml](https://github.com/apache/isis/blob/master/example/application/todoapp/integtests/pom.xml).
+The JSON formatter allows integration with enhanced reports, for example as
provided by
[Masterthought.net](http://www.masterthought.net/section/cucumber-reporting)
(screenshots at end of page). (Commented out) configuration for this is
provided in the [simpleapp](../intro/getting-started/simpleapp-archetype.html)
`integtests` module's
[pom.xml](https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/pom.xml#L52).
-The bootstrapping of Isis can be moved into a
[`BootstrappingGlue`](https://github.com/apache/isis/blob/master/example/application/todoapp/integtests/src/test/java/integration/glue/BootstrappingGlue.java)
step definition:
+The bootstrapping of Isis can be moved into a
[`BootstrappingGlue`](https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/BootstrappingGlue.java#L26)
step definition:
public class BootstrappingGlue extends CukeGlueAbstract {
@Before(value={"@integration"}, order=100)
public void beforeScenarioIntegrationScope() {
PropertyConfigurator.configure("logging.properties");
- ToDoSystemInitializer.initIsft();
+ SimpleAppSystemInitializer.initIsft();
before(ScenarioExecutionScope.INTEGRATION);
}
@@ -275,85 +275,41 @@ The bootstrapping of Isis can be moved i
// bootstrapping of @unit scope omitted
}
-The fixture to run also lives in its own step definition,
[`CatalogOfFixturesGlue`](https://github.com/apache/isis/blob/master/example/application/todoapp/integtests/src/test/java/integration/glue/CatalogOfFixturesGlue.java):
+The fixture to run also lives in its own step definition,
[`CatalogOfFixturesGlue`](https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java#L24):
public class CatalogOfFixturesGlue extends CukeGlueAbstract {
-
- @Before(value={"@integration", "@ToDoItemsFixture"}, order=20000)
+
+ @Before(value={"@integration", "@SimpleObjectsFixture"}, order=20000)
public void integrationFixtures() throws Throwable {
- scenarioExecution().install(new ToDoItemsFixture());
- }
+ scenarioExecution().install(new RecreateSimpleObjects());
+ }
- // fixture for @unit, @ToDoItemsFixture omitted
-
}
-Note that this is annotated with a tag (`@ToDoItemsFixture`) so that the
correct fixture runs. (We might have a whole variety of these).
+Note that this is annotated with a tag (`@SimpleObjectsFixture`) so that the
correct fixture runs. (We might have a whole variety of these).
-The step definitions pertaining to `ToDoItem` then reside in the
[`ToDoItemGlue`](https://github.com/apache/isis/blob/master/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java)
class. This is where the heavy lifting gets done:
+The step definitions pertaining to `SimpleObject` domain entity then reside in
the
[`SimpleObjectGlue`](https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java#L31)
class. This is where the heavy lifting gets done:
- public class ToDoItemGlue extends CukeGlueAbstract {
-
- @Given("^there are a number of incomplete ToDo items$")
- public void there_are_a_number_of_incomplete_ToDo_items() throws
Throwable {
- final List<ToDoItem> notYetComplete =
service(ToDoItems.class).notYetComplete();
- assertThat(notYetComplete.isEmpty(), is(false));
- putVar("list", "notYetCompleteItems", notYetComplete);
- }
-
- @When("^I choose the first of the incomplete items$")
- public void I_choose_the_first_one() throws Throwable {
- List<ToDoItem> notYetComplete = getVar(null,
"notYetCompleteItems", List.class);
- assertThat(notYetComplete.isEmpty(), is(false));
-
- putVar("todo", "toDoItem", notYetComplete.get(0));
- }
-
- @When("^mark the item as complete$")
- public void mark_it_as_complete() throws Throwable {
- ToDoItem toDoItem = getVar(null, "toDoItem", ToDoItem.class);
- wrap(toDoItem).completed();
- }
-
- @Then("^the item is no longer listed as incomplete$")
- public void the_item_is_no_longer_listed_as_incomplete() throws
Throwable {
- ToDoItem toDoItem = getVar(null, "toDoItem", ToDoItem.class);
- whetherNotYetCompletedContains(toDoItem, false);
- }
-
- @Given("^.*completed .*item$")
- public void a_completed_ToDo_item() throws Throwable {
- final List<ToDoItem> allToDos =
service(ToDoItems.class).allToDos();
- for (ToDoItem toDoItem : allToDos) {
- if(toDoItem.isComplete()) {
- putVar("todo", "toDoItem", toDoItem);
- return;
- }
+ public class SimpleObjectGlue extends CukeGlueAbstract {
+
+ @Given("^there are.* (\\d+) simple objects$")
+ public void there_are_N_simple_objects(int n) throws Throwable {
+ try {
+ final List<SimpleObject> findAll =
service(SimpleObjects.class).listAll();
+ assertThat(findAll.size(), is(n));
+ putVar("list", "all", findAll);
+
+ } finally {
+ assertMocksSatisfied();
}
- Assert.fail("could not locate any completed ToDo items");
- }
-
- @When("^I mark the .*item as not yet complete$")
- public void I_mark_it_as_not_yet_complete() throws Throwable {
- ToDoItem toDoItem = getVar(null, "toDoItem", ToDoItem.class);
- assertThat(toDoItem.isComplete(), is(true));
-
- toDoItem.setComplete(false);
}
-
- @Then("^the .*item is listed as incomplete$")
- public void the_item_is_listed_as_incomplete() throws Throwable {
- ToDoItem toDoItem = getVar(null, "toDoItem", ToDoItem.class);
- whetherNotYetCompletedContains(toDoItem, true);
- }
-
- private void whetherNotYetCompletedContains(ToDoItem toDoItem, final
boolean whetherContained) {
- final List<ToDoItem> notYetComplete =
service(ToDoItems.class).notYetComplete();
- assertThat(notYetComplete.contains(toDoItem),
is(whetherContained));
+
+ @When("^I create a new simple object$")
+ public void I_create_a_new_simple_object() throws Throwable {
+ service(SimpleObjects.class).create(UUID.randomUUID().toString());
}
+
}
-
-If you look at the code in the github repo, you will see that the code is
slightly more complex than this, because it also uses mocks to enable it to run
under `@unit` scope.
## BDD Tooling ##
Modified: isis/site/trunk/content/documentation.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Tue Feb 24 06:40:28 2015
@@ -15,7 +15,7 @@ Title: Documentation
* **[What's Isis?](intro/elevator-pitch/isis-in-pictures.html) ... in
pictures**
* [Common Use Cases](intro/elevator-pitch/common-use-cases.html) <a
href="intro/elevator-pitch/common-use-cases.html#screencast"><img
src="./images/tv_show-25.png"></a>
-* [Online demo](http://isisdemo.mmyco.co.uk/) (ToDo App)
+* [Online demo](http://isisdemo.mmyco.co.uk/) (todoapp)
#### <a name="getting-started">Archetypes and Apps</a>
Modified: isis/site/trunk/content/intro/tutorials/apacheconeu-2014.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/tutorials/apacheconeu-2014.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/intro/tutorials/apacheconeu-2014.md (original)
+++ isis/site/trunk/content/intro/tutorials/apacheconeu-2014.md Tue Feb 24
06:40:28 2015
@@ -208,7 +208,7 @@ In the simpleapp archetype the `SimpleOb
* note the `@DomainService` annotation
* optional: add an action to a return subset of objects
- use `@Query` annotation
- - see for example the todo app, see
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L93)
and
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java#L63)
+ - see for example the Isisaddons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp) (not ASF), see
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L93)
and
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java#L63)
@@ -280,7 +280,7 @@ Domain entities have state: either value
- use
[bigdecimals](http://isis.apache.org/components/objectstores/jdo/mapping-bigdecimals.html)
properties
- use
[blob/clobs](http://isis.apache.org/components/objectstores/jdo/mapping-blobs.html)
properties
- specify whether [optional or
mandatory](http://isis.apache.org/components/objectstores/jdo/mapping-mandatory-and-optional-properties.html)
- - enums (eg as used in the example Todo app, see
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L207)
and
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L266)
+ - enums (eg as used in the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp) (not ASF), see
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L207)
and
[here](https://github.com/apache/isis/blob/b3e936c9aae28754fb46c2df52b1cb9b023f9ab8/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java#L266)
* update the corresponding domain service for creating new instances
- for all non-optional properties will either need to prompt for a value, or
calculate some suitable default
* change the implementation of title, if need be
Modified: isis/site/trunk/content/reference/services/background-service.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/reference/services/background-service.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/reference/services/background-service.md (original)
+++ isis/site/trunk/content/reference/services/background-service.md Tue Feb 24
06:40:28 2015
@@ -232,16 +232,6 @@ and the entry in `web.xml` for the Quart
</servlet>
-
-<!--
-All of this stuff is configured in the example todo app, found on github (as
of Isis 1.5.0):
-
-*
[BackgroundCommandExecutionQuartzJob](https://github.com/apache/isis/blob/isis-1.5.0/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java)
-*
[AbstractIsisQuartzJob](https://github.com/apache/isis/blob/isis-1.5.0/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java)
-*
[quartz-config.xml](https://github.com/apache/isis/blob/isis-1.5.0/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz-config.xml)
-*
[quartz.properties](https://github.com/apache/isis/blob/isis-1.5.0/example/application/quickstart_wicket_restful_jdo/webapp/src/main/resources/webapp/scheduler/quartz.properties)
-*
[web.xml](https://github.com/apache/isis/blob/isis-1.5.0/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L308)
--->
## Registering the Services
Modified: isis/site/trunk/content/reference/services/event-bus-service.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/reference/services/event-bus-service.md?rev=1661851&r1=1661850&r2=1661851&view=diff
==============================================================================
--- isis/site/trunk/content/reference/services/event-bus-service.md (original)
+++ isis/site/trunk/content/reference/services/event-bus-service.md Tue Feb 24
06:40:28 2015
@@ -44,7 +44,7 @@ The event class that is raised can be sp
* `@PostsCollectionAddedToEvent`/`@PostsCollectionRemovedFromEvent`
* `@PostsActionInvokedEvent`
-For example, in the todo app a custom event is raised when an item is
completed:
+For example, in the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF) a custom
event is raised when an item is completed:
public static class CompletedEvent extends AbstractActionDomainEvent {
private static final long serialVersionUID = 1L;
