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 2013/10/19 16:19:44 UTC
[1/2] git commit: ISIS-558: never clear args on an action model...
Updated Branches:
refs/heads/master d11426399 -> bf918a672
ISIS-558: never clear args on an action model...
... so that can be resubmitted in the event that was invoked for bulk actions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2d5ed825
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2d5ed825
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2d5ed825
Branch: refs/heads/master
Commit: 2d5ed825b5698eac9f0ffcf9b4cdffec1f239362
Parents: d114263
Author: Dan Haywood <da...@apache.org>
Authored: Sat Oct 19 14:44:14 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Oct 19 14:44:14 2013 +0100
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/components/actions/ActionPanel.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2d5ed825/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index fafe250..9527f92 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -216,7 +216,9 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
bookmarkPage(actionModel);
}
- return true;
+ //return true;
+ // change in policy: never clear args (need them, even after successful execution, for bulk actions).
+ return false;
} catch (RuntimeException ex) {
[2/2] git commit: ISIS-322: only create DB schema (for JDO
objectstore)...
Posted by da...@apache.org.
ISIS-322: only create DB schema (for JDO objectstore)...
... if datanucleus.autoCreateSchema is set to 'true'
This change means that we should be able to run on the Google App Engine
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bf918a67
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bf918a67
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bf918a67
Branch: refs/heads/master
Commit: bf918a672da23f2b86d49a0c76382ee316ee96c4
Parents: 2d5ed82
Author: Dan Haywood <da...@apache.org>
Authored: Sat Oct 19 15:00:19 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Oct 19 15:00:19 2013 +0100
----------------------------------------------------------------------
.../jdo/datanucleus/DataNucleusApplicationComponents.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bf918a67/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java
index d73fb00..791c8e6 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusApplicationComponents.java
@@ -62,7 +62,10 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
final Set<String> classesToBePersisted = catalogClassesToBePersisted(objectSpecs);
- createSchema(props, classesToBePersisted);
+ final boolean createSchema = Boolean.parseBoolean( props.get("datanucleus.autoCreateSchema") );
+ if(createSchema) {
+ createSchema(props, classesToBePersisted);
+ }
namedQueryByName = Collections.unmodifiableMap(catalogNamedQueries(objectSpecs));