incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1035729 [2/10] - in /incubator/isis/trunk/viewer: bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/bindings/ bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/perform/ ...
Date Tue, 16 Nov 2010 18:28:54 GMT

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=1035729&r1=1035728&r2=1035729&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:28:38 2010
@@ -99,6 +99,48 @@
     </sect1>
 
     <sect1>
+      <title>Common Library</title>
+
+      <para>Isis integrates with <acronym>BDD</acronym> frameworks through the
+      services of a common library. The main concepts that the common library
+      exposes are:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>the Story class, which provides the context for a single
+          scenario of a story</para>
+        </listitem>
+
+        <listitem>
+          <para>the <classname>AliasRegistry</classname>, which allows a
+          user-friendly alias (eg "fredCustomer") to be assigned to any domain
+          object and to be referenced subsequently</para>
+        </listitem>
+
+        <listitem>
+          <para>the <classname>StoryCell</classname> interface, which is an
+          abstraction over a single element of data</para>
+
+          <para>The default implementation just wraps a
+          <classname>java.lang.String</classname>, but some frameworks (eg
+          FitNesse) have other means of </para>
+        </listitem>
+
+        <listitem>
+          <para>the <classname>CellBinding</classname> interface, which binds
+          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>
+        </listitem>
+      </itemizedlist>
+
+      <para></para>
+
+      <para></para>
+    </sect1>
+
+    <sect1>
       <title>Concordion Integration</title>
 
       <sect2>
@@ -168,20 +210,6 @@
         url="http://concordion.org/Tutorial.html">tutorial</ulink> that
         demonstrates all the above, and can be completed in 20~30
         minutes.</para>
-
-        <para></para>
-
-        <para></para>
-
-        <para>&lt;html
-        xmlns:concordion="http://www.concordion.org/2007/concordion"
-        xmlns:isis="http://isis.apache.org/2010/concordion"&gt; &lt;link
-        href="../concordion.css" rel="stylesheet" type="text/css" /&gt;
-        </para>
-
-        <para></para>
-
-        <para></para>
       </sect2>
 
       <sect2>
@@ -250,224 +278,37 @@
         </itemizedlist>
 
         <para>For each <acronym>XHTML</acronym> scenario test, the developer
-        writes subclasses the AbstractIsisConcordionTest, creating a name
-        matching the scenario test (ie as per regular Concordion). He
-        then</para>
-
-        <para>annotates the original <acronym>XHTML</acronym>, either calling
+        writes subclasses the
+        <classname>AbstractIsisConcordionTest</classname>, creating a name
+        matching the scenario test (ie as per regular Concordion). He then
+        annotates the original <acronym>XHTML</acronym>, either calling
         directly into the inherited methods, or writing small simple methods
         to delegate to these inherited methods as required. The Concordion
         website has some <ulink
         url="http://concordion.org/Technique.html">hints and tips</ulink> to
         help you find the right balance between these two approaches.</para>
-      </sect2>
-    </sect1>
-
-    <sect1>
-      <title>Common Library</title>
-
-      <para>The Concordion integration is based on a library that factors out
-      interactions with the running Isis system. This library is intended to
-      make it easy to support other BDD frameworks if required.<footnote>
-          <para>In fact, the first BDD framework integration was to <ulink
-          url="http://fitnesse.org">FitNesse</ulink>. This has now been
-          dropped because FitNesse has an incompatible license with Apache
-          Software Foundation. The original FitNesse code can still be found
-          on the <ulink
-          url="http://isis-contrib.sourceforge.net">Isis-contrib</ulink>
-          companion site, and does indeed use the common library.</para>
-        </footnote></para>
-
-      <para>The main concepts that the common library exposes are:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>AliasItemsInListPeer</para>
-        </listitem>
-
-        <listitem>
-          <para>AliasServicesPeer</para>
-        </listitem>
-
-        <listitem>
-          <para>CheckListPeer</para>
-        </listitem>
-
-        <listitem>
-          <para></para>
-        </listitem>
-      </itemizedlist>
-
-      <para></para>
-
-      <para></para>
-    </sect1>
-  </chapter>
-
-  <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>
-
-    <sect1>
-      <title>Separate In-Progress Stories from the Backlog</title>
-
-      <para>If you are using an agile methodology then you will be
-      implementing a number of stories per iteration; the remainder will be in
-      a backlog. When you select a story for implementation, create a new page
-      for it in a "CurrentIteration" suite. The objective for the team is
-      therefore to get the entire CurrentIteration suite green.</para>
-
-      <para>Other stories that you may have identified but not selected for
-      the iteration can remain in a Backlog suite.</para>
-    </sect1>
-
-    <sect1>
-      <title>Use a Story Page to Collect A Set of Scenario Tests</title>
-
-      <para>Part of estimating the size of a story includes identifying the
-      acceptance criteria. These can be created as children of the story page
-      as placeholders, so that the story page becomes a suite. The child
-      scenario tests can be fleshed out as required with plain text during the
-      estimation meeting, and with actual FitNesse tests once the iteration
-      starts. The FitNesse <ulink
-      url="http://fitnesse.org/FitNesse.UserGuide.MarkupContents">!contents</ulink>
-      instruction will then list all the acceptance criteria for the
-      story.</para>
-
-      <para>For the story page itself, the "as a ... I want ... so that... "
-      template is a good way to summarize the intent of the story.</para>
-    </sect1>
-
-    <sect1>
-      <title>Organize Completed Stories by Component</title>
-
-      <para>Once you have completed an iteration and implements its stories,
-      move those stories out to the relevant component that the story relates
-      to. The scenario tests for stories ultimately <emphasis>are</emphasis>
-      the documentation of the behaviour of the system. A year on you won't
-      remember (and won't care) which iteration you implemented a story,
-      you'll be searching for it by the component whose behaviour you want to
-      understand.</para>
-    </sect1>
-
-    <sect1>
-      <title>Structure your test using Given/When/Then</title>
-
-      <para>A standard template for organizing structuring tests is
-      given/when/then<footnote>
-          <para>As first described, I believe, by Dan North in a blog post,
-          <ulink url="http://dannorth.net/introducing-bdd">Introducing
-          BDD</ulink>.</para>
-        </footnote>:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>given ... the system is in this particular state</para>
-        </listitem>
-
-        <listitem>
-          <para>when ... this interesting thing happens</para>
-        </listitem>
-
-        <listitem>
-          <para>then ... these are the consequences</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>This structure is readily understood by non-technical business
-      users, and helps them (and the team) focus on the point of the
-      test.</para>
-
-      <para>In terms of mechanics, one approach is to put the "given" into the
-      setup page for a test, with the "when" and the "then" in separate
-      pages.d</para>
-    </sect1>
-
-    <sect1 id="sec.UsingTheFixtureViewer">
-      <title>Using the RunViewer fixture</title>
-
-      <para>The "given" can often be the hardest part to get setup. To check
-      it, we can use the <classname>RunViewer</classname> fixture (see <xref
-      linkend="sec.RunViewer" />). This will run up the drag-n-drop viewer at
-      the specified point in the test; a visual equivalent of
-      <code>System.out.println()</code>, really. We can therefore take the
-      Given page and add a RunViewer fixture at the end.</para>
-
-      <para>Note that to do this you must temporarily mark the Given page as a
-      <ulink url="http://fitnesse.org/FitNesse.UserGuide.PageProperties">test
-      page</ulink>.</para>
-    </sect1>
-
-    <sect1 id="sec.FactorOutCommonGivens">
-      <title>Factor out common "Given"s</title>
-
-      <para>Just like code, tests need to be actively managed, because if the
-      tests become hard to maintain, they'll end up being deleted. In fact, we
-      probably should take even more care with the tests than the code if they
-      represent the primary documentation of the behaviour of the
-      system.</para>
-
-      <para>In terms of size, the "given" is far larger than either the "when"
-      or the "then", and therefore this is the area where tests can quickly
-      become unmaintainable. So instead, try to factor out your givens into
-      separate pages.</para>
-
-      <para>For example:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>if using Concordion, you can use &lt;a href's&gt; with a
-          concordion:execute tag to include another page.</para>
-        </listitem>
-
-        <listitem>
-          <para>if usingFitNesse, then use it's <ulink
-          url="http://fitnesse.org/FitNesse.UserGuide.MarkupPageInclude">!include</ulink>
-          directive to assemble the pages you need</para>
-        </listitem>
-      </itemizedlist>
 
-      <para>The names of these pages should also follow a declarative style,
-      see <xref linkend="sec.UseADeclarativeStyle" />.</para>
-    </sect1>
-
-    <sect1 id="sec.UseADeclarativeStyle">
-      <title>Use a Declarative Style for Page Names</title>
-
-      <para>When factoring out "given"s (see <xref
-      linkend="sec.FactorOutCommonGivens" />), or indeed when writing the
-      "when"s and the "then"s, use a declarative style for the pages. The page
-      should describe what it does, not how it does it.</para>
-
-      <para>For example, a good page would be "SetUpCountries". It's clear
-      that this will set up all <classname>Country</classname> reference data
-      classes. This could be included into a "SetUpReferenceData" page. For
-      transaction data, we could have a page "JoeBloggsCustomer"; another one
-      again could be "JoeBloggsFiveOrders".</para>
-    </sect1>
+        <para>The <acronym>XHTML</acronym> script that you write should have
+        the following namespace declaration:</para>
 
-    <sect1 id="sec.SettingUpContinuousIntegration">
-      <title>Set up Continuous Integration</title>
-
-      <para>Since Isis is a Maven application, it is easy enough to configure
-      it to run under a CI server, such as <ulink
-      url="http://hudson-ci.org/">Hudson</ulink>. If you google around you
-      should also be able find a way to make Hudson publish the test results
-      onto a website so that they can be inspected by your domain experts /
-      business analysts.</para>
+        <programlisting>&lt;html 
+   xmlns:concordion="http://www.concordion.org/2007/concordion" 
+   xmlns:isis="http://isis.apache.org/2010/concordion"&gt;
+   ...
+&lt;/html&gt;</programlisting>
+
+        <para>The "concordion" namespace is the usual namespace required by
+        Concordion. The "isis" namespace is to allow certain commands to be
+        invoked using special commands provided by the Isis/Concordion
+        integration.</para>
+      </sect2>
     </sect1>
   </chapter>
 
-  <appendix id="apx.Reference">
-    <title>Reference</title>
+  <chapter id="chp.UsingTheFramework">
+    <title>Using the Framework</title>
 
-    <para>This appendix shows the features of the common library, and how they
+    <para>This chapter shows the features of the common library, and how they
     are used by the framework-specific integrations.</para>
 
     <para>Note that due to licensing restrictions the
@@ -476,8 +317,6 @@
     url="http://isis-contrib.sourceforge.net">isis-contrib</ulink>. We provide
     an overview of its features here for convenience.</para>
 
-    <para></para>
-
     <sect1>
       <title>Bootstrapping</title>
 
@@ -486,61 +325,6 @@
       The means by which this bootstrapping occurs is specific to the
       <acronym>BDD</acronym> framework integration.</para>
 
-      <table>
-        <title>Bootstrapping</title>
-
-        <tgroup cols="3">
-          <thead>
-            <row>
-              <entry align="center">Common</entry>
-
-              <entry align="center">Concordion</entry>
-
-              <entry align="center">FitNesse (isis-contrib)</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry><classname>Story</classname><para>Provides a context for
-              the story.</para></entry>
-
-              <entry><classname>AbstractIsisConcordionTest</classname><para>Test
-              cases should inherit from this class; provides access as
-              inherited methods</para></entry>
-
-              <entry><para><methodname>|StoryFixture|</methodname></para><para>Part
-              of the bootstrapping of the test framework itself, typically
-              referenced in the test suite's setup page. Should appear first
-              within this setup.</para></entry>
-            </row>
-
-            <row>
-              <entry><methodname></methodname><para>Bootstraps the Isis
-              runtime using the specified config directory (containing
-              isis.properties config file) and deployment type. The latter
-              should be either EXPLORATION (meaning exploration actions are
-              enabled) or PROTOTYPE; no other values are
-              valid.</para><para></para></entry>
-
-              <entry><methodname>#bootstrapIsis(String configDirectory,
-              DeploymentType deploymentType)</methodname><para>Typically
-              called from within a <methodname>@Before setUp()</methodname>
-              method.</para><para><methodname>#bootstrapIsis(String
-              configDirectory, String
-              deploymentTypeStr)</methodname></para><para>Overloaded version
-              callable from within <acronym>XHTML</acronym>; use if wish to
-              make it clear how the bootstrapping has been
-              performed.</para></entry>
-
-              <entry><para><methodname>|BootstrapIsisConfiguredFrom|configDirectory|InMode|deploymentType|</methodname></para><para>Typically
-              immediately after the call to
-              <classname>StoryFixture</classname>.</para></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
       <sect2>
         <title>Story Context</title>
 
@@ -1197,7 +981,7 @@ and running in &lt;span concordion:set="
           <methodname>#setUpObjectsVarargs(...)</methodname>.</para>
 
           <para>This method should be called using isis:execute, not with
-          concordion:execute (where "isis" is </para>
+          concordion:execute (where "isis" is</para>
 
           <para></para>
 
@@ -1688,5 +1472,165 @@ and running in &lt;span concordion:set="
         </sect3>
       </sect2>
     </sect1>
-  </appendix>
+  </chapter>
+
+  <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>
+
+    <sect1>
+      <title>Separate In-Progress Stories from the Backlog</title>
+
+      <para>If you are using an agile methodology then you will be
+      implementing a number of stories per iteration; the remainder will be in
+      a backlog. When you select a story for implementation, create a new page
+      for it in a "CurrentIteration" suite. The objective for the team is
+      therefore to get the entire CurrentIteration suite green.</para>
+
+      <para>Other stories that you may have identified but not selected for
+      the iteration can remain in a Backlog suite.</para>
+    </sect1>
+
+    <sect1>
+      <title>Use a Story Page to Collect A Set of Scenario Tests</title>
+
+      <para>Part of estimating the size of a story includes identifying the
+      acceptance criteria. These can be created as children of the story page
+      as placeholders, so that the story page becomes a suite. The child
+      scenario tests can be fleshed out as required with plain text during the
+      estimation meeting, and with actual FitNesse tests once the iteration
+      starts. The FitNesse <ulink
+      url="http://fitnesse.org/FitNesse.UserGuide.MarkupContents">!contents</ulink>
+      instruction will then list all the acceptance criteria for the
+      story.</para>
+
+      <para>For the story page itself, the "as a ... I want ... so that... "
+      template is a good way to summarize the intent of the story.</para>
+    </sect1>
+
+    <sect1>
+      <title>Organize Completed Stories by Component</title>
+
+      <para>Once you have completed an iteration and implements its stories,
+      move those stories out to the relevant component that the story relates
+      to. The scenario tests for stories ultimately <emphasis>are</emphasis>
+      the documentation of the behaviour of the system. A year on you won't
+      remember (and won't care) which iteration you implemented a story,
+      you'll be searching for it by the component whose behaviour you want to
+      understand.</para>
+    </sect1>
+
+    <sect1>
+      <title>Structure your test using Given/When/Then</title>
+
+      <para>A standard template for organizing structuring tests is
+      given/when/then<footnote>
+          <para>As first described, I believe, by Dan North in a blog post,
+          <ulink url="http://dannorth.net/introducing-bdd">Introducing
+          BDD</ulink>.</para>
+        </footnote>:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>given ... the system is in this particular state</para>
+        </listitem>
+
+        <listitem>
+          <para>when ... this interesting thing happens</para>
+        </listitem>
+
+        <listitem>
+          <para>then ... these are the consequences</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>This structure is readily understood by non-technical business
+      users, and helps them (and the team) focus on the point of the
+      test.</para>
+
+      <para>In terms of mechanics, one approach is to put the "given" into the
+      setup page for a test, with the "when" and the "then" in separate
+      pages.d</para>
+    </sect1>
+
+    <sect1 id="sec.UsingTheFixtureViewer">
+      <title>Using the RunViewer fixture</title>
+
+      <para>The "given" can often be the hardest part to get setup. To check
+      it, we can use the <classname>RunViewer</classname> fixture (see <xref
+      linkend="sec.RunViewer" />). This will run up the drag-n-drop viewer at
+      the specified point in the test; a visual equivalent of
+      <code>System.out.println()</code>, really. We can therefore take the
+      Given page and add a RunViewer fixture at the end.</para>
+
+      <para>Note that to do this you must temporarily mark the Given page as a
+      <ulink url="http://fitnesse.org/FitNesse.UserGuide.PageProperties">test
+      page</ulink>.</para>
+    </sect1>
+
+    <sect1 id="sec.FactorOutCommonGivens">
+      <title>Factor out common "Given"s</title>
+
+      <para>Just like code, tests need to be actively managed, because if the
+      tests become hard to maintain, they'll end up being deleted. In fact, we
+      probably should take even more care with the tests than the code if they
+      represent the primary documentation of the behaviour of the
+      system.</para>
+
+      <para>In terms of size, the "given" is far larger than either the "when"
+      or the "then", and therefore this is the area where tests can quickly
+      become unmaintainable. So instead, try to factor out your givens into
+      separate pages.</para>
+
+      <para>For example:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>if using Concordion, you can use &lt;a href's&gt; with a
+          concordion:execute tag to include another page.</para>
+        </listitem>
+
+        <listitem>
+          <para>if usingFitNesse, then use it's <ulink
+          url="http://fitnesse.org/FitNesse.UserGuide.MarkupPageInclude">!include</ulink>
+          directive to assemble the pages you need</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The names of these pages should also follow a declarative style,
+      see <xref linkend="sec.UseADeclarativeStyle" />.</para>
+    </sect1>
+
+    <sect1 id="sec.UseADeclarativeStyle">
+      <title>Use a Declarative Style for Page Names</title>
+
+      <para>When factoring out "given"s (see <xref
+      linkend="sec.FactorOutCommonGivens" />), or indeed when writing the
+      "when"s and the "then"s, use a declarative style for the pages. The page
+      should describe what it does, not how it does it.</para>
+
+      <para>For example, a good page would be "SetUpCountries". It's clear
+      that this will set up all <classname>Country</classname> reference data
+      classes. This could be included into a "SetUpReferenceData" page. For
+      transaction data, we could have a page "JoeBloggsCustomer"; another one
+      again could be "JoeBloggsFiveOrders".</para>
+    </sect1>
+
+    <sect1 id="sec.SettingUpContinuousIntegration">
+      <title>Set up Continuous Integration</title>
+
+      <para>Since Isis is a Maven application, it is easy enough to configure
+      it to run under a CI server, such as <ulink
+      url="http://hudson-ci.org/">Hudson</ulink>. If you google around you
+      should also be able find a way to make Hudson publish the test results
+      onto a website so that they can be inspected by your domain experts /
+      business analysts.</para>
+    </sect1>
+  </chapter>
 </book>

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AWTUtilities.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AWTUtilities.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AWTUtilities.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AWTUtilities.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Frame;
 import java.awt.Image;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Font;
 import java.awt.Graphics;
@@ -27,16 +27,16 @@ import java.awt.Rectangle;
 import java.awt.image.ImageObserver;
 import java.util.StringTokenizer;
 
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Shape;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.base.AwtImage;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Shape;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.base.AwtImage;
 
 
 public class AwtCanvas implements Canvas {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java Tue Nov 16 18:28:38 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.util.Properties;
 
 
 public class AwtColor implements Color {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColorsAndFonts.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColorsAndFonts.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColorsAndFonts.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColorsAndFonts.java Tue Nov 16 18:28:38 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.util.Hashtable;
 
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public class AwtColorsAndFonts implements ColorsAndFonts {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtImageFactory.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Toolkit;
 import java.awt.image.FilteredImageSource;
@@ -26,10 +26,10 @@ import java.awt.image.RGBImageFilter;
 
 import org.apache.isis.core.runtime.imageloader.TemplateImage;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.drawing.ImageFactory;
-import org.apache.isis.extensions.dnd.view.base.AwtImage;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.ImageFactory;
+import org.apache.isis.viewer.dnd.view.base.AwtImage;
 
 
 public class AwtImageFactory extends ImageFactory {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -28,9 +28,9 @@ import java.util.StringTokenizer;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.util.Properties;
 
 
 public class AwtText implements Text {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtToolkit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtToolkit.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtToolkit.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtToolkit.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.viewer.DefaultContentFactory;
-import org.apache.isis.extensions.dnd.viewer.SkylarkViewFactory;
-import org.apache.isis.extensions.dnd.viewer.basic.LogoBackground;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.viewer.DefaultContentFactory;
+import org.apache.isis.viewer.dnd.viewer.SkylarkViewFactory;
+import org.apache.isis.viewer.dnd.viewer.basic.LogoBackground;
 
 
 public class AwtToolkit extends Toolkit {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.BorderLayout;
 import java.awt.Button;
@@ -47,7 +47,7 @@ import java.util.Vector;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.extensions.dnd.view.debug.DebugOutput;
+import org.apache.isis.viewer.dnd.view.debug.DebugOutput;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -28,13 +28,13 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.internal.monitor.SystemPrinter;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.MenuOptions;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.MenuOptions;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public class DebugOptions implements MenuOptions {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InfoDebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InfoDebugFrame.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InfoDebugFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InfoDebugFrame.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import org.apache.isis.core.commons.debug.DebugInfo;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Point;
 import java.awt.event.InputEvent;
@@ -30,18 +30,18 @@ import java.awt.event.MouseMotionListene
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.interaction.ClickImpl;
-import org.apache.isis.extensions.dnd.interaction.ContentDragImpl;
-import org.apache.isis.extensions.dnd.interaction.DragStartImpl;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.ContentDrag;
-import org.apache.isis.extensions.dnd.view.DragEvent;
-import org.apache.isis.extensions.dnd.view.InteractionSpy;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAreaType;
-import org.apache.isis.extensions.dnd.view.base.AbstractView;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.interaction.ClickImpl;
+import org.apache.isis.viewer.dnd.interaction.ContentDragImpl;
+import org.apache.isis.viewer.dnd.interaction.DragStartImpl;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.ContentDrag;
+import org.apache.isis.viewer.dnd.view.DragEvent;
+import org.apache.isis.viewer.dnd.view.InteractionSpy;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAreaType;
+import org.apache.isis.viewer.dnd.view.base.AbstractView;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
 
 
 public class InteractionHandler implements MouseMotionListener, MouseListener, KeyListener {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java Tue Nov 16 18:28:38 2010
@@ -18,18 +18,18 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.interaction.KeyboardActionImpl;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.KeyboardAction;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.interaction.KeyboardActionImpl;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.KeyboardAction;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public class KeyboardManager {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.BorderLayout;
 import java.awt.Button;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import org.apache.isis.core.commons.debug.DebugInfo;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.AbstractView;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
-import org.apache.isis.extensions.dnd.view.debug.DebugView;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.AbstractView;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.view.debug.DebugView;
 
 
 public class OverlayDebugFrame extends DebugFrame {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Dimension;
 import java.awt.Frame;
@@ -28,10 +28,10 @@ import java.awt.Toolkit;
 
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public class PrintOption extends UserActionAbstract {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Cursor;
 import java.awt.Dimension;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Button;
 import java.awt.Dialog;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java Tue Nov 16 18:28:38 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import org.apache.isis.extensions.dnd.view.InteractionSpyWindow;
+import org.apache.isis.viewer.dnd.view.InteractionSpyWindow;
 
 
 class SpyWindow implements InteractionSpyWindow {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.FileDialog;
 import java.awt.Frame;
@@ -32,8 +32,8 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 
 import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.view.Toolkit;
 
 
 public class ViewerFrame extends Frame implements RenderingArea {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Cursor;
 import java.util.List;
@@ -27,13 +27,13 @@ import java.util.Vector;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.extensions.dnd.view.BackgroundTask;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.Feedback;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.message.ExceptionMessageContent;
-import org.apache.isis.extensions.dnd.view.message.TextMessageContent;
+import org.apache.isis.viewer.dnd.view.BackgroundTask;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Feedback;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.message.ExceptionMessageContent;
+import org.apache.isis.viewer.dnd.view.message.TextMessageContent;
 
 
 public class XFeedbackManager implements Feedback {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.awt;
+package org.apache.isis.viewer.dnd.awt;
 
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -40,39 +40,39 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.Background;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.help.HelpViewer;
-import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.DragEvent;
-import org.apache.isis.extensions.dnd.view.DragStart;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.InteractionSpy;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.Placement;
-import org.apache.isis.extensions.dnd.view.ShutdownListener;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.UndoStack;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAreaType;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.ViewUpdateNotifier;
-import org.apache.isis.extensions.dnd.view.Viewer;
-import org.apache.isis.extensions.dnd.view.base.NullView;
-import org.apache.isis.extensions.dnd.view.border.BackgroundBorder;
-import org.apache.isis.extensions.dnd.view.border.LineBorder;
-import org.apache.isis.extensions.dnd.view.debug.LoggingOptions;
-import org.apache.isis.extensions.dnd.view.menu.PopupMenuContainer;
-import org.apache.isis.extensions.dnd.view.message.MessageContent;
-import org.apache.isis.extensions.dnd.viewer.ApplicationOptions;
+import org.apache.isis.viewer.dnd.drawing.Background;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.help.HelpViewer;
+import org.apache.isis.viewer.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.DragEvent;
+import org.apache.isis.viewer.dnd.view.DragStart;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.InteractionSpy;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.Placement;
+import org.apache.isis.viewer.dnd.view.ShutdownListener;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.UndoStack;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAreaType;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.ViewUpdateNotifier;
+import org.apache.isis.viewer.dnd.view.Viewer;
+import org.apache.isis.viewer.dnd.view.base.NullView;
+import org.apache.isis.viewer.dnd.view.border.BackgroundBorder;
+import org.apache.isis.viewer.dnd.view.border.LineBorder;
+import org.apache.isis.viewer.dnd.view.debug.LoggingOptions;
+import org.apache.isis.viewer.dnd.view.menu.PopupMenuContainer;
+import org.apache.isis.viewer.dnd.view.message.MessageContent;
+import org.apache.isis.viewer.dnd.viewer.ApplicationOptions;
 
 
 public class XViewer implements Viewer {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.bootstrap;
+package org.apache.isis.viewer.dnd.bootstrap;
 
 import java.awt.Dimension;
 import java.util.StringTokenizer;
@@ -35,68 +35,68 @@ import org.apache.isis.core.runtime.auth
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.userprofile.UserProfile;
 import org.apache.isis.core.runtime.viewer.IsisViewerAbstract;
-import org.apache.isis.extensions.dnd.awt.AwtImageFactory;
-import org.apache.isis.extensions.dnd.awt.AwtToolkit;
-import org.apache.isis.extensions.dnd.awt.LoginDialog;
-import org.apache.isis.extensions.dnd.awt.ViewerFrame;
-import org.apache.isis.extensions.dnd.awt.XViewer;
-import org.apache.isis.extensions.dnd.calendar.CalendarSpecification;
-import org.apache.isis.extensions.dnd.combined.ExpandableListSpecification;
-import org.apache.isis.extensions.dnd.combined.FormWithTableSpecification;
-import org.apache.isis.extensions.dnd.combined.TwoPartViewSpecification;
-import org.apache.isis.extensions.dnd.configurable.ConfigurableObjectViewSpecification;
-import org.apache.isis.extensions.dnd.configurable.GridListSpecification;
-import org.apache.isis.extensions.dnd.configurable.NewViewSpecification;
-import org.apache.isis.extensions.dnd.configurable.PanelViewSpecification;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.field.CheckboxField;
-import org.apache.isis.extensions.dnd.field.ColorField;
-import org.apache.isis.extensions.dnd.field.DateFieldSpecification;
-import org.apache.isis.extensions.dnd.field.EmptyField;
-import org.apache.isis.extensions.dnd.field.FieldOfSpecification;
-import org.apache.isis.extensions.dnd.field.ImageField;
-import org.apache.isis.extensions.dnd.field.PasswordFieldSpecification;
-import org.apache.isis.extensions.dnd.field.TextFieldSpecification;
-import org.apache.isis.extensions.dnd.form.ExpandableFormSpecification;
-import org.apache.isis.extensions.dnd.form.FormSpecification;
-import org.apache.isis.extensions.dnd.form.FormWithDetailSpecification;
-import org.apache.isis.extensions.dnd.form.InternalFormSpecification;
-import org.apache.isis.extensions.dnd.form.SummaryFormSpecification;
-import org.apache.isis.extensions.dnd.grid.GridSpecification;
-import org.apache.isis.extensions.dnd.help.HelpViewer;
-import org.apache.isis.extensions.dnd.help.InternalHelpViewer;
-import org.apache.isis.extensions.dnd.histogram.HistogramSpecification;
-import org.apache.isis.extensions.dnd.icon.LargeIconSpecification;
-import org.apache.isis.extensions.dnd.icon.RootIconSpecification;
-import org.apache.isis.extensions.dnd.icon.SubviewIconSpecification;
-import org.apache.isis.extensions.dnd.list.InternalListSpecification;
-import org.apache.isis.extensions.dnd.list.SimpleListSpecification;
-import org.apache.isis.extensions.dnd.service.PerspectiveContent;
-import org.apache.isis.extensions.dnd.service.ServiceIconSpecification;
-import org.apache.isis.extensions.dnd.table.WindowTableSpecification;
-import org.apache.isis.extensions.dnd.tree.ListWithDetailSpecification;
-import org.apache.isis.extensions.dnd.tree.TreeSpecification;
-import org.apache.isis.extensions.dnd.tree.TreeWithDetailSpecification;
-import org.apache.isis.extensions.dnd.tree2.CollectionTreeNodeSpecification;
-import org.apache.isis.extensions.dnd.tree2.TreeNodeSpecification;
-import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.ShutdownListener;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.ViewUpdateNotifier;
-import org.apache.isis.extensions.dnd.view.base.ViewUpdateNotifierImpl;
-import org.apache.isis.extensions.dnd.view.message.DetailedMessageViewSpecification;
-import org.apache.isis.extensions.dnd.view.message.MessageDialogSpecification;
-import org.apache.isis.extensions.dnd.viewer.SkylarkViewFactory;
-import org.apache.isis.extensions.dnd.viewer.basic.DragContentSpecification;
-import org.apache.isis.extensions.dnd.viewer.basic.InnerWorkspaceSpecification;
-import org.apache.isis.extensions.dnd.viewer.basic.RootWorkspaceSpecification;
-import org.apache.isis.extensions.dnd.viewer.basic.WrappedTextFieldSpecification;
+import org.apache.isis.viewer.dnd.awt.AwtImageFactory;
+import org.apache.isis.viewer.dnd.awt.AwtToolkit;
+import org.apache.isis.viewer.dnd.awt.LoginDialog;
+import org.apache.isis.viewer.dnd.awt.ViewerFrame;
+import org.apache.isis.viewer.dnd.awt.XViewer;
+import org.apache.isis.viewer.dnd.calendar.CalendarSpecification;
+import org.apache.isis.viewer.dnd.combined.ExpandableListSpecification;
+import org.apache.isis.viewer.dnd.combined.FormWithTableSpecification;
+import org.apache.isis.viewer.dnd.combined.TwoPartViewSpecification;
+import org.apache.isis.viewer.dnd.configurable.ConfigurableObjectViewSpecification;
+import org.apache.isis.viewer.dnd.configurable.GridListSpecification;
+import org.apache.isis.viewer.dnd.configurable.NewViewSpecification;
+import org.apache.isis.viewer.dnd.configurable.PanelViewSpecification;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.field.CheckboxField;
+import org.apache.isis.viewer.dnd.field.ColorField;
+import org.apache.isis.viewer.dnd.field.DateFieldSpecification;
+import org.apache.isis.viewer.dnd.field.EmptyField;
+import org.apache.isis.viewer.dnd.field.FieldOfSpecification;
+import org.apache.isis.viewer.dnd.field.ImageField;
+import org.apache.isis.viewer.dnd.field.PasswordFieldSpecification;
+import org.apache.isis.viewer.dnd.field.TextFieldSpecification;
+import org.apache.isis.viewer.dnd.form.ExpandableFormSpecification;
+import org.apache.isis.viewer.dnd.form.FormSpecification;
+import org.apache.isis.viewer.dnd.form.FormWithDetailSpecification;
+import org.apache.isis.viewer.dnd.form.InternalFormSpecification;
+import org.apache.isis.viewer.dnd.form.SummaryFormSpecification;
+import org.apache.isis.viewer.dnd.grid.GridSpecification;
+import org.apache.isis.viewer.dnd.help.HelpViewer;
+import org.apache.isis.viewer.dnd.help.InternalHelpViewer;
+import org.apache.isis.viewer.dnd.histogram.HistogramSpecification;
+import org.apache.isis.viewer.dnd.icon.LargeIconSpecification;
+import org.apache.isis.viewer.dnd.icon.RootIconSpecification;
+import org.apache.isis.viewer.dnd.icon.SubviewIconSpecification;
+import org.apache.isis.viewer.dnd.list.InternalListSpecification;
+import org.apache.isis.viewer.dnd.list.SimpleListSpecification;
+import org.apache.isis.viewer.dnd.service.PerspectiveContent;
+import org.apache.isis.viewer.dnd.service.ServiceIconSpecification;
+import org.apache.isis.viewer.dnd.table.WindowTableSpecification;
+import org.apache.isis.viewer.dnd.tree.ListWithDetailSpecification;
+import org.apache.isis.viewer.dnd.tree.TreeSpecification;
+import org.apache.isis.viewer.dnd.tree.TreeWithDetailSpecification;
+import org.apache.isis.viewer.dnd.tree2.CollectionTreeNodeSpecification;
+import org.apache.isis.viewer.dnd.tree2.TreeNodeSpecification;
+import org.apache.isis.viewer.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.ShutdownListener;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.ViewUpdateNotifier;
+import org.apache.isis.viewer.dnd.view.base.ViewUpdateNotifierImpl;
+import org.apache.isis.viewer.dnd.view.message.DetailedMessageViewSpecification;
+import org.apache.isis.viewer.dnd.view.message.MessageDialogSpecification;
+import org.apache.isis.viewer.dnd.viewer.SkylarkViewFactory;
+import org.apache.isis.viewer.dnd.viewer.basic.DragContentSpecification;
+import org.apache.isis.viewer.dnd.viewer.basic.InnerWorkspaceSpecification;
+import org.apache.isis.viewer.dnd.viewer.basic.RootWorkspaceSpecification;
+import org.apache.isis.viewer.dnd.viewer.basic.WrappedTextFieldSpecification;
 
 
 public class DndViewer extends IsisViewerAbstract {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.bootstrap;
+package org.apache.isis.viewer.dnd.bootstrap;
 
 import org.apache.isis.core.runtime.viewer.IsisViewer;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.collection.AbstractCollectionContent;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.collection.AbstractCollectionContent;
 
 
 public class CalendarCellContent extends AbstractCollectionContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.view.Toolkit;
 
 
 public class CalendarConstants {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 
 import java.util.Date;
@@ -29,25 +29,25 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.icon.IconElementFactory;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.base.BlankView;
-import org.apache.isis.extensions.dnd.view.border.ScrollBorder;
-import org.apache.isis.extensions.dnd.view.collection.CollectionContent;
-import org.apache.isis.extensions.dnd.view.composite.CollectionElementBuilder;
-import org.apache.isis.extensions.dnd.view.composite.CompositeView;
-import org.apache.isis.extensions.dnd.view.composite.CompositeViewUsingBuilder;
-import org.apache.isis.extensions.dnd.view.composite.StackLayout;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.icon.IconElementFactory;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.base.BlankView;
+import org.apache.isis.viewer.dnd.view.border.ScrollBorder;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+import org.apache.isis.viewer.dnd.view.composite.CollectionElementBuilder;
+import org.apache.isis.viewer.dnd.view.composite.CompositeView;
+import org.apache.isis.viewer.dnd.view.composite.CompositeViewUsingBuilder;
+import org.apache.isis.viewer.dnd.view.composite.StackLayout;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 public class CalendarGrid extends CompositeView {
     private Cells cellLayout;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,21 +18,21 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.List;
 
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.CompositeViewSpecification;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.base.Layout;
-import org.apache.isis.extensions.dnd.view.collection.CollectionContent;
-import org.apache.isis.extensions.dnd.view.composite.StackLayout;
-import org.apache.isis.extensions.dnd.view.composite.ViewBuilder;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.CompositeViewSpecification;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+import org.apache.isis.viewer.dnd.view.composite.StackLayout;
+import org.apache.isis.viewer.dnd.view.composite.ViewBuilder;
 
 
 public class CalendarSpecification implements CompositeViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java Tue Nov 16 18:28:38 2010
@@ -18,23 +18,23 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.field.DatePicker;
-import org.apache.isis.extensions.dnd.toolbar.ToolbarView;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.composite.CompositeView;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
-import org.apache.isis.extensions.dnd.view.control.AbstractButtonAction;
-import org.apache.isis.extensions.dnd.view.control.Button;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.field.DatePicker;
+import org.apache.isis.viewer.dnd.toolbar.ToolbarView;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.composite.CompositeView;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
+import org.apache.isis.viewer.dnd.view.control.Button;
 
 
 public class CalendarView extends CompositeView {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 public class Cell {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.Calendar;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.Calendar;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.Calendar;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.Calendar;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.calendar;
+package org.apache.isis.viewer.dnd.calendar;
 
 import java.util.Calendar;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.combined;
+package org.apache.isis.viewer.dnd.combined;
 
-import org.apache.isis.extensions.dnd.form.ExpandableViewBorder;
-import org.apache.isis.extensions.dnd.icon.IconElementFactory;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.composite.AbstractCollectionViewSpecification;
+import org.apache.isis.viewer.dnd.form.ExpandableViewBorder;
+import org.apache.isis.viewer.dnd.icon.IconElementFactory;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.composite.AbstractCollectionViewSpecification;
 
 
 public class ExpandableListSpecification extends AbstractCollectionViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/FormWithTableSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.combined;
+package org.apache.isis.viewer.dnd.combined;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
@@ -26,15 +26,15 @@ 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.dnd.form.FormSpecification;
-import org.apache.isis.extensions.dnd.table.InternalTableSpecification;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.Layout;
-import org.apache.isis.extensions.dnd.view.composite.GridLayout;
-import org.apache.isis.extensions.dnd.view.composite.StackLayout;
+import org.apache.isis.viewer.dnd.form.FormSpecification;
+import org.apache.isis.viewer.dnd.table.InternalTableSpecification;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.view.composite.GridLayout;
+import org.apache.isis.viewer.dnd.view.composite.StackLayout;
 
 
 public class FormWithTableSpecification extends SplitViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewAccess.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.combined;
+package org.apache.isis.viewer.dnd.combined;
 
 import java.util.List;
 
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
 
 
 public class SplitViewAccess implements ViewAxis {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.dnd.combined;
+package org.apache.isis.viewer.dnd.combined;
 
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.composite.AbstractViewBuilder;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 class SplitViewBuilder extends AbstractViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/SplitViewSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.combined;
+package org.apache.isis.viewer.dnd.combined;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,12 +29,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.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.composite.CompositeViewSpecification;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.composite.CompositeViewSpecification;
 
 
 public abstract class SplitViewSpecification extends CompositeViewSpecification {



Mime
View raw message