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 12:47:43 UTC
svn commit: r1035988 - in /incubator/isis/trunk:
alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/
alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/
alternatives/remoting/common/src/main/java/org/apache/isis/...
Author: danhaywood
Date: Wed Nov 17 11:47:42 2010
New Revision: 1035988
URL: http://svn.apache.org/viewvc?rev=1035988&view=rev
Log:
deleting empty folders, rename of repository class impl's in support/prototype
Added:
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/
- copied from r1035978, incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/
incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryDefault.java
- copied, changed from r1035978, incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java
incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryDefault.java
- copied, changed from r1035978, incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryInMemory.java
incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/lib/
Removed:
incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/extensions/
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/
incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/runtime/
incubator/isis/trunk/alternatives/security/ldap/src/main/java/org/apache/isis/runtime/
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/
incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java
incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryInMemory.java
incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/
incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/
incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/
incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/webapp/
incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/
Modified:
incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticatorTester.java
incubator/isis/trunk/support/prototype/quickrun/config/isis.properties
incubator/isis/trunk/support/prototype/quickrun/src/test/java/org/apache/isis/support/prototype/junit/AbstractTest.java
incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/support/prototype/common/BootstrapInExplorationMode.html
incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/support/prototype/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
Modified: incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticatorTester.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticatorTester.java?rev=1035988&r1=1035978&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticatorTester.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/alternatives/security/ldap/authentication/LdapAuthenticatorTester.java Wed Nov 17 11:47:42 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication.standard.ldap;
+package org.apache.isis.alternatives.security.ldap.authentication;
import org.apache.isis.alternatives.security.ldap.authentication.LdapAuthenticator;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
Copied: incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryDefault.java (from r1035978, incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryDefault.java?p2=incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryDefault.java&p1=incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java&r1=1035978&r2=1035988&rev=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryInMemory.java (original)
+++ incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/claim/ClaimRepositoryDefault.java Wed Nov 17 11:47:42 2010
@@ -38,7 +38,7 @@ import org.apache.isis.support.prototype
import com.google.common.collect.Maps;
-public class ClaimRepositoryInMemory extends AbstractFactoryAndRepository implements ClaimRepository {
+public class ClaimRepositoryDefault extends AbstractFactoryAndRepository implements ClaimRepository {
// {{ Id, iconName
@Override
Copied: incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryDefault.java (from r1035978, incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryInMemory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryDefault.java?p2=incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryDefault.java&p1=incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryInMemory.java&r1=1035978&r2=1035988&rev=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryInMemory.java (original)
+++ incubator/isis/trunk/support/prototype/objstore-default/src/main/java/org/apache/isis/support/prototype/objstore/dflt/employee/EmployeeRepositoryDefault.java Wed Nov 17 11:47:42 2010
@@ -26,7 +26,7 @@ import org.apache.isis.support.prototype
import org.apache.isis.support.prototype.dom.employee.EmployeeRepository;
import org.apache.isis.support.prototype.dom.employee.EmployeeTakeOn;
-public class EmployeeRepositoryInMemory extends AbstractFactoryAndRepository implements EmployeeRepository {
+public class EmployeeRepositoryDefault extends AbstractFactoryAndRepository implements EmployeeRepository {
// {{ Id, iconName
@Override
Modified: incubator/isis/trunk/support/prototype/quickrun/config/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/quickrun/config/isis.properties?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/quickrun/config/isis.properties (original)
+++ incubator/isis/trunk/support/prototype/quickrun/config/isis.properties Wed Nov 17 11:47:42 2010
@@ -1,5 +1,5 @@
isis.services.prefix = org.apache.isis.support.prototype.objstore.dflt
-isis.services = employee.EmployeeRepositoryInMemory, claim.ClaimRepositoryInMemory
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
isis.fixtures.prefix= org.apache.isis.support.prototype.fixture
isis.fixtures= ClaimsFixture
Modified: incubator/isis/trunk/support/prototype/quickrun/src/test/java/org/apache/isis/support/prototype/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/quickrun/src/test/java/org/apache/isis/support/prototype/junit/AbstractTest.java?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/quickrun/src/test/java/org/apache/isis/support/prototype/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/support/prototype/quickrun/src/test/java/org/apache/isis/support/prototype/junit/AbstractTest.java Wed Nov 17 11:47:42 2010
@@ -25,8 +25,8 @@ import org.apache.isis.progmodel.wrapper
import org.apache.isis.support.prototype.dom.claim.ClaimRepository;
import org.apache.isis.support.prototype.dom.employee.Employee;
import org.apache.isis.support.prototype.dom.employee.EmployeeRepository;
-import org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryInMemory;
-import org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryInMemory;
+import org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryDefault;
+import org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryDefault;
import org.apache.isis.viewer.junit.IsisTestRunner;
import org.apache.isis.viewer.junit.Service;
import org.apache.isis.viewer.junit.Services;
@@ -35,7 +35,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
@RunWith(IsisTestRunner.class)
-@Services({ @Service(ClaimRepositoryInMemory.class), @Service(EmployeeRepositoryInMemory.class) })
+@Services({ @Service(ClaimRepositoryDefault.class), @Service(EmployeeRepositoryDefault.class) })
public abstract class AbstractTest {
private DomainObjectContainer domainObjectContainer;
Modified: incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/support/prototype/common/BootstrapInExplorationMode.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/support/prototype/common/BootstrapInExplorationMode.html?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/support/prototype/common/BootstrapInExplorationMode.html (original)
+++ incubator/isis/trunk/support/prototype/viewer-bdd/src/test/resources/org/apache/isis/support/prototype/common/BootstrapInExplorationMode.html Wed Nov 17 11:47:42 2010
@@ -24,12 +24,12 @@ mode,
<th concordion:assertTrue="#result"/>
</tr>
<tr>
- <td>org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryInMemory</td>
+ <td>org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryDefault</td>
<td>claims</td>
<td>ok</td>
</tr>
<tr>
- <td>org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryInMemory</td>
+ <td>org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryDefault</td>
<td>employees</td>
<td>ok</td>
</tr>
Modified: incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/isis.properties?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/isis.properties Wed Nov 17 11:47:42 2010
@@ -1,5 +1,5 @@
isis.services.prefix = org.apache.isis.support.prototype.objstore.dflt
-isis.services = employee.EmployeeRepositoryInMemory, claim.ClaimRepositoryInMemory
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
isis.fixtures.prefix= org.apache.isis.support.prototype.fixture
isis.fixtures= ClaimsFixture
Modified: incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/isis.properties?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/isis.properties Wed Nov 17 11:47:42 2010
@@ -1,5 +1,5 @@
isis.services.prefix = org.apache.isis.support.prototype.objstore.dflt
-isis.services = employee.EmployeeRepositoryInMemory, claim.ClaimRepositoryInMemory
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
isis.fixtures.prefix= org.apache.isis.support.prototype.fixture
isis.fixtures= ClaimsFixture
Modified: incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties Wed Nov 17 11:47:42 2010
@@ -1,5 +1,5 @@
isis.services.prefix = org.apache.isis.support.prototype.objstore.dflt
-isis.services = employee.EmployeeRepositoryInMemory, claim.ClaimRepositoryInMemory
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
isis.fixtures.prefix= org.apache.isis.support.prototype.fixture
isis.fixtures= ClaimsFixture
Modified: incubator/isis/trunk/support/prototype/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-wicket/src/main/webapp/WEB-INF/isis.properties?rev=1035988&r1=1035987&r2=1035988&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-wicket/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/support/prototype/viewer-wicket/src/main/webapp/WEB-INF/isis.properties Wed Nov 17 11:47:42 2010
@@ -1,5 +1,5 @@
isis.services.prefix = org.apache.isis.support.prototype.objstore.dflt
-isis.services = employee.EmployeeRepositoryInMemory, claim.ClaimRepositoryInMemory
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
isis.fixtures.prefix= org.apache.isis.support.prototype.fixture
isis.fixtures= ClaimsFixture
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=1035988&r1=1035987&r2=1035988&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 11:47:42 2010
@@ -102,7 +102,7 @@
somewhat less clumsy term).</para>
</sect1>
- <sect1>
+ <sect1 id="sec.CommonLibrary">
<title>Common Library</title>
<para><emphasis>Apache Isis</emphasis> integrates with
@@ -143,6 +143,17 @@
values in the rows of the table to the properties specified in the
header.</para>
+ <para>Each <classname>CellBinding</classname> has a name (eg "on
+ object") and some alternative names (eg "using"). This is useful for
+ <acronym>BDD</acronym> frameworks (such as
+ <emphasis>FitNesse</emphasis>) where the provided text from the
+ story needs to be parsed in some way, matching up columns with the
+ fixture. Other <acronym>BDD</acronym> frameworks (eg
+ <emphasis>Concordion</emphasis>) don't need this particular feature
+ (the <emphasis>Concordion</emphasis> integration calls pre-canned
+ methods so the matching is done simply by parameter position to
+ these method).</para>
+
<para>The library provides a default implementation, though
subclasses can override if required.</para>
</listitem>
@@ -1196,40 +1207,65 @@ and running in <span concordion:set="
using "Alias Items In List" (see <xref
linkend="sec.AliasItemsInList" />).</para>
- <para>The UsingIsisViewerPeer uses
- <classname>CellBinding</classname>s (see ) to defin</para>
-
- <para>In order to be able to fit different types of interactions
- into a table structure, the
- <classname>UsingIsisViewerPeer</classname> is quite flexible, with
- support for various columns, some of which are optional dependent
- upon context. The column names below </para>
+ <para>Because <classname>UsingIsisViewerPeer</classname> is
+ table-oriented, it uses <classname>CellBinding</classname>s (see
+ <xref linkend="sec.CommonLibrary" />) to bind table headers to rows.
+ The constructor takes the following parameters:</para>
<itemizedlist>
<listitem>
- <para>on object</para>
+ <para><classname>AliasRegistry</classname></para>
+
+ <para>Used to access aliases for existing domain objects, and to
+ register aliases for newly created/found objects.</para>
+ </listitem>
- <para>Always required, this is the (alias of) the obejct to
- interact with.</para>
+ <listitem>
+ <para><classname>Perform.Mode</classname></para>
- <para>Can also use 'object', or 'on'</para>
+ <para>Whether to actually perform the interactions or not</para>
</listitem>
<listitem>
- <para>alias result as</para>
+ <para><classname>CellBinding</classname>s for each of the
+ standard columns of the table</para>
- <para>the alias to assign the result of any interaction.
- Optional, but common in most interactions.</para>
+ <para>These are discussed below.</para>
</listitem>
+ </itemizedlist>
+ <para>The <classname>CellBinding</classname>s passed into the
+ constructor correspond to the standard columns of the table.
+ Although all must be passed in, not all are needed for every
+ interaction; in these cases the value can be left blank. The
+ <classname>CellBinding</classname>s correspond to the following
+ column names:</para>
+
+ <itemizedlist>
<listitem>
- <para>perform</para>
+ <para>"on object" column (can also use 'object', or 'on')</para>
- <para>the interaction to perform (see below)</para>
+ <para>The (alias of) the obejct to interact with. A value must
+ always be provided.</para>
</listitem>
<listitem>
- <para>on member</para>
+ <para>"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",
+ "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 property, collection or action to use</para>
</listitem>
@@ -1255,6 +1291,8 @@ and running in <span concordion:set="
<para></para>
+ <para>In addition, further CellBindings can be defined</para>
+
<para></para>
<para>The constructor for UsingIsisViewerPeer takes the following