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/12/31 08:12:24 UTC
[2/2] isis git commit: ISIS-970: moving the new
ActionInvocationContext from applib.annotatoin to applib.services.actinvoc
ISIS-970: moving the new ActionInvocationContext from applib.annotatoin to applib.services.actinvoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4eed0900
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4eed0900
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4eed0900
Branch: refs/heads/ISIS-970
Commit: 4eed0900f0ce8d74ae746f50f59f66d4e53f970e
Parents: e11eaef
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 31 00:02:08 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 31 00:02:08 2014 +0000
----------------------------------------------------------------------
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../annotation/ActionInvocationContext.java | 176 -------------------
.../org/apache/isis/applib/annotation/Bulk.java | 10 +-
.../actinvoc/ActionInvocationContext.java | 174 ++++++++++++++++++
...onInvocationFacetForInteractionAbstract.java | 2 +-
.../specimpl/ObjectActionContributee.java | 2 +-
.../system/transaction/IsisTransaction.java | 2 +-
.../system/transaction/IsisTransactionTest.java | 2 +-
.../dom/src/main/java/dom/todo/ToDoItem.java | 2 +-
.../src/test/java/dom/todo/ToDoItemTest.java | 2 +-
.../integration/glue/todoitem/ToDoItemGlue.java | 2 +-
11 files changed, 187 insertions(+), 189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index a46de73..d8a17fc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.Session;
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.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.InvokedOn;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionInvocationContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionInvocationContext.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionInvocationContext.java
deleted file mode 100644
index 93aad9a..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionInvocationContext.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.applib.annotation;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * This service (API and implementation) provides access to context information about a bulk action invocation.
- *
- * <p>
- * This implementation has no UI and there is only one implementation (this class) in applib, so it is annotated
- * with {@link DomainService}. This means that it is automatically registered
- * and available for use; no further configuration is required.
- * </p>
- *
- * <p>
- * Note that this not annotated as <tt>@DomainService</tt> an <tt>@RequestScoped</tt> only because of the
- * legacy {@link org.apache.isis.applib.annotation.Bulk.InteractionContext} subclass (which *is* registered as
- * the service).
- * </p>
- */
-public abstract class ActionInvocationContext {
-
- /**
- * Intended only to support unit testing.
- */
- public static ActionInvocationContext onObject(final Object domainObject) {
- return new ActionInvocationContext(InvokedOn.OBJECT, Collections.singletonList(domainObject)){};
- }
-
- /**
- * Intended only to support unit testing.
- */
- public static ActionInvocationContext onCollection(final Object... domainObjects) {
- return onCollection(Arrays.asList(domainObjects));
- }
-
- /**
- * Intended only to support unit testing.
- */
- public static ActionInvocationContext onCollection(final List<Object> domainObjects) {
- return new ActionInvocationContext(InvokedOn.COLLECTION, domainObjects){};
- }
-
- // //////////////////////////////////////
-
-
- private InvokedOn invokedOn;
- private List<Object> domainObjects;
-
- private int index;
-
- // //////////////////////////////////////
-
- public ActionInvocationContext() {
- }
-
- /**
- * @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
- */
- @Deprecated
- public ActionInvocationContext(final InvokedOn invokedOn, final Object... domainObjects) {
- this(invokedOn, Arrays.asList(domainObjects));
- }
-
- /**
- * @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
- */
- @Deprecated
- public ActionInvocationContext(final InvokedOn invokedOn, final List<Object> domainObjects) {
- this.invokedOn = invokedOn;
- this.domainObjects = domainObjects;
- }
-
- // //////////////////////////////////////
-
- /**
- * <b>NOT API</b>: intended to be called only by the framework.
- */
- @Programmatic
- public void setInvokedOn(final InvokedOn invokedOn) {
- this.invokedOn = invokedOn;
- }
-
- /**
- * <b>NOT API</b>: intended to be called only by the framework.
- */
- @Programmatic
- public void setDomainObjects(final List<Object> domainObjects) {
- this.domainObjects = domainObjects;
- }
-
- /**
- * <b>NOT API</b>: intended to be called only by the framework.
- */
- @Programmatic
- public void setIndex(final int index) {
- this.index = index;
- }
-
- // //////////////////////////////////////
-
-
- /**
- * Whether this particular {@link ActionInvocationContext} was applied as a {@link InvokedOn#COLLECTION bulk} action
- * (against each domain object in a list of domain objects) or as a {@link InvokedOn#OBJECT regular}
- * action (against a single domain object).
- */
- @Programmatic
- public InvokedOn getInvokedOn() {
- return invokedOn;
- }
-
-
- /**
- * The list of domain objects which are being acted upon.
- */
- @Programmatic
- public List<Object> getDomainObjects() {
- return domainObjects;
- }
-
- /**
- * The number of {@link #domainObjects domain objects} being acted upon.
- */
- @Programmatic
- public int getSize() {
- return domainObjects.size();
- }
-
- /**
- * The 0-based index to the object being acted upon.
- *
- * <p>
- * Will be a value in range [0, {@link #getSize() size}).
- */
- @Programmatic
- public int getIndex() {
- return index;
- }
-
- /**
- * Whether this object being acted upon is the first such.
- */
- @Programmatic
- public boolean isFirst() {
- return this.index == 0;
- }
-
- /**
- * Whether this object being acted upon is the last such.
- */
- @Programmatic
- public boolean isLast() {
- return this.index == (getSize()-1);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
index 1146576..592dd43 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
@@ -61,7 +61,7 @@ public @interface Bulk {
// //////////////////////////////////////
/**
- * @deprecated - see {@link ActionInvocationContext}.
+ * @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext}.
*/
@Deprecated
@DomainService
@@ -130,7 +130,7 @@ public @interface Bulk {
/**
- * @deprecated - see {@link ActionInvocationContext#onObject(Object)}.
+ * @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext#onObject(Object)}.
*/
@Deprecated
public static InteractionContext regularAction(Object domainObject) {
@@ -138,7 +138,7 @@ public @interface Bulk {
}
/**
- * @deprecated - see {@link ActionInvocationContext#onCollection(Object...)}.
+ * @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext#onCollection(Object...)}.
*/
@Deprecated
public static InteractionContext bulkAction(Object... domainObjects) {
@@ -146,7 +146,7 @@ public @interface Bulk {
}
/**
- * @deprecated - see {@link ActionInvocationContext#onCollection(java.util.List)}.
+ * @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext#onCollection(java.util.List)}.
*/
@Deprecated
public static InteractionContext bulkAction(List<Object> domainObjects) {
@@ -162,7 +162,7 @@ public @interface Bulk {
private int index;
/**
- * @deprecated - see {@link ActionInvocationContext ()}.
+ * @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext ()}.
*/
@Deprecated
public InteractionContext() {
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
new file mode 100644
index 0000000..9982649
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.applib.services.actinvoc;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.InvokedOn;
+import org.apache.isis.applib.annotation.Programmatic;
+
+/**
+ * This service (API and implementation) provides access to context information about a bulk action invocation.
+ *
+ * <p>
+ * This implementation has no UI and there is only one implementation (this class) in applib, so it is annotated
+ * with {@link org.apache.isis.applib.annotation.DomainService}. This means that it is automatically registered
+ * and available for use; no further configuration is required.
+ * </p>
+ */
+@DomainService
+public class ActionInvocationContext {
+
+ /**
+ * Intended only to support unit testing.
+ */
+ public static ActionInvocationContext onObject(final Object domainObject) {
+ return new ActionInvocationContext(InvokedOn.OBJECT, Collections.singletonList(domainObject)){};
+ }
+
+ /**
+ * Intended only to support unit testing.
+ */
+ public static ActionInvocationContext onCollection(final Object... domainObjects) {
+ return onCollection(Arrays.asList(domainObjects));
+ }
+
+ /**
+ * Intended only to support unit testing.
+ */
+ public static ActionInvocationContext onCollection(final List<Object> domainObjects) {
+ return new ActionInvocationContext(InvokedOn.COLLECTION, domainObjects){};
+ }
+
+ // //////////////////////////////////////
+
+
+ private InvokedOn invokedOn;
+ private List<Object> domainObjects;
+
+ private int index;
+
+ // //////////////////////////////////////
+
+ public ActionInvocationContext() {
+ }
+
+ /**
+ * @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
+ */
+ @Deprecated
+ public ActionInvocationContext(final InvokedOn invokedOn, final Object... domainObjects) {
+ this(invokedOn, Arrays.asList(domainObjects));
+ }
+
+ /**
+ * @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
+ */
+ @Deprecated
+ public ActionInvocationContext(final InvokedOn invokedOn, final List<Object> domainObjects) {
+ this.invokedOn = invokedOn;
+ this.domainObjects = domainObjects;
+ }
+
+ // //////////////////////////////////////
+
+ /**
+ * <b>NOT API</b>: intended to be called only by the framework.
+ */
+ @Programmatic
+ public void setInvokedOn(final InvokedOn invokedOn) {
+ this.invokedOn = invokedOn;
+ }
+
+ /**
+ * <b>NOT API</b>: intended to be called only by the framework.
+ */
+ @Programmatic
+ public void setDomainObjects(final List<Object> domainObjects) {
+ this.domainObjects = domainObjects;
+ }
+
+ /**
+ * <b>NOT API</b>: intended to be called only by the framework.
+ */
+ @Programmatic
+ public void setIndex(final int index) {
+ this.index = index;
+ }
+
+ // //////////////////////////////////////
+
+
+ /**
+ * Whether this particular {@link ActionInvocationContext} was applied as a {@link InvokedOn#COLLECTION bulk} action
+ * (against each domain object in a list of domain objects) or as a {@link InvokedOn#OBJECT regular}
+ * action (against a single domain object).
+ */
+ @Programmatic
+ public InvokedOn getInvokedOn() {
+ return invokedOn;
+ }
+
+
+ /**
+ * The list of domain objects which are being acted upon.
+ */
+ @Programmatic
+ public List<Object> getDomainObjects() {
+ return domainObjects;
+ }
+
+ /**
+ * The number of {@link #domainObjects domain objects} being acted upon.
+ */
+ @Programmatic
+ public int getSize() {
+ return domainObjects.size();
+ }
+
+ /**
+ * The 0-based index to the object being acted upon.
+ *
+ * <p>
+ * Will be a value in range [0, {@link #getSize() size}).
+ */
+ @Programmatic
+ public int getIndex() {
+ return index;
+ }
+
+ /**
+ * Whether this object being acted upon is the first such.
+ */
+ @Programmatic
+ public boolean isFirst() {
+ return this.index == 0;
+ }
+
+ /**
+ * Whether this object being acted upon is the last such.
+ */
+ @Programmatic
+ public boolean isLast() {
+ return this.index == (getSize()-1);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
index aca042f..e1b14b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.ViewModel;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.InvokedOn;
import org.apache.isis.applib.clock.Clock;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 9ea6f9c..a721656 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.InvokedOn;
import org.apache.isis.applib.annotation.Where;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 8bfdbc6..0a4ed35 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.Bulk;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.PublishedAction;
import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.annotation.PublishedObject.ChangeKind;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
index 9a1e023..2db3b05 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
@@ -25,7 +25,7 @@ import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.PublishedAction;
import org.apache.isis.applib.annotation.PublishedObject;
import org.apache.isis.applib.services.audit.AuditingService3;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/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 10bb1a0..31ce78a 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
@@ -39,7 +39,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java b/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java
index 9504b89..b1f5168 100644
--- a/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java
+++ b/example/application/todoapp/dom/src/test/java/dom/todo/ToDoItemTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.security.RoleMemento;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.eventbus.EventBusService;
http://git-wip-us.apache.org/repos/asf/isis/blob/4eed0900/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java b/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java
index 594b993..c859340 100644
--- a/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java
+++ b/example/application/todoapp/integtests/src/test/java/integration/glue/todoitem/ToDoItemGlue.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.jmock.Expectations;
import org.junit.Assert;
-import org.apache.isis.applib.annotation.ActionInvocationContext;
+import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.core.specsupport.scenarios.InMemoryDB;
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;