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/03/11 00:25:23 UTC
[01/11] git commit: ISIS-731: fix for bulk actions
Repository: isis
Updated Branches:
refs/heads/prepare/isis-1.4.0-RC1 bd651e294 -> c2ddb20ef
ISIS-731: fix for bulk actions
Take a copy of the action model that generates the standalone collection.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/990a0150
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/990a0150
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/990a0150
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 990a0150b292408a7b9db6fa5874dce9d6224068
Parents: d97d9c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Mar 9 11:15:58 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Mar 9 11:15:58 2014 +0000
----------------------------------------------------------------------
.../viewer/wicket/model/models/ActionModel.java | 25 +++++++++++++++++++-
.../ActionResultResponseType.java | 4 +++-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/990a0150/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index de73f6c..f691eb7 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -78,6 +78,7 @@ import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
* {@link Mode#RESULTS results} once invoked.
*/
public class ActionModel extends BookmarkableModel<ObjectAdapter> {
+
private static final long serialVersionUID = 1L;
private static final String NULL_ARG = "$nullArg$";
@@ -261,7 +262,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
/**
* Lazily populated in {@link #getArgumentModel(ActionParameterMemento)}
*/
- private Map<Integer, ScalarModel> arguments = Maps.newHashMap();
+ private final Map<Integer, ScalarModel> arguments = Maps.newHashMap();
private ActionExecutor executor;
@@ -310,6 +311,24 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
this.actionMode = actionMode;
}
+ /**
+ * Copy constructor, as called by {@link #copy()}.
+ */
+ private ActionModel(ActionModel actionModel) {
+ this.targetAdapterMemento = actionModel.targetAdapterMemento;
+ this.actionMemento = actionModel.actionMemento;
+ this.actionMode = actionModel.actionMode;
+ this.actionPrompt = actionModel.actionPrompt;
+
+ primeArgumentModels();
+ final Map<Integer, ScalarModel> argumentModelByIdx = actionModel.arguments;
+ for (Map.Entry<Integer,ScalarModel> argumentModel : argumentModelByIdx.entrySet()) {
+ setArgument(argumentModel.getKey(), argumentModel.getValue().getObject());
+ }
+
+ this.executor = actionModel.executor;
+ }
+
private void setArgumentsIfPossible(final PageParameters pageParameters) {
List<String> args = PageParameterNames.ACTION_ARGS.getListFrom(pageParameters);
@@ -599,6 +618,10 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return IsisContext.getOidMarshaller();
}
+ public ActionModel copy() {
+ return new ActionModel(this);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/990a0150/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 35c5dce..357792f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -60,7 +60,9 @@ public enum ActionResultResponseType {
@Override
public ActionResultResponse interpretResult(final ActionModel actionModel, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
final EntityCollectionModel collectionModel = EntityCollectionModel.createStandalone(resultAdapter);
- collectionModel.setActionHint(actionModel);
+ // take a copy of the actionModel, because the original can get mutated (specifically: its arguments cleared)
+ final ActionModel actionModelCopy = actionModel.copy();
+ collectionModel.setActionHint(actionModelCopy);
return ActionResultResponse.toPage(new StandaloneCollectionPage(collectionModel));
}
},
[03/11] git commit: ISIS-734: download blob/clob in same window
Posted by da...@apache.org.
ISIS-734: download blob/clob in same window
... rather than different tab (which is the behaviour for actions returning a URL).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/25cee811
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/25cee811
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/25cee811
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 25cee8117420c8b5ce0ef6ed76d9d3465f631f50
Parents: 824326c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 21:03:31 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 21:03:31 2014 +0000
----------------------------------------------------------------------
.../icontitle/EntityIconAndTitlePanel.java | 4 +--
.../cssmenu/ActionLinkFactoryAbstract.java | 5 +--
.../widgets/cssmenu/AjaxDeferredBehaviour.java | 36 ++++++++++++++++----
3 files changed, 35 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/25cee811/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index afbee47..05e5b4d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -32,6 +32,7 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -131,8 +132,7 @@ public class EntityIconAndTitlePanel extends PanelAbstract<EntityModel> {
private String determineTitle() {
EntityModel model = getModel();
final ObjectAdapter adapter = model.getObject();
- String titleString = adapter != null ? adapter.titleString(getContextAdapterIfAny()) : "(no object)";
- return titleString;
+ return adapter != null ? adapter.titleString(getContextAdapterIfAny()) : "(no object)";
}
private int abbreviateTo(EntityModel model, String titleString) {
http://git-wip-us.apache.org/repos/asf/isis/blob/25cee811/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 71208bf..5b6d69c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -52,6 +52,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionPanel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.AjaxDeferredBehaviour.OpenUrlStrategy;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
@@ -147,7 +148,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
* adapted from:
* @see https://cwiki.apache.org/confluence/display/WICKET/AJAX+update+and+file+download+in+one+blow
*/
- return new AjaxDeferredBehaviour() {
+ return new AjaxDeferredBehaviour(OpenUrlStrategy.NEW_WINDOW) {
private static final long serialVersionUID = 1L;
@@ -165,7 +166,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
* adapted from:
* @see https://cwiki.apache.org/confluence/display/WICKET/AJAX+update+and+file+download+in+one+blow
*/
- return new AjaxDeferredBehaviour() {
+ return new AjaxDeferredBehaviour(OpenUrlStrategy.SAME_WINDOW) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/25cee811/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
index 1ce7e5a..ddc2036 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
@@ -23,12 +23,40 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.UrlRenderer;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponseHandlingStrategy;
public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
private static final long serialVersionUID = 1L;
+ public static enum OpenUrlStrategy {
+ NEW_WINDOW {
+ @Override
+ public String javascriptFor(AjaxDeferredBehaviour deferredBehaviour, String url) {
+ final Url parsedUrl = Url.parse(url);
+ final RequestCycle requestCycle = deferredBehaviour.getComponent().getRequestCycle();
+ final UrlRenderer urlRenderer = requestCycle.getUrlRenderer();
+ String fullUrl = urlRenderer.renderFullUrl(parsedUrl);
+ return "function(){isisOpenInNewTab('" + fullUrl + "')}";
+ }
+ },
+ SAME_WINDOW {
+ @Override
+ public String javascriptFor(AjaxDeferredBehaviour deferredBehaviour, String url) {
+ return "\"window.location.href='" + url + "'\"";
+ }
+ };
+
+ public abstract String javascriptFor(AjaxDeferredBehaviour deferredBehaviour, String url);
+ }
+
+ private final OpenUrlStrategy openUrlStrategy;
+
+ protected AjaxDeferredBehaviour(final OpenUrlStrategy openUrlStrategy) {
+ this.openUrlStrategy = openUrlStrategy;
+ }
/**
* Call this method to initiate the download.
@@ -37,17 +65,13 @@ public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
String url = getCallbackUrl().toString();
url = ActionResultResponseHandlingStrategy.expanded(url);
+ String func = openUrlStrategy.javascriptFor(this, url);
// the timeout is needed to let Wicket release the channel
- String javascriptFor = javascriptFor(url);
+ String javascriptFor = "setTimeout(" + func + ", 100);";
target.appendJavaScript(javascriptFor);
}
- protected String javascriptFor(String url) {
- String fullUrl = getComponent().getRequestCycle().getUrlRenderer().renderFullUrl(Url.parse(url));
- return "setTimeout(function(){isisOpenInNewTab('" + fullUrl + "')}, 100);";
- }
-
@Override
public void onRequest() {
IRequestHandler handler = getRequestHandler();
[10/11] git commit: [maven-release-plugin] prepare release
isis-viewer-wicket-1.4.1
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-viewer-wicket-1.4.1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9789dd75
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9789dd75
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9789dd75
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 9789dd75067df69b645962c04403afe7c406259b
Parents: fb8ffbb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 23:12:16 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 23:12:16 2014 +0000
----------------------------------------------------------------------
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 18 +++++++++++-------
component/viewer/wicket/tck/pom.xml | 8 ++++++--
component/viewer/wicket/ui/pom.xml | 2 +-
5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9789dd75/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 8896972..18e481a 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/9789dd75/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 615c4d0..496f83c 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9789dd75/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 43da90c..26f649e 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<name>Isis Wicket Viewer</name>
@@ -95,36 +95,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -272,4 +272,8 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <tag>isis-viewer-wicket-1.4.1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/9789dd75/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 6101944..5a33670 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.4.1-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.4.1</isis-viewer-wicket.version>
<jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
@@ -115,4 +115,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>isis-viewer-wicket-1.4.1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/9789dd75/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index 41385d3..7cfd3ab 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
[05/11] git commit: ISIS-733: JDO objectstore version timestamp leave
as null.
Posted by da...@apache.org.
ISIS-733: JDO objectstore version timestamp leave as null.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3bfcb59a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3bfcb59a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3bfcb59a
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 3bfcb59a78fe2bd4cf8e8aacdad909cf4462998a
Parents: 1992972
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 21:05:55 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 21:11:03 2014 +0000
----------------------------------------------------------------------
.../apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3bfcb59a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java
index be82019..2577708 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/Utils.java
@@ -48,7 +48,7 @@ public class Utils {
static Version getVersionIfAny(final PersistenceCapable pojo, final AuthenticationSession authenticationSession) {
Object jdoVersion = pojo.jdoGetVersion();
if(jdoVersion instanceof Long) {
- return SerialNumberVersion.create((Long) jdoVersion, authenticationSession.getUserName(), new Date());
+ return SerialNumberVersion.create((Long) jdoVersion, authenticationSession.getUserName(), null);
}
return null;
}
[02/11] git commit: ISIS-732: check semantics of action before
re-executing
Posted by da...@apache.org.
ISIS-732: check semantics of action before re-executing
...when refreshing the collection after invocation of a bulk action.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/824326c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/824326c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/824326c3
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 824326c32b769c5a2834f570e50f6986696318d1
Parents: 990a015
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Mar 9 11:17:52 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Mar 9 11:17:52 2014 +0000
----------------------------------------------------------------------
.../collectioncontents/ajaxtable/BulkActionsLinkFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/824326c3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
index 9d0a04e..c2c023a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs;
import org.apache.isis.applib.services.command.Command;
@@ -138,7 +139,7 @@ final class BulkActionsLinkFactory implements ActionLinkFactory {
model.clearToggleMementosList();
toggleboxColumn.clearToggles();
final ActionModel actionModelHint = model.getActionModelHint();
- if(actionModelHint != null) {
+ if(actionModelHint != null && actionModelHint.getActionMemento().getAction().getSemantics().isIdempotentInNature()) {
ObjectAdapter resultAdapter = actionModelHint.getObject();
model.setObjectList(resultAdapter);
} else {
[07/11] git commit: ISIS-735: porting app fix over to archetype
Posted by da...@apache.org.
ISIS-735: porting app fix over to archetype
... to prepare/isis-1.4.0 branch (for 1.4.1 patch releases)
Also moving 1.5.0-snapshot back to 1.4.1-snapshot for jdo and wicket.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/34d8f755
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/34d8f755
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/34d8f755
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 34d8f7558dba170da2cbcbc01a50bee512415906
Parents: 08f9c79
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 22:48:50 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 22:48:50 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 ++--
component/objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 14 +++++++-------
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 14 +++++++-------
component/viewer/wicket/tck/pom.xml | 4 ++--
component/viewer/wicket/ui/pom.xml | 2 +-
.../dom/src/main/java/dom/todo/ToDoItem.java | 4 +++-
.../test/java/dom/todo/ToDoTest_notYetCompleted.java | 5 +++++
11 files changed, 31 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 3eeb3fb..3ad67cf 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 4ce07bb..68162f5 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 35f3413..d72f9a4 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 982f5b0..731f65a 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<name>Isis JDO ObjectStore</name>
@@ -105,36 +105,36 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 5cf724e..8896972 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 43362bd..615c4d0 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 41b5e15..43da90c 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<name>Isis Wicket Viewer</name>
@@ -95,36 +95,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 893935f..6101944 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.5.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.4.1-SNAPSHOT</isis-viewer-wicket.version>
<jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index e3d5239..41385d3 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/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 2cfc4b3..9f65bf5 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
@@ -349,7 +349,9 @@ public class ToDoItem implements Comparable<ToDoItem> {
public ToDoItem notYetCompleted() {
setComplete(false);
- return this;
+ // if invoked as a regular action, return this object;
+ // otherwise (if invoked as bulk), return null (so go back to the list)
+ return bulkInteractionContext.getInvokedAs() == InvokedAs.REGULAR? this: null;
}
// disable action dependent on state of object
public String disableNotYetCompleted() {
http://git-wip-us.apache.org/repos/asf/isis/blob/34d8f755/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
index 4e83ddc..3a75b3b 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
@@ -25,6 +25,8 @@ import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.annotation.Bulk;
+
public class ToDoTest_notYetCompleted {
private ToDoItem toDoItem;
@@ -33,6 +35,9 @@ public class ToDoTest_notYetCompleted {
public void setUp() throws Exception {
toDoItem = new ToDoItem();
toDoItem.setComplete(true);
+
+ Bulk.InteractionContext interactionContext = Bulk.InteractionContext.regularAction(toDoItem);
+ toDoItem.injectBulkInteractionContext(interactionContext);
}
@Test
[08/11] git commit: [maven-release-plugin] prepare release
isis-objectstore-jdo-1.4.1
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-objectstore-jdo-1.4.1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/60cda90f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/60cda90f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/60cda90f
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 60cda90f990ca194566ce2890377b2281f5d1054
Parents: 34d8f75
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 22:57:51 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 22:57:51 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 ++--
component/objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 18 +++++++++++-------
4 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/60cda90f/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 3ad67cf..02f12be 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/60cda90f/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 68162f5..2651bcc 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/60cda90f/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index d72f9a4..1edfafa 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/60cda90f/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 731f65a..c707f71 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<name>Isis JDO ObjectStore</name>
@@ -105,36 +105,36 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -156,4 +156,8 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <tag>isis-objectstore-jdo-1.4.1</tag>
+ </scm>
</project>
[06/11] git commit: Merge branch 'master' into prepare/isis-1.4.0-RC1
Posted by da...@apache.org.
Merge branch 'master' into prepare/isis-1.4.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/08f9c792
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/08f9c792
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/08f9c792
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 08f9c7923935a7c958cc1a9165391072bae9fa7b
Parents: bd651e2 3bfcb59
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 21:18:29 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 21:18:29 2014 +0000
----------------------------------------------------------------------
.../jdo/datanucleus/persistence/Utils.java | 2 +-
.../viewer/wicket/model/models/ActionModel.java | 25 +++++++++++++-
.../ActionResultResponseType.java | 4 ++-
.../ajaxtable/BulkActionsLinkFactory.java | 3 +-
.../icontitle/EntityIconAndTitlePanel.java | 4 +--
.../cssmenu/ActionLinkFactoryAbstract.java | 5 +--
.../widgets/cssmenu/AjaxDeferredBehaviour.java | 36 ++++++++++++++++----
.../dom/src/main/java/dom/todo/ToDoItem.java | 4 ++-
.../java/dom/todo/ToDoTest_notYetCompleted.java | 5 +++
9 files changed, 73 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[09/11] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb8ffbb9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb8ffbb9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb8ffbb9
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: fb8ffbb901e13fea0f832ed2f6618778369b533e
Parents: 60cda90
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 22:57:55 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 22:57:55 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 ++--
component/objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 18 +++++++-----------
4 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb8ffbb9/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 02f12be..3eeb3fb 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb8ffbb9/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 2651bcc..4ce07bb 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb8ffbb9/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 1edfafa..35f3413 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb8ffbb9/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index c707f71..982f5b0 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Isis JDO ObjectStore</name>
@@ -105,36 +105,36 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -156,8 +156,4 @@
</dependencies>
</dependencyManagement>
-
- <scm>
- <tag>isis-objectstore-jdo-1.4.1</tag>
- </scm>
</project>
[11/11] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c2ddb20e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c2ddb20e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c2ddb20e
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: c2ddb20ef0c5b093b8b2c6be86caa79838260928
Parents: 9789dd7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 23:12:19 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 23:12:19 2014 +0000
----------------------------------------------------------------------
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 18 +++++++-----------
component/viewer/wicket/tck/pom.xml | 8 ++------
component/viewer/wicket/ui/pom.xml | 2 +-
5 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c2ddb20e/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 18e481a..5cf724e 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/c2ddb20e/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 496f83c..43362bd 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c2ddb20e/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 26f649e..41b5e15 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Isis Wicket Viewer</name>
@@ -95,36 +95,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -272,8 +272,4 @@
</dependencies>
</dependencyManagement>
-
- <scm>
- <tag>isis-viewer-wicket-1.4.1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c2ddb20e/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 5a33670..893935f 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.4.1</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.5.0-SNAPSHOT</isis-viewer-wicket.version>
<jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
@@ -115,8 +115,4 @@
</dependency>
</dependencies>
-
- <scm>
- <tag>isis-viewer-wicket-1.4.1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c2ddb20e/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index 7cfd3ab..e3d5239 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
[04/11] git commit: ISIS-735: fix for ToDoItem#notYetCompleted()
Posted by da...@apache.org.
ISIS-735: fix for ToDoItem#notYetCompleted()
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/19929727
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/19929727
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/19929727
Branch: refs/heads/prepare/isis-1.4.0-RC1
Commit: 199297273825687513a9cb09800acffb14f8dc10
Parents: 25cee81
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 10 21:05:23 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 10 21:05:23 2014 +0000
----------------------------------------------------------------------
.../dom/src/main/java/dom/todo/ToDoItem.java | 4 +++-
.../dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/19929727/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 80070a4..a8084e2 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
@@ -346,7 +346,9 @@ public class ToDoItem implements Comparable<ToDoItem> {
public ToDoItem notYetCompleted() {
setComplete(false);
- return this;
+ // if invoked as a regular action, return this object;
+ // otherwise (if invoked as bulk), return null (so go back to the list)
+ return bulkInteractionContext.getInvokedAs() == InvokedAs.REGULAR? this: null;
}
// disable action dependent on state of object
public String disableNotYetCompleted() {
http://git-wip-us.apache.org/repos/asf/isis/blob/19929727/example/application/quickstart_wicket_restful_jdo/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java b/example/application/quickstart_wicket_restful_jdo/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
index 3ab3598..9abc2f9 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/test/java/dom/todo/ToDoTest_notYetCompleted.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.annotation.Bulk;
+
public class ToDoTest_notYetCompleted {
private ToDoItem toDoItem;
@@ -30,6 +32,9 @@ public class ToDoTest_notYetCompleted {
public void setUp() throws Exception {
toDoItem = new ToDoItem();
toDoItem.setComplete(true);
+
+ Bulk.InteractionContext interactionContext = Bulk.InteractionContext.regularAction(toDoItem);
+ toDoItem.injectBulkInteractionContext(interactionContext);
}
@Test