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 2013/07/12 09:08:31 UTC
[15/19] ISIS-463: mothballing BDD viewer
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java b/component/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java
deleted file mode 100644
index 01617b4..0000000
--- a/component/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.common.registries;
-
-import org.hamcrest.CoreMatchers;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryDefault;
-
-@RunWith(JMock.class)
-public class AliasesRegistryTest {
-
- private final Mockery mockery = new JUnit4Mockery();
-
- private AliasRegistryDefault registry;
-
- private ObjectAdapter mockAdapter1;
- private ObjectAdapter mockAdapter2;
- @SuppressWarnings("unused")
- private ObjectAdapter mockAdapter3;
-
- @Before
- public void setUp() throws Exception {
- mockAdapter1 = mockery.mock(ObjectAdapter.class, "adapter1");
- mockAdapter2 = mockery.mock(ObjectAdapter.class, "adapter2");
- mockAdapter3 = mockery.mock(ObjectAdapter.class, "adapter3");
- registry = new AliasRegistryDefault();
- }
-
- @Test
- public void registerOneAdapter() {
- final String heldAs1 = registry.aliasPrefixedAs("Foo", mockAdapter1);
- Assert.assertThat(heldAs1, CoreMatchers.is("Foo#1"));
- }
-
- @Test
- public void registerTwoAdaptersOfSamePrefix() {
- @SuppressWarnings("unused")
- final String heldAs1 = registry.aliasPrefixedAs("Foo", mockAdapter1);
- final String heldAs2 = registry.aliasPrefixedAs("Foo", mockAdapter2);
- Assert.assertThat(heldAs2, CoreMatchers.is("Foo#2"));
- }
-
- @Test
- public void registerAdaptersOfDiffereingPrefixes() {
- @SuppressWarnings("unused")
- final String heldAs1 = registry.aliasPrefixedAs("Foo", mockAdapter1);
- final String heldAs2 = registry.aliasPrefixedAs("Bar", mockAdapter2);
- Assert.assertThat(heldAs2, CoreMatchers.is("Bar#1"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/pom.xml b/component/viewer/bdd/concordion/pom.xml
deleted file mode 100755
index bbdcd9c..0000000
--- a/component/viewer/bdd/concordion/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-viewer-bdd-concordion</artifactId>
- <name>Isis BDD Viewer (Concordion)</name>
-
- <properties>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>concordion/</relativeUrl>
-
- <concordion.version>1.4.3</concordion.version>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://isis.apache.org/${relativeUrl}</url>
-
- <dependencyManagement>
- <dependencies>
-
- <!-- 3rd party dependencies -->
- <dependency>
- <groupId>org.concordion</groupId>
- <artifactId>concordion</artifactId>
- <version>${concordion.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.concordion</groupId>
- <artifactId>concordion</artifactId>
- <exclusions>
- <exclusion>
- <!-- excluded because of LGPL; end-developer must include in POM file directly -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java
deleted file mode 100644
index ecf7eb0..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.concordion.Concordion;
-import org.concordion.api.ResultSummary;
-import org.concordion.internal.ConcordionBuilder;
-import org.concordion.internal.FileTarget;
-import org.junit.Test;
-
-import org.apache.isis.core.commons.lang.IoUtils;
-import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.viewer.bdd.common.Scenario;
-import org.apache.isis.viewer.bdd.common.ScenarioValueException;
-import org.apache.isis.viewer.bdd.common.fixtures.SetUpObjectsPeer.Mode;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.Perform;
-import org.apache.isis.viewer.bdd.concordion.internal.concordion.IsisExecuteCommandWithHeader;
-import org.apache.isis.viewer.bdd.concordion.internal.fixtures.AliasItemsInListForConcordion;
-import org.apache.isis.viewer.bdd.concordion.internal.fixtures.CheckCollectionContentsForConcordion;
-import org.apache.isis.viewer.bdd.concordion.internal.fixtures.CheckListForConcordion;
-import org.apache.isis.viewer.bdd.concordion.internal.fixtures.SetUpObjectsForConcordion;
-import org.apache.isis.viewer.bdd.concordion.internal.fixtures.UsingIsisViewerForConcordion;
-
-public abstract class AbstractIsisConcordionScenario {
-
- public static final String DEFAULT_CONCORDION_CSS = "concordion.css";
-
- /**
- * The system property that is searched for to use as the
- * {@link #outputDir() target directory}.
- */
- public static final String DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY = "concordion.output.dir";
-
- /**
- * The directory used by default if the
- * {@link #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY default property} for the
- * {@link #outputDir() target directory} is not specified (and the
- * {@link #outputDir()} method has not been overridden).
- */
- public static final String DEFAULT_OUTPUT_DIR = "/tmp/concordion";
-
- public static final String NS_URI = "http://isis.apache.org/2010/concordion";
- private static final String CMD_EXECUTE = "execute";
-
- private static ThreadLocal<Scenario> scenarioThreadLocal = new ThreadLocal<Scenario>() {
- @Override
- protected Scenario initialValue() {
- return new Scenario();
- }
- };
-
- public static Scenario getScenario() {
- return scenarioThreadLocal.get();
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // @Test
- // ////////////////////////////////////////////////////////////////////////
-
- @Test
- public void runScenario() throws Throwable {
- BasicConfigurator.configure();
- LogManager.getRootLogger().setLevel(Level.INFO);
- try {
- final Concordion concordion = createConcordion();
- final ResultSummary resultSummary = concordion.process(this);
- resultSummary.print(System.out, this);
- resultSummary.assertIsSatisfied(this);
- } finally {
- copyCustomCssIfDefined();
- }
- }
-
- private void copyCustomCssIfDefined() {
- final Class<?> cssClass = customCssPackage();
- final String customCss = customCss();
- if (cssClass == null || customCss == null) {
- return;
- }
- final InputStream cssInputFile = cssClass.getResourceAsStream(customCss);
- final String cssPackageName = cssClass.getPackage().getName();
- final String cssPackagePath = asPath(cssPackageName);
- final String cssOutputFileName = StringUtils.combinePaths(outputDir(), cssPackagePath, customCss);
- try {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(cssInputFile, baos);
- if (baos.size() > 0) {
- IoUtils.copy(new ByteArrayInputStream(baos.toByteArray()), new FileOutputStream(cssOutputFileName));
- }
- } catch (final IllegalArgumentException e) {
- System.err.printf("failed to copy custom CSS to '%s'\n", customCss, cssOutputFileName);
- return;
- } catch (final IOException e) {
- System.err.printf("failed to copy custom CSS '%s' to '%s'\n", customCss, cssOutputFileName);
- return;
- }
- }
-
- private String asPath(final String name) {
- return name.replace('.', File.separatorChar);
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // Hooks
- // ////////////////////////////////////////////////////////////////////////
-
- /**
- * The directory to which the processed HTML should be copied.
- *
- * <p>
- * Defaults to the value of the
- * {@value #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY} system property, or
- * {@value #DEFAULT_OUTPUT_DIR} if that property is not specified.
- *
- * <p>
- * Can either be overridden if wish to specify some other mechanism for
- * determining where the output is generated.
- */
- protected String outputDir() {
- final String concordionOutputDir = System.getProperty(DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY);
- return StringUtils.isNullOrEmpty(concordionOutputDir) ? DEFAULT_OUTPUT_DIR : concordionOutputDir;
- }
-
- /**
- * Optional hook method to specify the class (any class) that resides in the
- * same package as the {@link #customCss()}.
- *
- * <p>
- * Return <tt>null</tt> if no custom CSS has been provided.
- *
- * @see #customCss()
- */
- protected Class<?> customCssPackage() {
- return null;
- }
-
- /**
- * Optional hook method to specify the name of the custom CSS file.
- *
- * <p>
- * Defaults to {@value #DEFAULT_CONCORDION_CSS} so you do not need to
- * override if your custom CSS file has this name. However, it is necessary
- * to override {@link #customCssPackage()} to indicate the package that the
- * CSS resides in.
- *
- * @see #customCssPackage()
- */
- protected String customCss() {
- return DEFAULT_CONCORDION_CSS;
- }
-
- private Concordion createConcordion() {
- final String targetDir = outputDir();
- if (targetDir == null) {
- throw new IllegalStateException("targetDir() cannot be null");
- }
- final ConcordionBuilder builder = new ConcordionBuilder() {
- }.withTarget(new FileTarget(new File(targetDir))).withCommand(NS_URI, CMD_EXECUTE, new IsisExecuteCommandWithHeader());
- return builder.build();
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // bootstrapIsis / shutdownIsis
- // ////////////////////////////////////////////////////////////////////////
-
- /**
- * For calling within a <tt>#setUp()</tt> method.
- *
- * @see {@link #bootstrapIsis(String, String)}
- */
- public void bootstrapIsis(final String configDirectory, final DeploymentType deploymentType) {
- getScenario().bootstrapIsis(StringUtils.normalized(configDirectory), deploymentType);
- }
-
- /**
- * For calling from XHTML script.
- *
- * @see #bootstrapIsis(String, DeploymentType)
- * @return <tt>boolean</tt> so that XHTML can assert on it.
- */
- public boolean bootstrapIsis(final String configDirectory, final String deploymentTypeStr) {
- bootstrapIsis(configDirectory, DeploymentType.lookup(StringUtils.normalized(deploymentTypeStr)));
- return true; // any runtime exception will propagate
- }
-
- public void shutdownIsis() {
- getScenario().shutdownIsis();
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // logon as / switch user
- // ////////////////////////////////////////////////////////////////////////
-
- public boolean logonAs(final String userName) {
- getScenario().logonAsOrSwitchUserTo(StringUtils.normalized(userName));
- return true;
- }
-
- public boolean logonAsWithRoles(final String userName, final String roleListStr) {
- final List<String> roleList = StringUtils.splitOnCommas(StringUtils.normalized(roleListStr));
- getScenario().logonAsOrSwitchUserTo(userName, roleList);
- return true;
- }
-
- public void switchUser(final String userName) {
- logonAs(userName);
- }
-
- public void switchUserWithRoles(final String userName, final String roleListStr) {
- logonAsWithRoles(userName, roleListStr);
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // date is / time is
- // ////////////////////////////////////////////////////////////////////////
-
- public boolean usingDateFormat(final String dateFormatStr) {
- getScenario().usingDateFormat(dateFormatStr);
- return true;
- }
-
- public boolean usingTimeFormat(final String timeFormatStr) {
- getScenario().usingTimeFormat(timeFormatStr);
- return true;
- }
-
- public boolean dateIs(final String dateAndTimeStr) throws ScenarioValueException {
- return dateAndTimeIs(dateAndTimeStr);
- }
-
- public boolean timeIs(final String dateAndTimeStr) throws ScenarioValueException {
- return dateAndTimeIs(dateAndTimeStr);
- }
-
- private boolean dateAndTimeIs(final String dateAndTimeStr) throws ScenarioValueException {
- return getScenario().dateAndTimeIs(dateAndTimeStr);
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // alias service
- // ////////////////////////////////////////////////////////////////////////
-
- public boolean aliasService(final String aliasAs, final String className) {
- try {
- getScenario().getAliasRegistry().aliasService(StringUtils.normalized(aliasAs), StringUtils.normalized(className));
- return true;
- } catch (final ScenarioValueException e) {
- return false;
- }
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // setup object
- // ////////////////////////////////////////////////////////////////////////
-
- public String setUpObject(final String className, final String alias, final String arg0) {
- return setUpObjectsVarargs(className, alias, arg0);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1) {
- return setUpObjectsVarargs(className, alias, arg0, arg1);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7, final String arg8) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
- }
-
- public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7, final String arg8, final String arg9) {
- return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
- }
-
- private SetUpObjectsForConcordion setUpObjects;
-
- /**
- * Workaround for OGNL defect.
- */
- protected String setUpObjectsVarargs(final String className, final String alias, final String... propertyValues) {
- return setUpObjectsVarargsNormalized(StringUtils.normalized(className), StringUtils.normalized(alias), StringUtils.normalized(propertyValues));
- }
-
- private String setUpObjectsVarargsNormalized(final String className, final String alias, final String... propertyValues) {
- if (executingInline()) {
- setUpObjects = new SetUpObjectsForConcordion(getScenario().getAliasRegistry(), className, Mode.PERSIST);
- setUpObjects.executeHeader(alias, propertyValues);
- return setUpObjects.executeRow(alias, propertyValues);
- } else {
- if (executingTableHeader()) {
- setUpObjects = new SetUpObjectsForConcordion(getScenario().getAliasRegistry(), className, Mode.PERSIST);
- return setUpObjects.executeHeader(alias, propertyValues);
- } else {
- return setUpObjects.executeRow(alias, propertyValues);
- }
- }
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // using isis viewer
- // ////////////////////////////////////////////////////////////////////////
-
- private UsingIsisViewerForConcordion usingIsisViewer;
-
- public String usingIsisViewer(final String onObject, final String aliasResultAs, final String perform, final String usingMember) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, null, null, null);
- }
-
- public String usingIsisViewerThat(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, null, null, null);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3, arg4);
- }
-
- public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3, arg4, arg5);
- }
-
- public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
- }
-
- public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1);
- }
-
- public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2);
- }
-
- public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2, final String arg3) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2, arg3);
- }
-
- public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
- return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2, arg3, arg4);
- }
-
- /**
- * With <tt>protected</tt> visibility so that it can be called by custom
- * methods if required.
- */
- protected String usingIsisViewerThatArgsVarargs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
- return usingIsisViewerThatArgsVarargsNormalized(StringUtils.normalized(onObject), StringUtils.normalized(aliasResultAs), StringUtils.normalized(perform), StringUtils.normalized(usingMember), StringUtils.normalized(thatIt), StringUtils.normalized(arg0), StringUtils.normalized(remainingArgs));
- }
-
- private String usingIsisViewerThatArgsVarargsNormalized(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
- if (executingInline()) {
- usingIsisViewer = new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario().getDeploymentType(), getScenario().getDateParser(), Perform.Mode.TEST);
- usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
- return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
- } else {
- if (executingTableHeader()) {
- usingIsisViewer = new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario().getDeploymentType(), getScenario().getDateParser(), Perform.Mode.TEST);
- return usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
- } else {
- return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
- }
- }
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // check collection
- // ////////////////////////////////////////////////////////////////////////
-
- public String checkCollectionIsEmpty(final String listAlias) {
- return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).isEmpty();
- }
-
- public String checkCollectionIsNotEmpty(final String listAlias) {
- return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).isNotEmpty();
- }
-
- public String checkCollectionContains(final String listAlias, final String alias) {
- return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).contains(StringUtils.normalized(alias));
- }
-
- public String checkCollectionDoesNotContain(final String listAlias, final String alias) {
- return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).doesNotContain(StringUtils.normalized(alias));
- }
-
- public String checkCollectionSize(final String listAlias, final int size) {
- return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).assertSize(size);
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // check list
- // ////////////////////////////////////////////////////////////////////////
-
- private CheckListForConcordion checkList;
-
- public String checkList(final String listAlias, final String title) {
- if (executingTable()) {
- if (executingTableHeader()) {
- checkList = new CheckListForConcordion(getScenario().getAliasRegistry(), listAlias);
- return checkList.executeHeader(title);
- } else {
- return checkList.executeRow(title);
- }
- } else {
- checkList = new CheckListForConcordion(getScenario().getAliasRegistry(), listAlias);
- checkList.executeHeader(title);
- return checkList.executeRow(title);
- }
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // getListContents() (for verifyRow)
- // ////////////////////////////////////////////////////////////////////////
-
- public Iterable<Object> getListContents(final String listAlias) {
- final ObjectAdapter listAdapter = getScenario().getAliasRegistry().getAliased(StringUtils.normalized(listAlias));
- if (listAdapter == null) {
- return Collections.emptyList();
- }
- final CollectionFacet facet = listAdapter.getSpecification().getFacet(CollectionFacet.class);
- if (facet == null) {
- return Collections.emptyList();
- }
- final Iterable<ObjectAdapter> objectAdapters = facet.iterable(listAdapter);
- return Iterables.transform(objectAdapters, new Function<ObjectAdapter, Object>() {
-
- @Override
- public Object apply(final ObjectAdapter from) {
- return from.getObject();
- }
- });
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // alias items in list
- // ////////////////////////////////////////////////////////////////////////
-
- private AliasItemsInListForConcordion aliasItemsInList;
-
- public String aliasItemsInList(final String listAlias, final String title, final String aliasAs) {
- return aliasItemsInList(listAlias, title, null, aliasAs);
- }
-
- public String aliasItemsInList(final String listAlias, final String title, final String type, final String aliasAs) {
- aliasItemsInList = new AliasItemsInListForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias));
- return aliasItemsInList.execute(StringUtils.normalized(aliasAs), StringUtils.normalized(title), StringUtils.normalized(type));
- }
-
- private boolean executingTableHeader() {
- return executingTable() && IsisExecuteCommandWithHeader.tableRow.get() == IsisExecuteCommandWithHeader.TableRow.HEADER;
- }
-
- private boolean executingTable() {
- final IsisExecuteCommandWithHeader.Context context = IsisExecuteCommandWithHeader.context.get();
- return context == IsisExecuteCommandWithHeader.Context.TABLE;
- }
-
- private boolean executingInline() {
- return !executingTable();
- }
-
- // ////////////////////////////////////////////////////////////////////////
- // run viewer
- // ////////////////////////////////////////////////////////////////////////
-
- public void runViewer() {
- getScenario().runViewer();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java
deleted file mode 100644
index 63decb1..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.concordion;
-
-import org.concordion.api.CommandCall;
-import org.concordion.api.Evaluator;
-import org.concordion.api.ResultRecorder;
-import org.concordion.internal.Row;
-import org.concordion.internal.TableSupport;
-import org.concordion.internal.command.ExecuteCommand;
-
-/**
- * Handles tables slightly differently from Concordion's usual strategy.
- *
- * <p>
- * Specifically, it will call execute for the header row as well as for the body
- * rows. This is required in order to set up the bindings of the column names to
- * the positions.
- */
-public class IsisExecuteCommandWithHeader extends ExecuteCommand {
-
- public static enum Context {
- TABLE, INLINE
- }
-
- public static enum TableRow {
- HEADER, BODY
- }
-
- /**
- * Provides a mechanism for the fixture to determine whether the command is
- * being executed in the context of a table or inline.
- */
- public static ThreadLocal<Context> context = new ThreadLocal<Context>() {
- @Override
- protected Context initialValue() {
- return null;
- }
- };
-
- /**
- * When executing in a {@link Context#TABLE table context}, provides a
- * mechanism for the fixture to determine whether the header of a table or
- * the body is being processed.
- */
- public static ThreadLocal<TableRow> tableRow = new ThreadLocal<TableRow>() {
- @Override
- protected TableRow initialValue() {
- return TableRow.BODY;
- }
- };
-
- @Override
- public void execute(final org.concordion.api.CommandCall commandCall, final Evaluator evaluator, final ResultRecorder resultRecorder) {
- if (commandCall.getElement().isNamed("table")) {
- // special handling for tables
- final Context contextIfAny = context.get();
- final boolean setContext = contextIfAny == null;
- if (setContext) {
- context.set(Context.TABLE);
- }
- executeTable(commandCall, evaluator, resultRecorder);
- if (setContext) {
- context.set(null);
- }
- } else {
- // basically the same as Concordion's original ExecuteCommand
- final Context contextIfAny = context.get();
- final boolean setContext = contextIfAny == null;
- if (setContext) {
- context.set(Context.INLINE);
- }
- super.execute(commandCall, evaluator, resultRecorder);
- if (setContext) {
- context.set(null);
- }
- }
- }
-
- private void executeTable(final CommandCall commandCall, final Evaluator evaluator, final ResultRecorder resultRecorder) {
- final TableSupport tableSupport = new TableSupport(commandCall);
-
- // this is the bit that's different: also execute on the header
- tableRow.set(TableRow.HEADER);
- final Row headerRow = tableSupport.getLastHeaderRow();
- commandCall.setElement(headerRow.getElement());
- commandCall.execute(evaluator, resultRecorder);
-
- // the rest is copied from Concordion's original implementation
- tableRow.set(TableRow.BODY);
- final Row[] detailRows = tableSupport.getDetailRows();
- for (final Row detailRow : detailRows) {
- if (detailRow.getCells().length != tableSupport.getColumnCount()) {
- throw new RuntimeException("The <table> 'execute' command only supports rows with an equal number of columns.");
- }
- commandCall.setElement(detailRow.getElement());
- tableSupport.copyCommandCallsTo(detailRow);
- commandCall.execute(evaluator, resultRecorder);
- }
- tableRow.set(null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AbstractFixture.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AbstractFixture.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AbstractFixture.java
deleted file mode 100755
index ad226b4..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AbstractFixture.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-public abstract class AbstractFixture<T> {
-
- private final T peer;
-
- protected AbstractFixture(final T fixturePeer) {
- this.peer = fixturePeer;
- }
-
- public T getPeer() {
- return peer;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java
deleted file mode 100644
index b535c5f..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-import org.apache.isis.viewer.bdd.common.AliasRegistry;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.CellBindingDefault;
-import org.apache.isis.viewer.bdd.common.IsisViewerConstants;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCellDefault;
-import org.apache.isis.viewer.bdd.common.ScenarioValueException;
-import org.apache.isis.viewer.bdd.common.fixtures.AliasItemsInListPeer;
-
-public class AliasItemsInListForConcordion extends AbstractFixture<AliasItemsInListPeer> {
-
- public AliasItemsInListForConcordion(final AliasRegistry aliasRegistry, final String listAlias) {
- this(aliasRegistry, listAlias, CellBindingDefault.builder(IsisViewerConstants.TITLE_NAME, IsisViewerConstants.TITLE_HEAD).build(), CellBindingDefault.builder(IsisViewerConstants.TYPE_NAME, IsisViewerConstants.TYPE_HEAD).optional().build(), CellBindingDefault
- .builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate().build());
- }
-
- private AliasItemsInListForConcordion(final AliasRegistry aliasRegistry, final String listAlias, final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
- super(new AliasItemsInListPeer(aliasRegistry, listAlias, titleBinding, typeBinding, aliasBinding));
- }
-
- public String execute(final String aliasAs, final String title, final String type) {
- final String header = executeHeader(aliasAs, title, type);
- if (header != null) {
- return header;
- }
-
- final String row = executeRow(aliasAs, title, type);
- if (row != null) {
- return row;
- }
-
- return "ok"; // ok
- }
-
- private String executeHeader(final String alias, final String title, final String type) {
- try {
- getPeer().assertIsList();
- } catch (final ScenarioValueException e) {
- return e.getMessage();
- }
-
- // create bindings
- getPeer().getTitleBinding().setHeadColumn(0);
- getPeer().getAliasBinding().setHeadColumn(1);
-
- if (type != null) {
- getPeer().getTypeBinding().setHeadColumn(2, new ScenarioCellDefault(type));
- }
-
- return null;
- }
-
- private String executeRow(final String aliasAs, final String title, final String type) {
- if (!getPeer().isList()) {
- return null; // skip
- }
-
- captureCurrent(aliasAs, title, type);
-
- try {
- getPeer().findAndAlias();
- } catch (final ScenarioBoundValueException e) {
- return e.getMessage();
- }
-
- return null;
- }
-
- private void captureCurrent(final String aliasAs, final String title, final String type) {
- getPeer().getAliasBinding().captureCurrent(new ScenarioCellDefault(aliasAs));
- getPeer().getTitleBinding().captureCurrent(new ScenarioCellDefault(title));
- if (type != null) {
- getPeer().getTitleBinding().captureCurrent(new ScenarioCellDefault(type));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckCollectionContentsForConcordion.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckCollectionContentsForConcordion.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckCollectionContentsForConcordion.java
deleted file mode 100644
index 7cf7507..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckCollectionContentsForConcordion.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-import org.apache.isis.viewer.bdd.common.AliasRegistry;
-import org.apache.isis.viewer.bdd.common.fixtures.CheckCollectionContentsPeer;
-
-public class CheckCollectionContentsForConcordion extends AbstractFixture<CheckCollectionContentsPeer> {
-
- public CheckCollectionContentsForConcordion(final AliasRegistry aliasRegistry, final String listAlias) {
- super(new CheckCollectionContentsPeer(aliasRegistry, listAlias));
- }
-
- public String contains(final String alias) {
- if (!getPeer().isValidAlias(alias)) {
- return "unknown alias '" + alias + "'";
- }
- final boolean contains = getPeer().contains(alias);
- return contains ? "ok" : "does not contain '" + alias + "'";
- }
-
- public String doesNotContain(final String alias) {
- if (!getPeer().isValidAlias(alias)) {
- return "unknown alias '" + alias + "'";
- }
- final boolean doesNotContain = getPeer().doesNotContain(alias);
- return doesNotContain ? "ok" : "does contain";
- }
-
- public String isEmpty() {
- final boolean isEmpty = getPeer().isEmpty();
- return isEmpty ? "ok" : "not empty";
- }
-
- public String isNotEmpty() {
- final boolean isNotEmpty = getPeer().isNotEmpty();
- return isNotEmpty ? "ok" : "empty";
- }
-
- public String assertSize(final int size) {
- final boolean hasSize = getPeer().assertSize(size);
- return hasSize ? "ok" : "contains " + getPeer().getSize() + " objects";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java
deleted file mode 100644
index ed3574c..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-import org.apache.isis.viewer.bdd.common.AliasRegistry;
-import org.apache.isis.viewer.bdd.common.CellBindingDefault;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-import org.apache.isis.viewer.bdd.common.ScenarioCellDefault;
-import org.apache.isis.viewer.bdd.common.fixtures.CheckListConstants;
-import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer;
-import org.apache.isis.viewer.bdd.common.fixtures.CheckListPeer.CheckMode;
-
-public class CheckListForConcordion extends AbstractFixture<CheckListPeer> {
-
- public CheckListForConcordion(final AliasRegistry aliasRegistry, final String listAlias) {
- super(new CheckListPeer(aliasRegistry, listAlias, CheckMode.NOT_EXACT, titleBinding()));
- }
-
- private static CellBindingDefault titleBinding() {
- return CellBindingDefault.builder(CheckListConstants.TITLE_NAME, CheckListConstants.TITLE_HEAD_SET).ditto().build();
- }
-
- public String executeHeader(final String title) {
- return setupHeader(title);
- }
-
- private String setupHeader(final String title) {
- int colNum = 0;
- getPeer().getTitleBinding().setHeadColumn(colNum++);
- return ""; // ok
- }
-
- public String executeRow(final String title) {
-
- setupHeader(title);
-
- // capture current
- getPeer().getTitleBinding().captureCurrent(new ScenarioCellDefault(title));
-
- // execute
- return checkExists();
- }
-
- private String checkExists() {
- if (!getPeer().findAndAddObject()) {
- return getTitle() + " not found";
- }
- return "ok";
- }
-
- private String getTitle() {
- final ScenarioCell currentCell = getPeer().getTitleBinding().getCurrentCell();
- return currentCell != null ? currentCell.getText() : "(no title provided)";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java
deleted file mode 100755
index 5861cdb..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-import org.apache.isis.viewer.bdd.common.AliasRegistry;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.CellBindingDefault;
-import org.apache.isis.viewer.bdd.common.IsisViewerConstants;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.fixtures.SetUpObjectsPeer;
-
-public class SetUpObjectsForConcordion extends AbstractFixture<SetUpObjectsPeer> {
-
- public SetUpObjectsForConcordion(final AliasRegistry aliasesRegistry, final String className, final SetUpObjectsPeer.Mode mode) {
- this(aliasesRegistry, className, mode, CellBindingDefault.builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate().build());
- }
-
- private SetUpObjectsForConcordion(final AliasRegistry storyFixture, final String className, final SetUpObjectsPeer.Mode mode, final CellBinding aliasBinding) {
- super(new SetUpObjectsPeer(storyFixture, className, mode, aliasBinding));
- }
-
- public String executeHeader(final String alias, final String... propertyNames) {
-
- // create bindings (there's only one)
- getPeer().getAliasBinding().setHeadColumn(0);
-
- // define properties and the alias column
- int colNum = 0;
- getPeer().definePropertyOrAlias(alias, colNum++);
-
- for (final String propertyName : propertyNames) {
- getPeer().definePropertyOrAlias(propertyName, colNum++);
- }
-
- return ""; // ok
- }
-
- public String executeRow(final String alias, final String... propertyValues) {
-
- // set property values and the alis
- getPeer().addPropertyValueOrAlias(alias);
- for (final String propertyValue : propertyValues) {
- getPeer().addPropertyValueOrAlias(propertyValue);
- }
-
- // create the object
- try {
- getPeer().createObject();
- return "ok";
- } catch (final ScenarioBoundValueException ex) {
- return ex.toString();
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java b/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
deleted file mode 100644
index 11b916a..0000000
--- a/component/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.bdd.concordion.internal.fixtures;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.viewer.bdd.common.AliasRegistry;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.CellBindingDefault;
-import org.apache.isis.viewer.bdd.common.IsisViewerConstants;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-import org.apache.isis.viewer.bdd.common.ScenarioCellDefault;
-import org.apache.isis.viewer.bdd.common.fixtures.UsingIsisViewerPeer;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.Perform;
-import org.apache.isis.viewer.bdd.common.parsers.DateParser;
-
-public class UsingIsisViewerForConcordion extends AbstractFixture<UsingIsisViewerPeer> {
-
- public UsingIsisViewerForConcordion(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType, final DateParser dateParser, final Perform.Mode mode) {
- this(aliasesRegistry, deploymentType, dateParser, mode, CellBindingDefault.builder(IsisViewerConstants.ON_OBJECT_NAME, IsisViewerConstants.ON_OBJECT_HEAD_SET).ditto().build(), CellBindingDefault.builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET)
- .optional().build(), CellBindingDefault.builder(IsisViewerConstants.PERFORM_NAME, IsisViewerConstants.PERFORM_HEAD_SET).ditto().build(), CellBindingDefault.builder(IsisViewerConstants.ON_MEMBER_NAME, IsisViewerConstants.ON_MEMBER_HEAD_SET).optional().build(), CellBindingDefault
- .builder(IsisViewerConstants.THAT_IT_NAME, IsisViewerConstants.THAT_IT_HEAD_SET).ditto().optional().build(), CellBindingDefault.builder(IsisViewerConstants.WITH_ARGUMENTS_NAME, IsisViewerConstants.WITH_ARGUMENTS_HEAD_SET).optional().build());
- }
-
- private UsingIsisViewerForConcordion(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType, final DateParser dateParser, final Perform.Mode mode, final CellBinding onObjectBinding, final CellBinding aliasResultAsBinding, final CellBinding performBinding,
- final CellBinding onMemberBinding, final CellBinding thatItBinding, final CellBinding arg0Binding) {
- super(new UsingIsisViewerPeer(aliasesRegistry, deploymentType, dateParser, mode, onObjectBinding, aliasResultAsBinding, performBinding, onMemberBinding, thatItBinding, arg0Binding));
- }
-
- public String executeHeader(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
-
- return setupHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
- }
-
- private String setupHeader(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0) {
- int colNum = 0;
- getPeer().getOnObjectBinding().setHeadColumn(colNum++);
- getPeer().getAliasResultAsBinding().setHeadColumn(colNum++);
- getPeer().getPerformBinding().setHeadColumn(colNum++);
- getPeer().getOnMemberBinding().setHeadColumn(colNum++);
- if (thatIt != null) {
- getPeer().getThatItBinding().setHeadColumn(colNum++);
- }
- if (arg0 != null) {
- getPeer().getArg0Binding().setHeadColumn(colNum++);
- }
-
- return ""; // ok
- }
-
- public String executeRow(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
-
- setupHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
-
- final List<String> argumentCells = new ArrayList<String>();
-
- // capture current
- getPeer().getOnObjectBinding().captureCurrent(new ScenarioCellDefault(onObject));
- getPeer().getAliasResultAsBinding().captureCurrent(new ScenarioCellDefault(aliasResultAs));
- getPeer().getPerformBinding().captureCurrent(new ScenarioCellDefault(perform));
- getPeer().getOnMemberBinding().captureCurrent(new ScenarioCellDefault(usingMember));
- if (getPeer().getThatItBinding().isFound()) {
- getPeer().getThatItBinding().captureCurrent(new ScenarioCellDefault(thatIt));
- }
- if (getPeer().getArg0Binding().isFound()) {
- getPeer().getArg0Binding().captureCurrent(new ScenarioCellDefault(arg0));
- argumentCells.add(arg0);
- }
- for (final String arg : remainingArgs) {
- argumentCells.add(arg);
- }
-
- // execute
- try {
- execute(argumentCells);
- } catch (final ScenarioBoundValueException ex) {
- return ex.getMessage();
- }
-
- return "ok";
- }
-
- private void execute(final List<String> argumentCells) throws ScenarioBoundValueException {
-
- final ObjectAdapter onAdapter = getPeer().validateOnObject();
- final String aliasAs = getPeer().validateAliasAs();
- final Perform performCommand = getPeer().validatePerform();
-
- ObjectMember objectMember = null;
- if (performCommand.requiresMember()) {
- objectMember = getPeer().validateOnMember(onAdapter);
- }
-
- getPeer().performCommand(onAdapter, aliasAs, objectMember, performCommand, asValues(argumentCells));
- }
-
- private static List<ScenarioCell> asValues(final List<String> argumentCells) {
- final List<ScenarioCell> storyValues = Lists.newArrayList();
- for (final String arg : argumentCells) {
- storyValues.add(new ScenarioCellDefault(arg));
- }
- return storyValues;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/site/apt/index.apt b/component/viewer/bdd/concordion/src/site/apt/index.apt
deleted file mode 100644
index ebc04d1..0000000
--- a/component/viewer/bdd/concordion/src/site/apt/index.apt
+++ /dev/null
@@ -1,29 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-BDD Concordion support
-
- The <concordion> module provides an integration between the Isis (via {{{../bdd-common/index.html}common}}
- and the {{{http://concordion.org}Concordion}} framework itself.
-
-Further Info
-
- See this module's {{{./apidocs/index.html}Javadoc}} and the
- {{{../docbkx/html/guide/isis-bdd-integration.html}user guide}} for more information.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/site/apt/jottings.apt b/component/viewer/bdd/concordion/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/component/viewer/bdd/concordion/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Jottings
-
- This page is to capture any random jottings relating to this module prior
- to being moved into formal documentation.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/concordion/src/site/site.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/src/site/site.xml b/component/viewer/bdd/concordion/src/site/site.xml
deleted file mode 100644
index 5a26b07..0000000
--- a/component/viewer/bdd/concordion/src/site/site.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Concordion" href="index.html"/>
- </breadcrumbs>
-
- <menu name="BDD Concordion">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="BDD Modules">
- <item name="Common" href="../bdd-common/index.html" />
- <item name="Concordion" href="../bdd-concordion/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports" />
- </body>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml
deleted file mode 100644
index d8b31fb..0000000
--- a/component/viewer/bdd/pom.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../../../core/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Isis BDD Viewer</name>
-
- <packaging>pom</packaging>
-
- <properties>
- <siteBaseDir>.</siteBaseDir>
- <relativeUrl/>
-
- <docbkxGuideTitle>Apache Isis BDD Testing Guide</docbkxGuideTitle>
- <docbkxGuideSubTitle>Acceptance Testing using BDD Frameworks</docbkxGuideSubTitle>
- <docbkxGuideName>isis-bdd-integration</docbkxGuideName>
-
- <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://isis.apache.org/${relativeUrl}</url>
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- Apache Release Audit Tool -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- <configuration>
- <excludes>
- <!--
- overriding inherited excludes from oia.core:isis
- with a more specific set for this component
- -->
- <exclude>**/target/**</exclude>
- <exclude>**/target-ide/**</exclude>
-
- <exclude>**/*.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
-
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-remote-resources</id>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <appendedResourcesDirectory>${basedir}/${siteBaseDir}/src/main/appended-resources</appendedResourcesDirectory>
- <supplementalModels>
- <supplementalModel>supplemental-models.xml</supplementalModel>
- </supplementalModels>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <projectTimespan>2010~2013</projectTimespan>
- <postDepListText>
-The above (auto-generated) list aggregates the dependencies (either directly
-or transitively) of all the modules that make up Apache Isis. You can use
-mvn dependency:list or mvn dependency:tree to view dependencies by submodule.
-
-In addition, Isis includes a copy of JQuery core. This is licensed under
-the MIT license [1].
-
-Note also that the BDD Viewer module [org.apache.isis.viewer:isis-viewer-bdd-concordion]
-has an optional dependency on Concordion [2], which in turn depends upon
-XOM [3]. XOM is licensed under LGPL, which is a non-eligible 'category-X'
-license [4]. This transitive dependency to XOM has therefore been excluded.
-
-To use Isis' BDD Viewer, end-users must explicitly add in the XOM dependency
-in their own POMs. The application generated by the Isis quickstart
-archetype includes this explicit dependency.
-
-[1] http://jquery.org/license/
-[2] http://concordion.org
-[3] http://www.xom.nu/
-[4] http://www.apache.org/legal/resolved.html#category-x
- </postDepListText>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
-
- <!-- for benefit of application developers, using scope=import -->
-
- <!-- BDD Viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-concordion</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-concordion</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- <version>${isis-security-file.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
- <modules>
- <module>common</module>
- <module>concordion</module>
- <module>tck</module>
- </modules>
-
- <profiles>
- <profile>
- <id>bdd-all</id>
- <activation>
- <property>
- <name>bdd</name>
- <value>all</value>
- </property>
- </activation>
- <modules>
- <module>common</module>
- <module>concordion</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-1.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-1.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-1.png
deleted file mode 100644
index 1ffad3b..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-2.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-2.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-2.png
deleted file mode 100644
index 02d8282..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-concordion-attributes-2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-css.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-css.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-css.png
deleted file mode 100644
index 3a982ad..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-css.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-delete.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-delete.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-delete.png
deleted file mode 100644
index e67091a..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-delete.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editinsert.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editinsert.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editinsert.png
deleted file mode 100644
index e5b9e50..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editinsert.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap-result.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap-result.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap-result.png
deleted file mode 100644
index dab7e9c..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap-result.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap.png
deleted file mode 100644
index 0d430db..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-editwrap.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-emptytable.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-emptytable.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-emptytable.png
deleted file mode 100644
index c58d33d..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-emptytable.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-headrow.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-headrow.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-headrow.png
deleted file mode 100644
index 6c1a32d..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-headrow.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-1.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-1.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-1.png
deleted file mode 100644
index dc7244d..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-2.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-2.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-2.png
deleted file mode 100644
index b0567fd..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-image-2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert-heading.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert-heading.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert-heading.png
deleted file mode 100644
index d2ebe36..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert-heading.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert.png
deleted file mode 100644
index a72fbd1..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-insert.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-knowingwhereyouare.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-knowingwhereyouare.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-knowingwhereyouare.png
deleted file mode 100644
index 17a29d2..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-knowingwhereyouare.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-newparas.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-newparas.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-newparas.png
deleted file mode 100644
index efdde5f..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-newparas.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-opendoc.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-opendoc.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-opendoc.png
deleted file mode 100644
index 70fd12d..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-opendoc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-1.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-1.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-1.png
deleted file mode 100644
index 4a1f748..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-2.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-2.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-2.png
deleted file mode 100644
index 71df170..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-selectingcontent-2.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewleft.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewleft.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewleft.png
deleted file mode 100644
index 2c42edb..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewleft.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewraw.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewraw.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewraw.png
deleted file mode 100644
index 980e793..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-viewraw.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/7276dc0b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-xhtmlmenu.png
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-xhtmlmenu.png b/component/viewer/bdd/src/docbkx/guide/images/xmlmind-xhtmlmenu.png
deleted file mode 100644
index 7763e35..0000000
Binary files a/component/viewer/bdd/src/docbkx/guide/images/xmlmind-xhtmlmenu.png and /dev/null differ