Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 76875 invoked from network); 17 Nov 2010 15:26:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Nov 2010 15:26:32 -0000 Received: (qmail 3356 invoked by uid 500); 17 Nov 2010 15:27:03 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 3338 invoked by uid 500); 17 Nov 2010 15:27:03 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 3328 invoked by uid 99); 17 Nov 2010 15:27:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 15:27:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 15:26:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D524623889FD; Wed, 17 Nov 2010 15:25:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/... Date: Wed, 17 Nov 2010 15:25:44 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101117152544.D524623889FD@eris.apache.org> 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 @@ Logon - org.apache.isis.extensions.html.servlet.LogonServlet + org.apache.isis.viewer.html.servlet.LogonServlet Controller - org.apache.isis.extensions.html.servlet.ControllerServlet + org.apache.isis.viewer.html.servlet.ControllerServlet 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 @@ dispatcher - org.apache.isis.core.webapp.servlet.DispatcherServlet + org.apache.isis.viewer.scimpi.servlet.DispatcherServlet 1 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 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 argumentCells; public PerformContext(final UsingIsisViewerPeer peer, final ObjectAdapter onAdapter, - final ObjectMember nakedObjectMember, + final ObjectMember objectMember, final List 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 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 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 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 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 protected 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 @@ The default implementation just wraps a java.lang.String, but some frameworks (eg - FitNesse) have other means of + FitNesse) have other means of @@ -365,7 +365,7 @@ In order to test an Apache Isis domain application, a running instance of an IsisSystem - must be bootstrapped, with the appropriate configuration. + must be bootstrapped, with the appropriate configuration. Story Context @@ -769,8 +769,8 @@ and running in <span concordion:set=" FitNesse - The FitNesse integration provides four versions (overloaded - only so reads well in the page): + The FitNesse integration provides four + versions (overloaded only so reads well in the page): @@ -1040,6 +1040,7 @@ and running in <span concordion:set=" #setUpObject(String className, String aliasAs, + String propertyName1, String propertyName2, ...) There are 10 overloaded versions of this method, to @@ -1166,7 +1167,7 @@ and running in <span concordion:set=" 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. + results of those actions. Using Isis Viewer / Using Isis Viewer For Setup @@ -1243,77 +1244,824 @@ and running in <span concordion:set=" - "on object" column (can also use 'object', or 'on') + the "on object" column (can also use 'object', or 'on' if + parsing column name provided by story text) - The (alias of) the obejct to interact with. A value must + The (alias of) the object to interact with. A value must always be provided. - "alias result as" column (can also use "result=", + the "alias result as" column (can also use "result=", "alias=", "alias as") The alias to assign the result of any interaction. - "perform" column (can also use "do", "interaction", + the "perform" column (can also use "do", "interaction", "interaction type") the interaction to perform; discussed further below - "on member" column (can also use "member", "using member", - using") + the "on member" column (can also use "member", "using + member", using") the property, collection or action to use - that it + the "that it" column (can also use "that", "verb") - + optional qualifier for interactions that make checks; + discussed below - with arguments + the "with arguments" (can also "arguments", "parameters", + "with parameters", "for", "value", "for parameters", "value", + "reference") - + 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. + + + The valid values that can be provided for the "perform" + binding are: + - on object + check property / check collection / check add to + collection / check remove from collection / check action - + 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 (some argument list)" + + + + get property / set property / clear property + + Read from or write to a collection. If setting, a single + argument is required + + + + get collection / add to collection / remove from + collection + + Read or write from a collection. If writing, a single + argument is required + + + + invoke action + + Invoke action, with 0 to many arguments + + + + get property default / get property choices / get action + parameter default / get action choices + + To enable the testing of the choicesXxx() and defaultXxx() + supporting methods - + The tables below summarizes the full of interactions that are + supported for properties: - In addition, further CellBindings can be defined + + Supported Interactions for Properties - + + + + + + + + + + on object + + alias as + + perform + + using member + + that it + + value + + + + + + object alias + + + + check property + + property name + + is + hidden + + + + object alias + + + + check property + + property name + + is + visible + + + + object alias + + + + check property + + property name + + is + disabled + + + + object alias + + + + check property + + property name + + is + enabled + + + + object alias + + + + check property + + property name + + is + empty + + + + object alias + + + + check property + + property name + + is not + empty + + + + object alias + + + + check property + + property name + + contains + + value or object alias + + + + object alias + + + + check property + + property name + + does not contain + + value or object alias + + + + object alias + + + + check set property + + property name + + is valid for + + value or object alias + + + + object alias + + + + check set property + + property name + + is not valid for + + value or object alias + + + + object alias + + + + check clear property + + property name + + is + valid + + + + object alias + + + + check clear property + + property name + + is not + valid + + + + object alias + + + + set property + + property name + + + + value or object alias + + + + object alias + + + + clear property + + property + name + + + + object alias + + alias for referenced object + + + get property + + property + name + + + + object alias + + alias for default object + + + get property default + + property + name + + + + sobject alias + + alias for list of + choices + + get property choices + + property + name + + + +
+ + Obtaining a alias for the (value of) a property only makes + sense if the property is a reference type, not value type. + + We likewise have a table for collections: + + + Supported Interactions for Collections + + + + + + + + + + + on object + + alias as + + perform + + using member + + that it + + reference + + + + + + object alias + + + + check collection + + collection name + + is + hidden + + + + object alias + + + + check collection + + collection name + + is + visible + + + + object alias + + + + check collection + + collection name + + is + disabled + + + + object alias - The constructor for UsingIsisViewerPeer takes the following - parameters: + + + check collection + + collection name + + is + enabled + + + + object alias + + + + check collection + + collection name + + is + empty + + + + object alias + + + + check collection + + collection name + + is not + empty + + + + object alias + + alias for collection + + get collection + + collection + name + + + + object alias + + + + check collection + + collection name + + contains + + object alias + + + + object alias + + + + check collection + + collection name + + does not contain + + object alias + + + + object alias + + + + check add to + collection + + collection name + + is valid for + + object alias + + + + object alias + + + + check add to + collection + + collection name + + is not valid for + + object alias + + + + object alias + + + + check remove from + collection + + collection name + + is valid for + + object alias + + + + object alias + + + + check remove from + collection + + collection name + + is not valid for + + object alias + + + + object alias + + + + add to collection + + collection name + + + + object alias + + + + object alias + + + + remove from collection + + collection name + + + + object alias + + + +
+ + Obtaining a reference to a collection allows objects to be + aliased from within it, using . + + Finally, we have a table for actions: + + + Supported Interactions for Actions + + + + + + + + + on object + + alias as + + perform + + using member + + that it + + with arguments (one or more + cols) + + + + + + object alias + + + + check action + + action name + + is + hidden + + + + object alias + + + + check action + + action name + + is + visble + + + + object alias + + + + check action + + action name + + is + disabled + + + + object alias + + + + check action + + action name + + is + enabled + + + + object alias + + + + check action + + action name + + is valid for + + argument list + + + + object alias + + + + check action + + action name + + is not valid for + + argument list + + + + object alias + + alias for returned object + + + invoke action + + action name + + + + argument list + + + + object alias + + alias for parameter defaut + + + get action default + parameter + + action name + + + + param number (0-based) + + + + object alias + + alias for list of parameter + choices + + get action parameter + choices + + action name + + + + param number (0-based) + + + +
+ + Note: - UsingIsisViewerPeer + the API provided by the common library + is not type-safe; the values (as provided in + StoryCell) 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 BDD 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. - - Concordion - The + The Concordion framework integration + provides a set of overloaded methods in + AbstractIsisConcordionTest which call into + the UsingIsisViewerPeer: + #usingIsisViewer(String onObject, String + aliasResultAs, String perform, String usingMember) + + + For interactions that have no "that it" or arguments (eg + "get collectoin recentlyPlacedOrders") + + + + #usingIsisViewerThat(String onObject, String + aliasResultAs, String perform, String usingMember, String + thatIt) + + For interactions that require a "that it" but no arguments + (eg, "check property firstName that it is hidden") + + + + #usingIsisViewerArgs(String onObject, String + aliasResultAs, String perform, String usingMember, String arg0, + String arg1, ...) + + For interactions that require arguments, but no "that it" + (eg "invoke action placeOrder with arguments arg1, arg2, + arg3"). + + There are multiple overloaded versions of this method + taking from 1 to 5 arguments. + + + + usingIsisViewerThatArgs(String onObject, + String aliasResultAs, String perform, String usingMember, String + arg0, String arg1, ...) + + For interactions that require a "that it" and also an + argumetn or arguments (eg "check action placeOrder is not valid + for arg1, arg2, arg3) + + There are multiple overloaded versions of this method + taking from 1 to 5 arguments. + + + 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