svn commit: r1035738 [1/2] - in /incubator/isis/trunk/viewer: bdd/src/docbkx/guide/ html/src/main/java/org/apache/isis/extensions/html/action/ html/src/main/java/org/apache/isis/extensions/html/action/edit/ html/src/main/java/org/apache/isis/extensions...

[da...@apache.org]

Author: danhaywood
Date: Tue Nov 16 18:41:06 2010
New Revision: 1035738

URL: http://svn.apache.org/viewvc?rev=1035738&view=rev
Log:
changing HTML viewer packages in sync with Maven groupId/artifasctIds

Added:
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Action.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ActionException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ChangeContext.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ServiceView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Block.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Component.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentAbstract.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentComposite.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentFactory.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/DebugPane.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Form.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Page.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Table.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ViewPane.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/image/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/request/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/HtmlServletConstants.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/component/
      - copied from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextSessionDataTest.java
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextTest.java
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java
      - copied, changed from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/ImageProviderResourceBasedTest.java
Removed:
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Action.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ActionException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ChangeContext.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ServiceView.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Block.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Component.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentAbstract.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentComposite.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentFactory.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/DebugPane.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Form.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Page.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Table.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ViewPane.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/image/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/request/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/HtmlServletConstants.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextSessionDataTest.java
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextTest.java
    incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/component/ImageProviderResourceBasedTest.java
Modified:
    incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java

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=1035738&r1=1035737&r2=1035738&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 Tue Nov 16 18:41:06 2010
@@ -48,7 +48,10 @@
     that abstracts the interaction with the Isis metamodel, along with an
     integration (that uses this common library) for one particular
     <acronym>BDD</acronym> framework, namely <ulink
-    url="http://concordion.org">Concordion</ulink>.</para>
+    url="http://concordion.org">Concordion</ulink>. There is also outline
+    coverage of the <ulink url="http://fitnesse.org">FitNesse</ulink>
+    integration (part of <ulink
+    url="http://isis-contrib.sourceforge.net">isis-contrib</ulink>).</para>
 
     <para>This user guide describes how to use the Concordion integration,
     along with details of the common library so that other BDD frameworks can
@@ -131,13 +134,16 @@
           a column of a table to a property or to an alias</para>
 
           <para>This can then be used to wire the values in the rows of the
-          table to the properties specified in the header</para>
+          table to the properties specified in the header. The library
+          provides a default implementation, though subclasses can override if
+          required</para>
         </listitem>
       </itemizedlist>
 
-      <para></para>
-
-      <para></para>
+      <para>In the following chapter (<xref
+      linkend="chp.UsingTheFramework" />), details are provided of how the
+      services of the common library are used by each of the supported
+      <acronym>BDD</acronym> framework integrations.</para>
     </sect1>
 
     <sect1>
@@ -212,7 +218,7 @@
         minutes.</para>
       </sect2>
 
-      <sect2>
+      <sect2 id="sec.HowTheIsisConcordionIntegrationWorks">
         <title>How the Isis/Concordion Integration Works</title>
 
         <para>Although you could test an Apache Isis application using vanilla
@@ -303,6 +309,15 @@
         integration.</para>
       </sect2>
     </sect1>
+
+    <sect1>
+      <title>FitNesse Integration</title>
+
+      <para>Due to licensing restrictions, the FitNesse integration is not
+      part of Apache Isis proper. However, it is available on the companion
+      isis-contrib site, hosted at <ulink
+      url="http://isis-contrib.sourceforge.net">esourceforge</ulink>.</para>
+    </sect1>
   </chapter>
 
   <chapter id="chp.UsingTheFramework">
@@ -909,7 +924,8 @@ and running in &lt;span concordion:set="
             </listitem>
 
             <listitem>
-              <para><classname>CellBinding</classname> aliasBinding</para>
+              <para><classname>CellBinding</classname>
+              <varname>aliasBinding</varname></para>
 
               <para>This object represents a binding to a cell that will hold
               the reference to each newly created object. It can be left
@@ -964,28 +980,40 @@ and running in &lt;span concordion:set="
         <sect3>
           <title>Concordion</title>
 
-          <para>The Concordion framework integration provides a number of
-          overloaded methods called:</para>
+          <para>The Concordion framework integration provides:</para>
 
           <itemizedlist>
             <listitem>
               <para><methodname>#setUpObject(String className, String aliasAs,
               ...)</methodname></para>
-            </listitem>
-          </itemizedlist>
 
-          <para>The varargs allow a variable number of properties to be
-          defined, up to a maximum of 10 properties. If more than this are
-          needed, the developer should write their own method and call the
-          protected method,
-          <methodname>#setUpObjectsVarargs(...)</methodname>.</para>
+              <para>There are 10 overloaded versions of this method, to
+              account for setting up different types of objects that have up
+              to 10 properties.</para>
+
+              <para>The method returns a string "ok" if has worked, otherwise
+              it returns exception text. This might seem a little odd, but
+              allows a meaningful message to be shown in the
+              <acronym>XHTML</acronym>.</para>
+            </listitem>
 
-          <para>This method should be called using isis:execute, not with
-          concordion:execute (where "isis" is</para>
+            <listitem>
+              <para><methodname>#setUpObjectVarArgs(String className, String
+              aliasAs, ...)</methodname></para>
 
-          <para></para>
+              <para>This (protected, not public) method is to cater for
+              setting up objects that require more than 10 properties to be
+              setup. In these cases, the developer should write their own
+              method and call into the
+              <methodname>#setUpObjectsVarargs(...)</methodname> as
+              required.</para>
+            </listitem>
+          </itemizedlist>
 
-          <para></para>
+          <para>Note that this method should be called using
+          <emphasis>isis:execute</emphasis>, not with concordion:execute. See
+          <xref linkend="sec.HowTheIsisConcordionIntegrationWorks" /> for
+          details.</para>
 
           <programlisting>&lt;p&gt;With Employees (&lt;span concordion:set="#className"&gt;com.mycompany.myapp.dom.employee.Employee&lt;/span&gt;):
 &lt;/p&gt;
@@ -1015,8 +1043,6 @@ and running in &lt;span concordion:set="
     &lt;td&gt;ok&lt;/td&gt;
   &lt;/tr&gt;
 &lt;/table&gt;</programlisting>
-
-          <para></para>
         </sect3>
 
         <sect3>
@@ -1477,12 +1503,14 @@ and running in &lt;span concordion:set="
   <chapter id="chp.HintsAndTips">
     <title>Hints and Tips</title>
 
-    <para>This chapter contains a collection of hints, tips and suggestions
-    for writing your own tests.</para>
-
-    <para>For further guidance, check out Gojko Adzic's book, <ulink
-    url="http://www.acceptancetesting.info/the-book/">Bridging the
-    Communication Gap</ulink>.</para>
+    <abstract>
+      <para>This chapter contains a collection of hints, tips and suggestions
+      for writing your own tests.</para>
+    </abstract>
+
+    <para>For further guidance, we recommend that you check out Gojko Adzic's
+    book, <ulink url="http://www.acceptancetesting.info/the-book/">Bridging
+    the Communication Gap</ulink>.</para>
 
     <sect1>
       <title>Separate In-Progress Stories from the Backlog</title>

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Action.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Action.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Action.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Action.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.action;
+package org.apache.isis.viewer.html.action;
 
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ActionException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ActionException.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ActionException.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ActionException.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.action;
+package org.apache.isis.viewer.html.action;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ChangeContext.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ChangeContext.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/ChangeContext.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/ChangeContext.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.action;
+package org.apache.isis.viewer.html.action;
 
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/LogOut.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/LogOut.java Tue Nov 16 18:41:06 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.html.action;
+package org.apache.isis.viewer.html.action;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/Welcome.java Tue Nov 16 18:41:06 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.html.action;
+package org.apache.isis.viewer.html.action;
 
 import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/AddItemToCollection.java Tue Nov 16 18:41:06 2010
@@ -18,18 +18,18 @@
  */
 
 
-package org.apache.isis.extensions.html.action.edit;
+package org.apache.isis.viewer.html.action.edit;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.action.ActionException;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.ForwardRequest;
-import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.extensions.html.task.AddItemToCollectionTask;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.action.ActionException;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.ForwardRequest;
+import org.apache.isis.viewer.html.request.Request;
+import org.apache.isis.viewer.html.task.AddItemToCollectionTask;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java Tue Nov 16 18:41:06 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.html.action.edit;
+package org.apache.isis.viewer.html.action.edit;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.action.ActionException;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.ForwardRequest;
-import org.apache.isis.extensions.html.request.Request;
-import org.apache.isis.extensions.html.task.EditTask;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.action.ActionException;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.ForwardRequest;
+import org.apache.isis.viewer.html.request.Request;
+import org.apache.isis.viewer.html.task.EditTask;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/RemoveItemFromCollection.java Tue Nov 16 18:41:06 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.html.action.edit;
+package org.apache.isis.viewer.html.action.edit;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.ForwardRequest;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.ForwardRequest;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/Save.java Tue Nov 16 18:41:06 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.html.action.edit;
+package org.apache.isis.viewer.html.action.edit;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.ForwardRequest;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.ForwardRequest;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/About.java Tue Nov 16 18:41:06 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.html.action.misc;
+package org.apache.isis.viewer.html.action.misc;
 
 import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SetUser.java Tue Nov 16 18:41:06 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.html.action.misc;
+package org.apache.isis.viewer.html.action.misc;
 
 import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 public class SetUser implements Action {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/misc/SwapUser.java Tue Nov 16 18:41:06 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.html.action.misc;
+package org.apache.isis.viewer.html.action.misc;
 
 import java.util.StringTokenizer;
 
 import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java Tue Nov 16 18:41:06 2010
@@ -18,20 +18,20 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view;
+package org.apache.isis.viewer.html.action.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.action.ActionException;
-import org.apache.isis.extensions.html.action.view.util.TableUtil;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.Table;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.action.ActionException;
+import org.apache.isis.viewer.html.action.view.util.TableUtil;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.Table;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/FieldCollectionView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/FieldCollectionView.java Tue Nov 16 18:41:06 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view;
+package org.apache.isis.viewer.html.action.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.action.view.util.TableUtil;
-import org.apache.isis.extensions.html.component.Table;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.view.util.TableUtil;
+import org.apache.isis.viewer.html.component.Table;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view;
+package org.apache.isis.viewer.html.action.view;
 
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -27,12 +27,12 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.Block;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.component.ComponentFactory;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Block;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.component.ComponentFactory;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectViewAbstract.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java Tue Nov 16 18:41:06 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view;
+package org.apache.isis.viewer.html.action.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.action.Action;
-import org.apache.isis.extensions.html.action.ActionException;
-import org.apache.isis.extensions.html.action.view.util.MenuUtil;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.action.Action;
+import org.apache.isis.viewer.html.action.ActionException;
+import org.apache.isis.viewer.html.action.view.util.MenuUtil;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ServiceView.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ServiceView.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ServiceView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ServiceView.java Tue Nov 16 18:41:06 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view;
+package org.apache.isis.viewer.html.action.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.extensions.html.component.ViewPane;
-import org.apache.isis.extensions.html.context.Context;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.ViewPane;
+import org.apache.isis.viewer.html.context.Context;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view.util;
+package org.apache.isis.viewer.html.action.view.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.context.Context;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.context.Context;
 
 
 public class MenuUtil {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/TableUtil.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.action.view.util;
+package org.apache.isis.viewer.html.action.view.util;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
@@ -30,9 +30,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
-import org.apache.isis.extensions.html.component.ComponentFactory;
-import org.apache.isis.extensions.html.component.Table;
-import org.apache.isis.extensions.html.context.Context;
+import org.apache.isis.viewer.html.component.ComponentFactory;
+import org.apache.isis.viewer.html.component.Table;
+import org.apache.isis.viewer.html.context.Context;
 
 import static org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters.PROPERTIES;
 import static org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS;

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Block.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Block.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Block.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Block.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 public interface Block extends Component {
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Component.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Component.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Component.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Component.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import java.io.PrintWriter;
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentAbstract.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentAbstract.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentAbstract.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import java.io.PrintWriter;
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentComposite.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentComposite.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentComposite.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentComposite.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentFactory.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/DebugPane.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/DebugPane.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/DebugPane.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/DebugPane.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 public interface DebugPane extends Component {
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Form.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Form.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Form.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Form.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Page.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Page.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Page.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Page.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 public interface Page extends Component {
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Table.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Table.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/Table.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/Table.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 public interface Table extends Component {
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ViewPane.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ViewPane.java&r1=1035720&r2=1035738&rev=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/ViewPane.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ViewPane.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component;
+package org.apache.isis.viewer.html.component;
 
 import java.util.List;
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/AbstractHtmlPage.java Tue Nov 16 18:41:06 2010
@@ -17,14 +17,14 @@
  *  under the License.
  */
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 import java.util.StringTokenizer;
 
-import org.apache.isis.extensions.html.component.Block;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.component.Page;
+import org.apache.isis.viewer.html.component.Block;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.component.Page;
 
 public abstract class AbstractHtmlPage implements Component, Page {
     private final StringBuffer debug = new StringBuffer();

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ActionComponent.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.Component;
+import org.apache.isis.viewer.html.component.Component;
 
 
 class ActionComponent implements Component {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/BreadCrumbs.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.ComponentAbstract;
+import org.apache.isis.viewer.html.component.ComponentAbstract;
 
 
 public class BreadCrumbs extends ComponentAbstract {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Checkbox.java Tue Nov 16 18:41:06 2010
@@ -21,11 +21,11 @@
 /**
  * 
  */
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.Component;
+import org.apache.isis.viewer.html.component.Component;
 
 
 final class Checkbox implements Component {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
@@ -26,9 +26,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.image.ImageLookup;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.image.ImageLookup;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionLink.java Tue Nov 16 18:41:06 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.extensions.html.component.ComponentAbstract;
-import org.apache.isis.extensions.html.image.ImageLookup;
-import org.apache.isis.extensions.html.request.Request;
+import org.apache.isis.viewer.html.component.ComponentAbstract;
+import org.apache.isis.viewer.html.image.ImageLookup;
+import org.apache.isis.viewer.html.request.Request;
 
 
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Div.java Tue Nov 16 18:41:06 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.Block;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.component.ComponentComposite;
+import org.apache.isis.viewer.html.component.Block;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.component.ComponentComposite;
 
 
 public class Div extends ComponentComposite implements Block {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/DynamicHtmlPage.java Tue Nov 16 18:41:06 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.Block;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.component.DebugPane;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.ViewPane;
+import org.apache.isis.viewer.html.component.Block;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.component.DebugPane;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.ViewPane;
 
 
 public class DynamicHtmlPage extends AbstractHtmlPage implements Page {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ErrorMessage.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.Component;
+import org.apache.isis.viewer.html.component.Component;
 
 
 public class ErrorMessage implements Component {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Heading.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.ComponentAbstract;
+import org.apache.isis.viewer.html.component.ComponentAbstract;
 
 
 public class Heading extends ComponentAbstract {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Html.java Tue Nov 16 18:41:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
-import org.apache.isis.extensions.html.component.ComponentAbstract;
+import org.apache.isis.viewer.html.component.ComponentAbstract;
 
 
 class Html extends ComponentAbstract {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -33,14 +33,15 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.Block;
-import org.apache.isis.extensions.html.component.Component;
-import org.apache.isis.extensions.html.component.ComponentFactory;
-import org.apache.isis.extensions.html.component.DebugPane;
-import org.apache.isis.extensions.html.component.Form;
-import org.apache.isis.extensions.html.component.Page;
-import org.apache.isis.extensions.html.component.Table;
-import static org.apache.isis.extensions.html.viewer.HtmlViewerConstants.*;
+import org.apache.isis.viewer.html.component.Block;
+import org.apache.isis.viewer.html.component.Component;
+import org.apache.isis.viewer.html.component.ComponentFactory;
+import org.apache.isis.viewer.html.component.DebugPane;
+import org.apache.isis.viewer.html.component.Form;
+import org.apache.isis.viewer.html.component.Page;
+import org.apache.isis.viewer.html.component.Table;
+
+import static org.apache.isis.viewer.html.viewer.HtmlViewerConstants.*;
 
 
 public class HtmlComponentFactory implements ComponentFactory {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlDebug.java Tue Nov 16 18:41:06 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.extensions.html.component.DebugPane;
+import org.apache.isis.viewer.html.component.DebugPane;
 
 
 public class HtmlDebug implements DebugPane {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlException.java Tue Nov 16 18:41:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java?rev=1035738&r1=1035720&r2=1035738&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java Tue Nov 16 18:41:06 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.html.component.html;
+package org.apache.isis.viewer.html.component.html;
 
 import java.io.PrintWriter;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.html.component.ComponentComposite;
-import org.apache.isis.extensions.html.component.Form;
+import org.apache.isis.viewer.html.component.ComponentComposite;
+import org.apache.isis.viewer.html.component.Form;
 
 
 public class HtmlForm extends ComponentComposite implements Form {