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 2014/10/19 13:06:10 UTC
[12/24] git commit: ISIS-872: updates to todoapp prior to recreating
archetype
ISIS-872: updates to todoapp prior to recreating archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/66e02d87
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/66e02d87
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/66e02d87
Branch: refs/heads/master
Commit: 66e02d87cfe856f66ec94a61b8bc0e74929cae91
Parents: 8ad38ef
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:44:26 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:44:26 2014 +0100
----------------------------------------------------------------------
.../todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 9 +--------
example/application/todoapp/pom.xml | 7 ++++---
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/66e02d87/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index 88e58e8..501a989 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -92,8 +92,6 @@ import org.apache.isis.applib.value.Clob;
+ "description.indexOf(:description) >= 0")
})
@ObjectType("TODO")
-@Audited
-@PublishedObject(ToDoItemChangedPayloadFactory.class)
@AutoComplete(repository=ToDoItems.class, action="autoComplete") // default unless overridden by autoCompleteNXxx() method
//@Bounded - if there were a small number of instances only (overrides autoComplete functionality)
@Bookmarkable
@@ -292,8 +290,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(CompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem completed() {
setComplete(true);
@@ -320,8 +316,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(NoLongerCompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem notYetCompleted() {
setComplete(false);
@@ -493,7 +487,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
getDependencies().remove(toDoItem);
}
- @PublishedAction
public ToDoItem add(
@TypicalLength(20)
final ToDoItem toDoItem) {
@@ -625,7 +618,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@Prototype
@ActionSemantics(Of.SAFE)
public URL openSourceCodeOnGithub() throws MalformedURLException {
- return new URL("https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java");
+ return new URL("https://github.com/apache/isis/tree/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java");
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/66e02d87/example/application/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/pom.xml b/example/application/todoapp/pom.xml
index 5baf393..71d4579 100644
--- a/example/application/todoapp/pom.xml
+++ b/example/application/todoapp/pom.xml
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0-SNAPSHOT</isis.version>
- <isis-viewer-wicket.version>1.7.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis.version>1.7.0</isis.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
@@ -205,7 +205,8 @@
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>**/*.launch</exclude>
+ <exclude>**/ide/eclipse/launch/**</exclude>
+ <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/rebel.xml</exclude>