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 2010/11/17 16:25:44 UTC
svn commit: r1036077 - in /incubator/isis/trunk:
support/prototype/viewer-html/src/main/webapp/WEB-INF/
support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/
viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/
viewer/...
Author: danhaywood
Date: Wed Nov 17 15:25:43 2010
New Revision: 1036077
URL: http://svn.apache.org/viewvc?rev=1036077&view=rev
Log:
minor fixes for the support/prototype app to run
Modified:
incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java
incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java
incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java
incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java
Modified: incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml Wed Nov 17 15:25:43 2010
@@ -50,12 +50,12 @@
<servlet>
<servlet-name>Logon</servlet-name>
- <servlet-class>org.apache.isis.extensions.html.servlet.LogonServlet</servlet-class>
+ <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Controller</servlet-name>
- <servlet-class>org.apache.isis.extensions.html.servlet.ControllerServlet</servlet-class>
+ <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
</servlet>
<servlet>
Modified: incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml Wed Nov 17 15:25:43 2010
@@ -15,7 +15,7 @@
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.viewer.scimpi.servlet.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java Wed Nov 17 15:25:43 2010
@@ -23,7 +23,7 @@ public class AddToCollection extends Per
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding onMemberBinding = performContext
.getPeer().getOnMemberBinding();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java Wed Nov 17 15:25:43 2010
@@ -22,7 +22,7 @@ public class ClearProperty extends Perfo
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java Wed Nov 17 15:25:43 2010
@@ -21,7 +21,7 @@ public class GetActionParameterChoices e
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
final StoryCell arg0Cell = arg0Binding.getCurrentCell();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java Wed Nov 17 15:25:43 2010
@@ -21,7 +21,7 @@ public class GetActionParameterDefault e
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
final StoryCell arg0Cell = arg0Binding.getCurrentCell();
int requestedParamNum = -1;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class GetCollection extends Perfo
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final OneToManyAssociation otma = (OneToManyAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class GetProperty extends Perform
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class GetPropertyChoices extends
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class GetPropertyDefault extends
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java Wed Nov 17 15:25:43 2010
@@ -24,7 +24,7 @@ public class InvokeAction extends Perfor
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding onMemberBinding = performContext.getPeer()
.getOnMemberBinding();
final List<StoryCell> argumentCells = performContext.getArgumentCells();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java Wed Nov 17 15:25:43 2010
@@ -92,7 +92,7 @@ public abstract class PerformAbstractTyp
final StoryCell onMemberCell = onMemberBinding.getCurrentCell();
final String reason = type.ensureMemberIsOfType(performContext
- .getNakedObjectMember());
+ .getObjectMember());
if (reason != null) {
throw StoryBoundValueException.current(onMemberBinding,
reason);
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java Wed Nov 17 15:25:43 2010
@@ -20,15 +20,15 @@ public class PerformContext {
private final UsingIsisViewerPeer peer;
private final ObjectAdapter onAdapter;
- private final ObjectMember nakedObjectMember;
+ private final ObjectMember objectMember;
private final List<StoryCell> argumentCells;
public PerformContext(final UsingIsisViewerPeer peer,
final ObjectAdapter onAdapter,
- final ObjectMember nakedObjectMember,
+ final ObjectMember objectMember,
final List<StoryCell> argumentCells) {
this.onAdapter = onAdapter;
- this.nakedObjectMember = nakedObjectMember;
+ this.objectMember = objectMember;
this.peer = peer;
this.argumentCells = argumentCells;
}
@@ -41,8 +41,8 @@ public class PerformContext {
return onAdapter;
}
- public ObjectMember getNakedObjectMember() {
- return nakedObjectMember;
+ public ObjectMember getObjectMember() {
+ return objectMember;
}
public List<StoryCell> getArgumentCells() {
@@ -50,12 +50,12 @@ public class PerformContext {
}
public Consent visibleMemberConsent() {
- return getNakedObjectMember().isVisible(getAuthenticationSession(),
+ return getObjectMember().isVisible(getAuthenticationSession(),
getOnAdapter());
}
public Consent usableMemberConsent() {
- return getNakedObjectMember().isUsable(getAuthenticationSession(),
+ return getObjectMember().isUsable(getAuthenticationSession(),
getOnAdapter());
}
@@ -66,7 +66,7 @@ public class PerformContext {
public void ensureVisible(CellBinding onMemberBinding, final StoryCell onMemberCell)
throws StoryBoundValueException {
- final Consent visible = nakedObjectMember.isVisible(getAuthenticationSession(),
+ final Consent visible = objectMember.isVisible(getAuthenticationSession(),
getOnAdapter());
if (visible.isVetoed()) {
throw StoryBoundValueException.current(onMemberBinding, "(not visible)");
@@ -75,7 +75,7 @@ public class PerformContext {
public void ensureUsable(CellBinding onMemberBinding, final StoryCell onMemberCell)
throws StoryBoundValueException {
- final Consent usable = nakedObjectMember.isUsable(getAuthenticationSession(),
+ final Consent usable = objectMember.isUsable(getAuthenticationSession(),
getOnAdapter());
if (usable.isVetoed()) {
throw StoryBoundValueException.current(onMemberBinding, "(not usable)");
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java Wed Nov 17 15:25:43 2010
@@ -27,7 +27,7 @@ public class RemoveFromCollection extend
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding onMemberBinding = performContext.getPeer()
.getOnMemberBinding();
final StoryCell onMemberCell = onMemberBinding.getCurrentCell();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java Wed Nov 17 15:25:43 2010
@@ -25,7 +25,7 @@ public class SetProperty extends Perform
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final List<StoryCell> argumentCells = performContext.getArgumentCells();
final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java Wed Nov 17 15:25:43 2010
@@ -20,7 +20,7 @@ public abstract class ProposedArgumentVa
throws StoryBoundValueException {
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding thatBinding = performContext.getPeer()
.getThatItBinding();
final CellBinding arg0Binding = performContext.getPeer()
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java Wed Nov 17 15:25:43 2010
@@ -24,7 +24,7 @@ public class ArgumentSetNotValid extends
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding onMemberBinding = performContext.getPeer()
.getOnMemberBinding();
final List<StoryCell> argumentCells = performContext.getArgumentCells();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java Wed Nov 17 15:25:43 2010
@@ -23,7 +23,7 @@ public class ArgumentSetValid extends Th
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding onMemberBinding = performContext
.getPeer().getOnMemberBinding();
final List<StoryCell> argumentCells = performContext.getArgumentCells();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java Wed Nov 17 15:25:43 2010
@@ -23,7 +23,7 @@ public class Containment extends ThatAbs
throws StoryBoundValueException {
final ObjectMember nakedObjectMember = performContext
- .getNakedObjectMember();
+ .getObjectMember();
final CellBinding thatBinding = performContext.getPeer()
.getThatItBinding();
final CellBinding arg0Binding = performContext.getPeer()
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedAddTo.java Wed Nov 17 15:25:43 2010
@@ -19,7 +19,7 @@ public class ProposedAddTo extends Propo
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final OneToManyAssociation otma = (OneToManyAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
return otma.isValidToAdd(onAdapter, toValidateAdapter);
}
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ProposedRemoveFrom.java Wed Nov 17 15:25:43 2010
@@ -19,7 +19,7 @@ public class ProposedRemoveFrom extends
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final OneToManyAssociation otma = (OneToManyAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
return otma.isValidToRemove(onAdapter, toValidateAdapter);
}
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public abstract class ThatAbstract exten
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final OneToManyAssociation otma = (OneToManyAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
final ObjectAdapter nakedObjectRepresentingCollection = otma
.get(onAdapter);
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java Wed Nov 17 15:25:43 2010
@@ -18,7 +18,7 @@ public class Contains extends ThatSubcom
public ObjectAdapter that(final PerformContext performContext) throws StoryBoundValueException {
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
// if we have an expected result
CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java Wed Nov 17 15:25:43 2010
@@ -18,7 +18,7 @@ public class DoesNotContain extends That
public ObjectAdapter that(final PerformContext performContext) throws StoryBoundValueException {
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
// if we have an expected result
CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Empty.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class Empty extends ThatSubcomman
throws StoryBoundValueException {
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
// get
final ObjectAdapter resultAdapter = otoa.get(performContext
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/NotEmpty.java Wed Nov 17 15:25:43 2010
@@ -17,7 +17,7 @@ public class NotEmpty extends ThatSubcom
throws StoryBoundValueException {
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
// get
final ObjectAdapter resultAdapter = otoa.get(performContext
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedClear.java Wed Nov 17 15:25:43 2010
@@ -19,7 +19,7 @@ public class ProposedClear extends ThatV
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
final Consent validityConsent = otoa
.isAssociationValid(onAdapter, null);
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/ProposedSet.java Wed Nov 17 15:25:43 2010
@@ -19,7 +19,7 @@ public class ProposedSet extends Propose
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final OneToOneAssociation otoa = (OneToOneAssociation) performContext
- .getNakedObjectMember();
+ .getObjectMember();
return otoa.isAssociationValid(onAdapter, toValidateAdapter);
}
Modified: incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java (original)
+++ incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java Wed Nov 17 15:25:43 2010
@@ -387,7 +387,10 @@ public class AbstractIsisConcordionTest
arg3, arg4);
}
- private String usingIsisViewerThatArgsVarargs(String onObject, String aliasResultAs, String perform,
+ /**
+ * With <tt>protected</tt> visibility so that it can be called by custom methods if required.
+ */
+ protected String usingIsisViewerThatArgsVarargs(String onObject, String aliasResultAs, String perform,
String usingMember, String thatIt, String arg0, String... remainingArgs) {
if (executingInline()) {
usingIsisViewer = new UsingIsisViewerForConcordion(getStory().getAliasRegistry(), Perform.Mode.TEST);
Modified: incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml (original)
+++ incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml Wed Nov 17 15:25:43 2010
@@ -127,7 +127,7 @@
<para>The default implementation just wraps a
<classname>java.lang.String</classname>, but some frameworks (eg
- <emphasis>FitNesse</emphasis>) have other means of </para>
+ <emphasis>FitNesse</emphasis>) have other means of</para>
</listitem>
<listitem>
@@ -365,7 +365,7 @@
<para>In order to test an <emphasis>Apache Isis</emphasis> domain
application, a running instance of an <classname>IsisSystem</classname>
- must be bootstrapped, with the appropriate configuration. </para>
+ must be bootstrapped, with the appropriate configuration.</para>
<sect2>
<title>Story Context</title>
@@ -769,8 +769,8 @@ and running in <span concordion:set="
<sect3>
<title>FitNesse</title>
- <para>The FitNesse integration provides four versions (overloaded
- only so reads well in the page):</para>
+ <para>The <emphasis>FitNesse</emphasis> integration provides four
+ versions (overloaded only so reads well in the page):</para>
<informaltable>
<tgroup cols="2">
@@ -1040,6 +1040,7 @@ and running in <span concordion:set="
<itemizedlist>
<listitem>
<para><methodname>#setUpObject(String className, String aliasAs,
+ String propertyName1, String propertyName2,
...)</methodname></para>
<para>There are 10 overloaded versions of this method, to
@@ -1166,7 +1167,7 @@ and running in <span concordion:set="
<para>User interaction fixtures appear predominantly in the main body of
the test, either to simulating user interactions or to assert on the
- results of those actions. </para>
+ results of those actions.</para>
<sect2 id="sec.UsingIsisViewer">
<title>Using Isis Viewer / Using Isis Viewer For Setup</title>
@@ -1243,77 +1244,824 @@ and running in <span concordion:set="
<itemizedlist>
<listitem>
- <para>"on object" column (can also use 'object', or 'on')</para>
+ <para>the "on object" column (can also use 'object', or 'on' if
+ parsing column name provided by story text)</para>
- <para>The (alias of) the obejct to interact with. A value must
+ <para>The (alias of) the object to interact with. A value must
always be provided.</para>
</listitem>
<listitem>
- <para>"alias result as" column (can also use "result=",
+ <para>the "alias result as" column (can also use "result=",
"alias=", "alias as")</para>
<para>The alias to assign the result of any interaction.</para>
</listitem>
<listitem>
- <para>"perform" column (can also use "do", "interaction",
+ <para>the "perform" column (can also use "do", "interaction",
"interaction type")</para>
<para>the interaction to perform; discussed further below</para>
</listitem>
<listitem>
- <para>"on member" column (can also use "member", "using member",
- using")</para>
+ <para>the "on member" column (can also use "member", "using
+ member", using")</para>
<para>the property, collection or action to use</para>
</listitem>
<listitem>
- <para>that it</para>
+ <para>the "that it" column (can also use "that", "verb")</para>
- <para></para>
+ <para>optional qualifier for interactions that make checks;
+ discussed below</para>
</listitem>
<listitem>
- <para>with arguments</para>
+ <para>the "with arguments" (can also "arguments", "parameters",
+ "with parameters", "for", "value", "for parameters", "value",
+ "reference")</para>
- <para></para>
+ <para>the first argument, to the interaction, if any. It is
+ possible to perform interactions with multiple arguments (for
+ example, invoking an action); but the UsingIsisViewerPeer needs
+ to have a binding for the first argument so that it can knows to
+ interpret any following columns as further arguments.</para>
</listitem>
+ </itemizedlist>
+
+ <para>The valid values that can be provided for the "perform"
+ binding are:</para>
+ <itemizedlist>
<listitem>
- <para>on object</para>
+ <para>check property / check collection / check add to
+ collection / check remove from collection / check action</para>
- <para></para>
+ <para>These are combined with a value in the "that it" binding;
+ for example "check property XXX is hidden", or "check action XXX
+ is valid for (<emphasis>some argument list</emphasis>)"</para>
+ </listitem>
+
+ <listitem>
+ <para>get property / set property / clear property</para>
+
+ <para>Read from or write to a collection. If setting, a single
+ argument is required</para>
+ </listitem>
+
+ <listitem>
+ <para>get collection / add to collection / remove from
+ collection</para>
+
+ <para>Read or write from a collection. If writing, a single
+ argument is required</para>
+ </listitem>
+
+ <listitem>
+ <para>invoke action</para>
+
+ <para>Invoke action, with 0 to many arguments</para>
+ </listitem>
+
+ <listitem>
+ <para>get property default / get property choices / get action
+ parameter default / get action choices</para>
+
+ <para>To enable the testing of the choicesXxx() and defaultXxx()
+ supporting methods</para>
</listitem>
</itemizedlist>
- <para></para>
+ <para>The tables below summarizes the full of interactions that are
+ supported for properties:</para>
- <para>In addition, further CellBindings can be defined</para>
+ <table>
+ <title>Supported Interactions for Properties</title>
- <para></para>
+ <tgroup cols="6">
+ <colspec colname="_4" colnum="4" />
+
+ <colspec colname="_5" />
+
+ <colspec colname="_6" />
+
+ <thead>
+ <row>
+ <entry align="center">on object</entry>
+
+ <entry align="center">alias as</entry>
+
+ <entry align="center">perform</entry>
+
+ <entry align="center">using member</entry>
+
+ <entry align="center">that it</entry>
+
+ <entry align="center">value</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ hidden</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ visible</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ disabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ enabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ empty</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is not
+ empty</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry><classname>contains</classname></entry>
+
+ <entry><emphasis>value or object alias</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry><classname>does not contain</classname></entry>
+
+ <entry><emphasis>value or object alias</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check set property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry><classname>is valid for</classname></entry>
+
+ <entry><emphasis>value or object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check set property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry><classname>is not valid for</classname></entry>
+
+ <entry><emphasis> value or object alias</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check clear property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ valid</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check clear property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is not
+ valid</classname></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>set property</classname></entry>
+
+ <entry><emphasis>property name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis>value or object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>clear property</classname></entry>
+
+ <entry nameend="_6" namest="_4"><emphasis>property
+ name</emphasis><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for referenced object
+ </emphasis></entry>
+
+ <entry><classname>get property</classname></entry>
+
+ <entry nameend="_6" namest="_4"><emphasis>property
+ name</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for default object
+ </emphasis></entry>
+
+ <entry><classname>get property default</classname></entry>
+
+ <entry nameend="_6" namest="_4"><emphasis>property
+ name</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>sobject alias</emphasis></entry>
+
+ <entry><emphasis>alias for list of
+ choices</emphasis></entry>
+
+ <entry><classname>get property choices</classname></entry>
+
+ <entry nameend="_6" namest="_4"><emphasis>property
+ name</emphasis><emphasis> </emphasis></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>Obtaining a alias for the (value of) a property only makes
+ sense if the property is a reference type, not value type.</para>
+
+ <para>We likewise have a table for collections:</para>
+
+ <table>
+ <title>Supported Interactions for Collections</title>
+
+ <tgroup cols="6">
+ <colspec colname="_4" colnum="4" />
+
+ <colspec colname="_5" />
+
+ <colspec colname="_6" />
+
+ <thead>
+ <row>
+ <entry align="center">on object</entry>
+
+ <entry align="center">alias as</entry>
+
+ <entry align="center">perform</entry>
+
+ <entry align="center">using member</entry>
+
+ <entry align="center">that it</entry>
+
+ <entry align="center">reference</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ hidden</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ visible</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ disabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
- <para>The constructor for UsingIsisViewerPeer takes the following
- parameters:</para>
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ enabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ empty</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is not
+ empty</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for collection </emphasis></entry>
+
+ <entry><classname>get collection</classname></entry>
+
+ <entry nameend="_6" namest="_4"><emphasis>collection
+ name</emphasis><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>contains</classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>does not contain</classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check add to
+ collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>is valid for</classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check add to
+ collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>is not valid for</classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check remove from
+ collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>is valid for</classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check remove from
+ collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname>is not valid for</classname></entry>
+
+ <entry><emphasis>object alias</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>add to collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis>object alias </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>remove from collection</classname></entry>
+
+ <entry><emphasis>collection name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis> object alias</emphasis></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>Obtaining a reference to a collection allows objects to be
+ aliased from within it, using <xref
+ linkend="sec.AliasItemsInList" />.</para>
+
+ <para>Finally, we have a table for actions:</para>
+
+ <table>
+ <title>Supported Interactions for Actions</title>
+
+ <tgroup cols="6">
+ <colspec colname="_5" colnum="5" />
+
+ <colspec colname="_6" />
+
+ <thead>
+ <row>
+ <entry align="center">on object</entry>
+
+ <entry align="center">alias as</entry>
+
+ <entry align="center">perform</entry>
+
+ <entry align="center">using member</entry>
+
+ <entry align="center">that it</entry>
+
+ <entry align="center">with arguments (one or more
+ cols)</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ hidden</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ visble</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ disabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry nameend="_6" namest="_5"><classname>is
+ enabled</classname><emphasis> </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry><classname>is valid for</classname></entry>
+
+ <entry><emphasis>argument list </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis> </emphasis></entry>
+
+ <entry><classname>check action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry><classname>is not valid for</classname></entry>
+
+ <entry><emphasis>argument list </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for returned object
+ </emphasis></entry>
+
+ <entry><classname>invoke action</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis>argument list </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for parameter defaut
+ </emphasis></entry>
+
+ <entry><classname>get action default
+ parameter</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis>param number (0-based) </emphasis></entry>
+ </row>
+
+ <row>
+ <entry><emphasis>object alias</emphasis></entry>
+
+ <entry><emphasis>alias for list of parameter
+ choices</emphasis></entry>
+
+ <entry><classname>get action parameter
+ choices</classname></entry>
+
+ <entry><emphasis>action name</emphasis></entry>
+
+ <entry><classname> </classname></entry>
+
+ <entry><emphasis>param number (0-based) </emphasis></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>Note:</para>
<itemizedlist>
<listitem>
- <para>UsingIsisViewerPeer</para>
+ <para>the <acronym>API</acronym> provided by the common library
+ is not type-safe; the values (as provided in
+ <classname>StoryCell</classname>) must match the values given
+ here. While it is tempting to refactor the common library to use
+ type safe enums, this would move the need to translate story
+ text into each and every <acronym>BDD</acronym> framework
+ integration. The API is probably correct as it is, even though
+ it is reliant on the exact string phrases that appear in the
+ tables above.</para>
</listitem>
</itemizedlist>
-
- <para></para>
</sect3>
<sect3>
<title>Concordion</title>
- <para>The </para>
+ <para>The <emphasis>Concordion</emphasis> framework integration
+ provides a set of overloaded methods in
+ <classname>AbstractIsisConcordionTest</classname> which call into
+ the <classname>UsingIsisViewerPeer</classname>:</para>
<itemizedlist>
<listitem>
+ <para><methodname>#usingIsisViewer(String onObject, String
+ aliasResultAs, String perform, String usingMember)
+ </methodname></para>
+
+ <para>For interactions that have no "that it" or arguments (eg
+ "get collectoin recentlyPlacedOrders")</para>
+ </listitem>
+
+ <listitem>
+ <para><methodname>#usingIsisViewerThat(String onObject, String
+ aliasResultAs, String perform, String usingMember, String
+ thatIt)</methodname></para>
+
+ <para>For interactions that require a "that it" but no arguments
+ (eg, "check property firstName that it is hidden")</para>
+ </listitem>
+
+ <listitem>
+ <para><methodname>#usingIsisViewerArgs(String onObject, String
+ aliasResultAs, String perform, String usingMember, String arg0,
+ String arg1, ...</methodname>)</para>
+
+ <para>For interactions that require arguments, but no "that it"
+ (eg "invoke action placeOrder with arguments arg1, arg2,
+ arg3").</para>
+
+ <para>There are multiple overloaded versions of this method
+ taking from 1 to 5 arguments.</para>
+ </listitem>
+
+ <listitem>
+ <para><methodname>usingIsisViewerThatArgs(String onObject,
+ String aliasResultAs, String perform, String usingMember, String
+ arg0, String arg1, ...)</methodname></para>
+
+ <para>For interactions that require a "that it" and also an
+ argumetn or arguments (eg "check action placeOrder is not valid
+ for arg1, arg2, arg3)</para>
+
+ <para>There are multiple overloaded versions of this method
+ taking from 1 to 5 arguments.</para>
+ </listitem>
+
+ <listitem>
<para></para>
</listitem>
</itemizedlist>
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1036077&r1=1036076&r2=1036077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java Wed Nov 17 15:25:43 2010
@@ -7,32 +7,27 @@ import org.apache.isis.core.webapp.IsisS
import org.apache.isis.core.webapp.StaticContentFilter;
import org.apache.isis.core.webapp.servlets.ResourceServlet;
import org.apache.isis.viewer.restful.viewer.RestfulApplication;
-import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyParams;
+import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
final class EmbeddedWebViewerRestful extends EmbeddedWebViewer {
- @Override
- public WebAppSpecification getWebAppSpecification() {
- WebAppSpecification webAppSpec = new WebAppSpecification();
-
- webAppSpec.addContextParams(
- RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
-
- webAppSpec.addServletContextListener(ResteasyBootstrap.class);
-
- webAppSpec.addFilterSpecification(
- IsisSessionFilter.class,
- MapUtils.asMap(IsisSessionFilter.AUTHENTICATION_SESSION_LOOKUP_STRATEGY_KEY, AuthenticationSessionLookupStrategyParams.class.getName()),
- RestfulViewerInstaller.EVERYTHING);
- webAppSpec.addServletSpecification(
- HttpServletDispatcher.class, RestfulViewerInstaller.ROOT);
-
- webAppSpec.addFilterSpecification(
- StaticContentFilter.class, RestfulViewerInstaller.STATIC_CONTENT);
- webAppSpec.addServletSpecification(
- ResourceServlet.class, RestfulViewerInstaller.STATIC_CONTENT );
-
- return webAppSpec;
- }
+ @Override
+ public WebAppSpecification getWebAppSpecification() {
+ WebAppSpecification webAppSpec = new WebAppSpecification();
+
+ webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
+
+ webAppSpec.addServletContextListener(ResteasyBootstrap.class);
+
+ webAppSpec.addFilterSpecification(IsisSessionFilter.class, MapUtils.asMap(
+ IsisSessionFilter.AUTHENTICATION_SESSION_LOOKUP_STRATEGY_KEY,
+ AuthenticationSessionLookupStrategyTrusted.class.getName()), RestfulViewerInstaller.EVERYTHING);
+ webAppSpec.addServletSpecification(HttpServletDispatcher.class, RestfulViewerInstaller.ROOT);
+
+ webAppSpec.addFilterSpecification(StaticContentFilter.class, RestfulViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addServletSpecification(ResourceServlet.class, RestfulViewerInstaller.STATIC_CONTENT);
+
+ return webAppSpec;
+ }
}
\ No newline at end of file