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/06/18 01:27:10 UTC
[1/2] git commit: ISIS-812: fix for PostgreSQL blob handling (for
null blobs)
Repository: isis
Updated Branches:
refs/heads/master 016bd824e -> e12f27463
ISIS-812: fix for PostgreSQL blob handling (for null blobs)
(making change to archetype in line with fix to ToDoItem archetype)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9320271a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9320271a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9320271a
Branch: refs/heads/master
Commit: 9320271af2c66bebb88c69cacfeb357aed849ac0
Parents: 016bd82
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 18 00:20:30 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 18 00:20:30 2014 +0100
----------------------------------------------------------------------
.../archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9320271a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
index aa2adc1..7c58d7c 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
@@ -140,7 +140,7 @@ public class ToDoItems {
public ToDoItem newToDo(
final @RegEx(validation = "${symbol_escape}${symbol_escape}w[@&:${symbol_escape}${symbol_escape}-${symbol_escape}${symbol_escape},${symbol_escape}${symbol_escape}.${symbol_escape}${symbol_escape}+ ${symbol_escape}${symbol_escape}w]*") @Named("Description") String description,
final @Named("Category") Category category,
- final @Named("Subcategory") Subcategory subcategory,
+ final @Optional @Named("Subcategory") Subcategory subcategory,
final @Optional @Named("Due by") LocalDate dueBy,
final @Optional @Named("Cost") BigDecimal cost) {
return newToDo(description, category, subcategory, currentUserName(), dueBy, cost);
[2/2] git commit: ISIS-811: fix to build archetype on JDK 8.
Posted by da...@apache.org.
ISIS-811: fix to build archetype on JDK 8.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e12f2746
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e12f2746
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e12f2746
Branch: refs/heads/master
Commit: e12f274631f9d3bdee66dd046d46e4f639576e18
Parents: 9320271
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 18 00:23:08 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 18 00:23:08 2014 +0100
----------------------------------------------------------------------
.../dom/src/main/java/dom/todo/ToDoItem.java | 1 +
.../archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e12f2746/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 9189b7e..a8548a7 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -38,6 +38,7 @@ import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bulk.AppliesTo;
import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs;
import org.apache.isis.applib.annotation.Command.ExecuteIn;
+import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.CommandContext;
http://git-wip-us.apache.org/repos/asf/isis/blob/e12f2746/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
index 9ae0a78..13672f8 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
@@ -41,6 +41,7 @@ import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bulk.AppliesTo;
import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs;
import org.apache.isis.applib.annotation.Command.ExecuteIn;
+import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.clock.ClockService;