incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1026350 [3/6] - in /incubator/isis/trunk: ./ alternatives/bytecode/ alternatives/bytecode/identity/src/site/ alternatives/bytecode/javassist/src/site/ alternatives/bytecode/src/docbkx/guide/ alternatives/bytecode/src/site/ alternatives/obj...
Date Fri, 22 Oct 2010 14:51:49 GMT
Modified: incubator/isis/trunk/applib/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/site/apt/index.apt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/applib/src/site/apt/index.apt Fri Oct 22 14:51:42 2010
@@ -15,11 +15,9 @@
 ~~  specific language governing permissions and limitations
 ~~  under the License.
 
-
-
 Application Library
  
- The [[NAME]] Application Library - or AppLib - is the only dependency that your 
- domain objects have with the [[NAME]] framework.  It holds a set of interfaces
+ The Apache Isis Application Library - or AppLib - is the only dependency that your 
+ domain objects have with Apache Isis itself.  It holds a set of interfaces
  and annotations that are used by the framework to infer business rules and constraints.
  

Modified: incubator/isis/trunk/core/commons/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/site/apt/index.apt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/commons/src/site/apt/index.apt Fri Oct 22 14:51:42 2010
@@ -19,5 +19,5 @@
 
 Commons
 
- Common utilities, language extensions, and defines component architecture (Guice).
+ Common utilities, language extensions, and defines a component architecture.
  

Modified: incubator/isis/trunk/core/commons/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/site/site.xml (original)
+++ incubator/isis/trunk/core/commons/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,10 +6,13 @@
 			<item name="Commons"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Commons">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
-
+        
 		<menu name="Maven Reports" ref="reports"/>
 	</body>
 </project>

Modified: incubator/isis/trunk/core/metamodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/site/site.xml (original)
+++ incubator/isis/trunk/core/metamodel/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="MetaModel"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="MetaModel">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/pom.xml (original)
+++ incubator/isis/trunk/core/pom.xml Fri Oct 22 14:51:42 2010
@@ -31,6 +31,7 @@
         <siteBaseDir>..</siteBaseDir>
 		
 		<docbkxGuideTitle>Apache Isis Core</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Design, APIs and Customization</docbkxGuideSubTitle>
 		<docbkxGuideName>isis-core</docbkxGuideName>	
     </properties>
 

Modified: incubator/isis/trunk/core/progmodel/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/site/apt/index.apt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/progmodel/src/site/apt/index.apt Fri Oct 22 14:51:42 2010
@@ -19,5 +19,5 @@
 
 ProgModel
 
- Defines a programming model API...
+ Defines facets of programming model, that can be reused across any programming model definition.
  

Modified: incubator/isis/trunk/core/progmodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/site/site.xml (original)
+++ incubator/isis/trunk/core/progmodel/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="MetaModel"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="MetaModel">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/core/runtime/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/site/site.xml (original)
+++ incubator/isis/trunk/core/runtime/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,15 +6,13 @@
 			<item name="Runtime"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Runtime">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 		
-		<menu name="Documentation">
-            <!--  REVIEW: should move into docbook in parent -->
-			<item name="Configuration" href="configuration.html" />
-		</menu>
-
 		<menu name="Maven Reports" ref="reports"/>
 	</body>
 </project>

Modified: incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml (original)
+++ incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml Fri Oct 22 14:51:42 2010
@@ -23,8 +23,7 @@
   <bookinfo>
     <title><?eval ${docbkxGuideTitle}?></title>
 
-    <subtitle>Developing domain driven applications using Apache
-    Isis</subtitle>
+    <subtitle><?eval ${docbkxGuideSubTitle}?></subtitle>
 
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 
@@ -40,12 +39,6 @@
 
         <surname>Matthews</surname>
       </author>
-
-      <author>
-        <firstname>Kevin</firstname>
-
-        <surname>Meyer</surname>
-      </author>
     </authorgroup>
 
     <legalnotice>
@@ -87,882 +80,16 @@
     <title>Programmers Guide</title>
 
     <chapter id="chp.Intro">
-      <title>Overview</title>
+      <title>Introduction</title>
 
       <abstract>
-        <para>This chapter gives an overview of the main principles and
-        patterns that underly the Apache Isis approach.</para>
+        <para>*** yada yada</para>
       </abstract>
 
       <sect1>
-        <title>Introduction</title>
-
-        <para><emphasis>Apache Isis</emphasis> is a full-stack open source
-        application development framework, designed to let you rapidly develop
-        enterprise business applications following a domain-driven philosophy.
-        Developing an application in Isis is - at least initially - about
-        focusing on the bit that matters to the business, the core domain
-        logic. It </para>
-
-        <para></para>
-
-        <para></para>
-      </sect1>
-
-      <sect1>
-        <title>Principles</title>
-
-        <para><emphasis></emphasis></para>
-
-        <para><emphasis></emphasis><note>
-            <para>TODO: distill some of the material on the trunk site.</para>
-
-            <para></para>
-          </note></para>
-
-        <sect2>
-          <title>Ubiquitous Language</title>
-
-          <para></para>
-
-          <para></para>
-
-          <para></para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Rapid Application Development</title>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para>feedback loop</para>
-
-          <para>requirements traceability</para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Problem Solver, not Process Follower</title>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para>Sovereign Applications vs Transient Applications</para>
-
-          <para></para>
-
-          <para>for sovereign applications</para>
-
-          <para></para>
-
-          <para>incredible machine</para>
-
-          <para></para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Commonly Trodden Paths</title>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para>for transient apps</para>
+        <title>***</title>
 
-          <para></para>
-
-          <para>Civil engineering analogy.... put in the paths
-          afterwards</para>
-
-          <para></para>
-
-          <para>Christopher Alexander - cardboard cutouts of where the windows
-          go</para>
-
-          <para></para>
-
-          <para>Database denormalization</para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Opinionated</title>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para></para>
-
-          <para>convention over configuration</para>
-
-          <para></para>
-
-          <para>framework, domain services, dependency injection</para>
-
-          <para></para>
-
-          <para>JSR-299</para>
-
-          <para>don't want too many degrees of freedom. Work out of the box,
-          specify alternates later as needed</para>
-
-          <para></para>
-        </sect2>
-      </sect1>
-
-      <sect1>
-        <title>Patterns</title>
-
-        <para>The framework is designed around two patterns:</para>
-
-        <para></para>
-
-        <sect2>
-          <title>[[NAME]] Pattern</title>
-
-          <para>The first architectural pattern is the [[NAME]] pattern,
-          whereby the framework automatically generates an object-oriented
-          user interface (OOUI) for your domain objects. If required, this
-          OOUI can then be customized.</para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Hexagonal Architecture</title>
-
-          <para>The second core pattern implemented by <emphasis>Apache
-          Isis</emphasis> is the hexagonal architecture. This means it allows
-          the same domain model to be run with different viewers, either as a
-          desktop app or as a webapp. Equally, you can choose which object
-          store to use in order to persist your domain objects. The diagram
-          below shows the hexagonal architecture as it is implemented by
-          Apache Isis.</para>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para>*** picture of the hexagonal architecture here.</para>
-
-          <para></para>
-
-          <para><mediaobject>
-              <imageobject>
-                <imagedata fileref="images/HexagonalArchitectureOverview.png" />
-              </imageobject>
-            </mediaobject></para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Dependency Injection</title>
-
-          <para></para>
-
-          <para></para>
-
-          <para></para>
-        </sect2>
-      </sect1>
-
-      <sect1>
-        <title>Benefits and Consequences</title>
-
-        <para></para>
-
-        <para><note>
-            <para>TODO: review stuff below, copied-n-pasted from site
-            docs.</para>
-          </note></para>
-
-        <para>As you might imagine, not needing to write any GUI code
-        substantially speeds up development, and shortens the feedback loop to
-        allow you to improve your core domain model without lots of GUI code
-        slowing you down.</para>
-
-        <para>The OOUIs generated by Apache Isis are especially suitable to
-        "expert" users, typically those internal to your organization who have
-        a good understanding of the domain and just want to get their job
-        done. But for less expert users (or for a webapp deployed on the
-        internet), a more scripted UI may be called for. Isis therefore lets
-        you customize the user interface according to your users'
-        needs.</para>
-
-        <para>Alternatively, you might want to just use Isis as a design tool.
-        The framework goes to a lot of trouble to ensure that the domain
-        objects you build have no dependencies on the framework: they are
-        basically annotated pojos that follow a number of straightforward
-        programming conventions. So, you can use Isis to rapidly evolve your
-        domain objects, and then deploy them within some other runtime
-        framework if you wish. </para>
-
-        <para></para>
-
-        <para></para>
-
-        <note>
-          <para>TODO: include some of the benefits cited for NO pattern, from
-          website: faster development cycle, greater agility, empowering style
-          of UI, requirements analysis/traceability; play to developer
-          strengths</para>
-        </note>
-
-        <para></para>
-
-        <sect2>
-          <title>Playing to Developer Strengths</title>
-
-          <para></para>
-
-          <para></para>
-
-          <note>
-            <para>TODO: discuss</para>
-          </note>
-
-          <para>domain programmer/business analyst</para>
-
-          <para></para>
-
-          <para>application integration expert (domain services)</para>
-
-          <para></para>
-
-          <para>customizer (UI expert)</para>
-
-          <para></para>
-
-          <para>architectural integration</para>
-
-          <para></para>
-        </sect2>
-      </sect1>
-    </chapter>
-
-    <chapter>
-      <title>Developing Isis Applications</title>
-
-      <abstract>
-        <para>This chapter describes the general approach to follow that we
-        recommend for developing domain-driven applications on Isis.</para>
-      </abstract>
-
-      <sect1>
-        <title>Where to Start?</title>
-
-        <para>There's quite a lot to <emphasis>Apache Isis</emphasis>, with
-        lots of optional components (which we call alternates, in keeping with
-        JSR-299 terminology). To keep things manageable, the Isis
-        documentation is scoped closest to where it's relevant.</para>
-
-        <para>On the other hand, it can be difficult to know exactly where to
-        go in the first place... hence these notes. If you read them from top
-        to bottom then you'll (a) have a pretty good idea of the general
-        process we recommend for developing domain applications in
-        <emphasis>Apache Isis</emphasis> and (b) know where to look for more
-        detailed documentation.</para>
-      </sect1>
-
-      <sect1 id="sec.ApplicationArchetypes">
-        <title>Application Archetypes</title>
-
-        <para>We tend to structure Apache Isis applications following a
-        standard structure, and you can use the
-        <emphasis>application</emphasis> Maven archetype (in
-        <filename>support/archetypes/application</filename>) to set this up
-        for you. Some of the optional plugins also provide their own Maven
-        archetypes which you can run afterwards, for example to setup a
-        particular new viewer or object store. The idea is that these are run
-        alongside your own application, and provide additional Maven
-        (sub)modules which you can then reference.</para>
-
-        <para>Going back to the application archetype though, this sets up a
-        simple application that can be run out-of-the-box in exploration mode
-        (that is, with the in-memory object store), and using one of the two
-        main viewers:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>the Drag-n-Drop (<acronym>DnD</acronym>) viewer is a
-            client-side viewer that renders the domain objects to a desktop
-            metaphor.</para>
-          </listitem>
-
-          <listitem>
-            <para>the <acronym>HTML</acronym> viewer is designed to run within
-            a webapp, and renders a single domain object per page.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>Each of these can be run from the command line (the
-        <acronym>HTML</acronym> viewer boots up an instance of Jetty web
-        server); the archetype documentation explains how; there's further
-        documentation on these particular viewers themselves in their
-        respective module documentation (see <xref
-        linkend="sec.Viewers" />).</para>
-
-        <para>Later on you'll want to deploy the application more formally,
-        for example as a <acronym>WAR</acronym> archive (see <xref
-        linkend="sec.DeployingAnIsisApplication" /> for more details).</para>
-      </sect1>
-
-      <sect1>
-        <title>Programming Model</title>
-
-        <para>Once you've got the archetype application running, you're ready
-        to start developing your own domain objects. But no matter what
-        application you are developing, you'll need to understand the
-        <emphasis>Isis programming model</emphasis>.</para>
-
-        <para>The programming model is the set of annotations and programming
-        conventions that [[NAME]] recognizes. You'll find the programming
-        model is documented in the Application Library module (in
-        <filename>applib</filename>).</para>
-
-        <para>In addition, the applib contains a small number of utilities
-        which can be useful when writing your application: one such is the
-        ability to create XML snapshots of your domain object graphs.</para>
-
-        <para>The applib documentation also provides pointers to other
-        features that can have an impact on the way in which you write your
-        code, namely the cglib and javassist bytecode providers modules (<xref
-        linkend="sec.BytecodeProviders" />), the
-        <filename>alternates/headless</filename> viewer plugin (<xref
-        linkend="sec.Headless" />), and the <ulink
-        url="http://groovy.codehaus.org">Groovy</ulink> language support
-        (<xref linkend="sec.OtherLanguages" />).</para>
-      </sect1>
-
-      <sect1>
-        <title>Fixtures and Prototyping</title>
-
-        <para>We suggest that the fastest way to develop your application is
-        to start prototyping using the in-memory object store (that is, as set
-        up by the application archetype, see <xref
-        linkend="sec.ApplicationArchetypes" />). The nice thing about working
-        this way is that there is no database schema to slow you down; you can
-        make changes and then rapidly try them out.</para>
-
-        <para>On the other hand, the in-memory object store doesn't persist
-        objects between runs, so you'll soon tire of continually recreating
-        test objects to try out your changes. You should therefore use
-        fixtures: blocks of code that are used to setup objects in the
-        in-memory object store prior to the app running.</para>
-
-        <para>You can find more information about using fixtures in the
-        <filename>applib</filename> module. It's also worth knowing about them
-        because they are used when writing tests for your domain application
-        (see <xref linkend="sec.AgileTesting" />).</para>
-      </sect1>
-
-      <sect1 id="sec.AgileTesting">
-        <title>Agile Testing</title>
-
-        <para><emphasis>Apache Isis</emphasis> is very much aligned to agile
-        development practices, and provides two complementary mechanisms for
-        you to test-drive the development of your application.</para>
-
-        <sect2>
-          <title>Story Testing</title>
-
-          <para>Many agile practitioners use story tests as a means to capture
-          the acceptance (or completion) criteria for high-level user stories.
-          These story tests are typically captured in a non-programmatic form
-          so that is understandable to domain experts as well as
-          programmers.</para>
-
-          <para>Isis provides integrations with two story testing
-          frameworks:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para><ulink url="http://fitnesse.org">FitNesse</ulink>, where
-              the story test is captured within a wiki, and</para>
-            </listitem>
-
-            <listitem>
-              <para><ulink url="http://concordion.org">Concordion</ulink>,
-              where the story test is captured as HTML.</para>
-            </listitem>
-          </itemizedlist>
-
-          <para>For more information on using these integrations and their
-          supporting archetypes, see the <filename>storytests</filename>
-          module.</para>
-        </sect2>
-
-        <sect2 id="sec.UnitTesting">
-          <title>Unit Testing</title>
-
-          <para>Unlike story tests, unit tests are normally written in a
-          programming language, typically in a framework such as <ulink
-          url="http://junit.org">JUnit</ulink>. <emphasis>A story test ensures
-          that the right system is built, while a unit tests ensures the
-          system is built right</emphasis>.</para>
-
-          <para>When writing unit tests, you have a choice. Since all the
-          business logic in [[NAME]] applications is encapsulated in
-          domain object pojos, you can just write unit tests using nothing
-          more than JUnit and perhaps also a mocking library such as <ulink
-          url="http://jmock.org">JMock</ulink>.</para>
-
-          <para>A slightly more sophisticated approach is to use the JUnit
-          integrations and supporting classes of the (so-called) Headless
-          module (in <filename>alternates/headless</filename>) . The idea of
-          these utilities is to wrap your domain objects in proxies that apply
-          the same rules as an <emphasis>Apache Isis</emphasis> viewer. For
-          example, if you try to change a property or invoke an action that is
-          disabled, then the proxy will throw an exception. You write your
-          test to pass if the exception is thrown, and failed otherwise (eg
-          using <code>@Test(expected=DisabledException.class)</code>).</para>
-        </sect2>
-      </sect1>
-
-      <sect1>
-        <title>A Domain Library</title>
-
-        <para>The idea behind the <filename>domain</filename> module is to
-        provide some off-the-shelf code for you to use and adapt in your own
-        applications. This code is fully tested (comes with tests), and is
-        intended to be well-designed. Using code from the library should give
-        you a kick-start in writing your own domain applications.</para>
-
-        <note>
-          <para>The library is currently very modest, but we hope it might
-          build up in time.</para>
-        </note>
-
-        <para>Of course, there's a limit to the complexity of the code that's
-        included in the library, because every domain is different. But having
-        a full set of tests should allow you to safely refactor the code to
-        your own requirements.</para>
-
-        <para>There's also no guarantee that the library will contain code for
-        your specific requirement. But if you do write some domain logic that
-        you think might be reusable by others, why not consider donating it
-        back to Isis when you've done so?</para>
-
-        <para>The domain library breaks out into three: services, entities and
-        values.</para>
-
-        <sect2>
-          <title>Domain Services</title>
-
-          <para><emphasis>Apache Isis</emphasis> applications use
-          <emphasis>domain service</emphasis>s (a domain-driven design
-          pattern) to allow objects to interact with other domains (or
-          <emphasis>bounded context</emphasis>s, to use the correct term).
-          These domain services are automatically injected into each domain
-          object as it is instantiated.</para>
-
-          <para>Domain services split into two: those that interact with
-          technical domains (such as sending email, or rendering
-          <acronym>PDF</acronym>s), and those that interact with business
-          domains (such as general ledger, <acronym>CRM</acronym>s or legacy
-          systems).</para>
-
-          <para>Obviously domain services that bridge to business domain
-          services are always likely to be specific to each individual
-          application. So the services in the
-          <filename>domain/services</filename> module focus on providing
-          off-the-shelf implementations for some of the more common
-          <emphasis>technical</emphasis> domain services.</para>
-        </sect2>
-
-        <sect2>
-          <title>Domain Values</title>
-
-          <para></para>
-
-          <note>
-            <para>TODO</para>
-          </note>
-        </sect2>
-
-        <sect2>
-          <title>Domain Entities</title>
-
-          <para></para>
-
-          <note>
-            <para>TODO</para>
-          </note>
-        </sect2>
-      </sect1>
-
-      <sect1>
-        <title>Object Stores</title>
-
-        <para>Although you can go a long way in developing your application
-        using only fixtures and the in-memory object store, eventually you
-        will need to integrate with a "real" object store that persists object
-        to some sort of serialized store.</para>
-
-        <para>There are several object stores to choose from. Some are easy to
-        configure, some more complex; some are only suitable for single-user
-        apps, others for multi-users. Each of the object stores has its own
-        documentation, so you can select the correct object store to
-        choose:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>the <acronym>XML</acronym> object store (in
-            <filename>alternates/objectstores/xml</filename>) is designed for
-            single-user systems, and persists to its own internal
-            (proprietary) <acronym>XML</acronym> format;</para>
-          </listitem>
-
-          <listitem>
-            <para>the Berkeley object store (in
-            <filename>alternates/objectstores/berkeley</filename>) is a
-            multi-user object store, persists using <ulink
-            url="http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html">Berkeley
-            DB</ulink>;</para>
-          </listitem>
-
-          <listitem>
-            <para>the <acronym>SQL</acronym> object store (in
-            <filename>alternates/objectstores/sql</filename>) is a multi-user
-            object store that persists to an <acronym>RDBMS</acronym> (direct
-            over <acronym>JDBC</acronym>);</para>
-          </listitem>
-
-          <listitem>
-            <para>the <acronym>JPA</acronym> object store (in
-            <filename>alternates/objectstores/</filename>jpa) is a multi-user
-            object store, persists to an <acronym>RDBMS</acronym> (using a
-            <acronym>JPA</acronym> provider for the heavy lifting);</para>
-          </listitem>
-
-          <listitem>
-            <para>the <acronym>CouchDB</acronym> object store (in
-            <filename>alternates/objectstores/</filename>couchdb) is a
-            multi-user object store that persists to <ulink
-            url="http://couchdb.apache.org">CouchDB</ulink>.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>At the time of writing some of these object stores were still
-        alpha/beta; check the documentation for each of the above object
-        stores to confirm their exact status.</para>
-
-        <para>You'll also find coverage of the object store
-        <acronym>API</acronym> itself in this document, see <xref
-        linkend="chp.ObjectStoreApi" />. Most users of the framework are
-        unlikely to write their own object store, of course, though we hope
-        that over time new implementations will be written by the
-        community.</para>
-      </sect1>
-
-      <sect1 id="sec.Viewers">
-        <title>Viewers</title>
-
-        <para>In the same way that object stores provide pluggability for the
-        "back-end", <emphasis>Apache Isis</emphasis> also offers pluggability
-        on the front-end too.</para>
-
-        <para>We already noted that there are two main viewers, the
-        <acronym>DnD</acronym> viewer and the <acronym>HTML</acronym> viewer
-        (configured by the application archetype, see <xref
-        linkend="sec.ApplicationArchetypes" />). In addition, there are a
-        number of other viewers. Here's the full list:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>The <acronym>DnD</acronym> viewer (in
-            <filename>alternates/viewers/dnd</filename>) is one of the two
-            main viewers setup by the application archetype, and is currently
-            the only viewer designed to run client-side (ie not as a
-            webapp).</para>
-
-            <para>Out-of-the-box it provides a generic view of all domain
-            objects, but provides its own API to allow more sophisticated
-            views to be constructed.</para>
-          </listitem>
-
-          <listitem>
-            <para>The <acronym>HTML</acronym> viewer (in
-            <filename>alternates/viewers/html</filename>) is the second of the
-            two main viewers setup by the application archetype, running as a
-            webapp.</para>
-
-            <para>Other than tweaking <acronym>CSS</acronym>, the views that
-            it provides of objects cannot be customized.</para>
-          </listitem>
-
-          <listitem>
-            <para>Scimpi (in <filename>alternates/viewers/scimpi</filename>)
-            allows your application to be deployed as a webapp.</para>
-
-            <para>Out-of-the-box you get a generic view (very similar to that
-            provided by HTML viewer); you can then customize the view by
-            providing custom pages that use Scimpi tags.</para>
-          </listitem>
-
-          <listitem>
-            <para>The Wicket viewer (in
-            <filename>alternates/viewers/wicket</filename>) uses <ulink
-            url="http://wicket.apache.org">Apache Wicket</ulink> to render
-            generic views of your domain objects in a webapp.</para>
-
-            <para>Like Scimpi, it allows these views to be customized, this
-            time by leveraging the Wicket <classname>Component</classname>
-            <acronym>API</acronym>.</para>
-          </listitem>
-
-          <listitem>
-            <para>The RESTful viewer (in
-            <filename>alternates/viewers/restful</filename>) is designed to
-            expose your domain objects through a <ulink
-            url="http://en.wikipedia.org/wiki/Representational_State_Transfer">RESTful</ulink>
-            interface.</para>
-
-            <para>The intention is to allow programmatic access to your domain
-            objects from other (perhaps non-Java) clients. The viewer does
-            also render as <acronym>XHTML</acronym> for debugging
-            purposes.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>If deploying with the <acronym>DnD</acronym> viewer you also
-        need to decide whether to deploy standalone (ie, each user has their
-        own private object store) or in client/server mode (so all users share
-        a server-based object store). If the latter case then you will need to
-        set up remoting (see <xref linkend="sec.Remoting" />).</para>
-      </sect1>
-
-      <sect1 id="sec.Remoting">
-        <title>Remoting</title>
-
-        <para>If deploying the <acronym>DnD</acronym> viewer in client/server
-        mode then you will need to set up remoting. The main consideration is
-        what transport to use:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>sockets</para>
-
-            <para>In this configuration both client and server run as
-            command-line programs. No plugins are needed, this is the
-            default;</para>
-          </listitem>
-
-          <listitem>
-            <para>http</para>
-
-            <para>In this configuration the server runs as a webapp with a
-            servlet used to listen for client-side requests. The client,
-            meanwhile, is configured to send its requests via
-            <acronym>HTTP</acronym>.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>In addition, you can choose the marshalling mechanism by which
-        objects are serialized across the wire to be varied. There are
-        (again), two options:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>encoding/serialization</para>
-
-            <para>In this configuration <emphasis>Apache Isis</emphasis>
-            encodes/serializes all objects into a succession of bytestreams.
-            This is the default</para>
-          </listitem>
-
-          <listitem>
-            <para>xstream</para>
-
-            <para>In this configuration the <ulink
-            url="http://xstream.codehaus.org">Xstream</ulink> library is used
-            to serialize objects</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>You'll find further coverage of the remoting APIs in <xref
-        linkend="chp.RemotingApi" />. Detailed documentation of the
-        <acronym>http</acronym> transport implementation in the HTTP Remoting
-        module (in <filename>alternates/http-remoting</filename>) module, and
-        documentation for the xstream implementation is in the XStream
-        Marshalling module (in
-        <filename>alternates/xstream-marshalling</filename>).</para>
-
-        <para>There's also further coverage of deploying applications in
-        client/server mode in <xref
-        linkend="chp.DeployingIsisApplications" />.</para>
-      </sect1>
-
-      <sect1>
-        <title>Authentication and Authorization</title>
-
-        <para><emphasis>Apache Isis</emphasis> provides an
-        <acronym>API</acronym>s for both authentication and authorization, see
-        <xref linkend="chp.SecurityApi" />.</para>
-
-        <para>The core implementation of these <acronym>API</acronym>s are
-        very basic file-based authentication and authorization mechanisms, the
-        configuration of which is described in <xref
-        linkend="chp.SecurityApi" />. These default mechanisms are suitable
-        for simple applications, but are unlikely to meet the security
-        requirements of larger enterprises.</para>
-
-        <para>As an alternative, you can use implementations that integrate
-        with <acronym>LDAP</acronym> (in
-        <filename>alternates/ldap-auth</filename>) module, or consider writing
-        your own.</para>
-      </sect1>
-
-      <sect1 id="sec.DeployingAnIsisApplication">
-        <title>Deploying an Isis Application</title>
-
-        <para>Deploying your application depends on whether it is a webapp,
-        client/server (DnD) or standalone (DnD). With the current set of
-        deployment options it is likely to be one of:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>standalone client running with DnD viewer and a local object
-            store</para>
-          </listitem>
-
-          <listitem>
-            <para>client/server over sockets</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>client running DnD viewer, sockets connection</para>
-              </listitem>
-
-              <listitem>
-                <para>server running as a standalone app, listening on
-                sockets</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-
-          <listitem>
-            <para>client/server over HTTP</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>client running DnD viewer, HTTP requests</para>
-              </listitem>
-
-              <listitem>
-                <para>server running as a webapp, with HTTP servlet listening
-                for requests</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-
-          <listitem>
-            <para>webapp, meaning any of:</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>HTML viewer</para>
-              </listitem>
-
-              <listitem>
-                <para>Scimpi</para>
-              </listitem>
-
-              <listitem>
-                <para>Wicket</para>
-              </listitem>
-
-              <listitem>
-                <para>RESTful</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-
-        <para>Indeed, it's theoretically possible to combine the various
-        webapp viewers; for example the server-side HTTP, Scimpi and RESTful
-        might all be colocated.</para>
-
-        <para>In all cases you're likely to want to enable authentication and
-        authorization; the exact configuration to use here will depend both on
-        the implementation chosen (file-based, LDAP or some other) and whether
-        running in client/server mode or not.</para>
-
-        <para>The main coverage of the topic of deployment options (which
-        repeats some of the above) can be found in this document, in <xref
-        linkend="chp.DeployingIsisApplications" />.</para>
-      </sect1>
-
-      <sect1>
-        <title>Other Features</title>
-
-        <para></para>
-
-        <para></para>
-
-        <note>
-          <para>TODO: discuss other features, x-ref elsewhere in this
-          doc</para>
-        </note>
-
-        <para></para>
-
-        <sect2 id="sec.BytecodeProviders">
-          <title>Lazy Loading / Dirty Tracking</title>
-
-          <para></para>
-
-          <para></para>
-        </sect2>
-
-        <sect2>
-          <title>Extending the Isis Meta Model</title>
-
-          <para></para>
-        </sect2>
-
-        <sect2 id="sec.Headless">
-          <title>Using the Headless Viewer</title>
-
-          <para></para>
-        </sect2>
-
-        <sect2 id="sec.OtherLanguages">
-          <title>Other Languages</title>
-
-          <para></para>
-        </sect2>
+        <para><emphasis>*** yada yada</emphasis></para>
       </sect1>
     </chapter>
 
@@ -1115,8 +242,8 @@
       {{{../core/metamodel/index.html}metamodel}} module, along with
       implementations to support the Java language. The
       {{{http://groovyobjects.sourceforge.net}Groovy Objects}} sister project
-      provides implementations to allow [[NAME]] to support domain
-      objects written in {{{http://groovy.codehaus.org}Groovy}}.</para>
+      provides implementations to allow [[NAME]] to support domain objects
+      written in {{{http://groovy.codehaus.org}Groovy}}.</para>
 
       <para></para>
 
@@ -1197,13 +324,12 @@
 
           <para></para>
 
-          <para>[[NAME]] also allows you to develop your domain
-          application in Groovy. This support should be considered
-          experimental for the moment; although the viewers and
-          fixtures/in-memory object store work fine, it has not been fully
-          tested out with other object stores. Further details are available
-          in the {{{./support/languages/groovy/index.html}groovy}}
-          module.</para>
+          <para>[[NAME]] also allows you to develop your domain application in
+          Groovy. This support should be considered experimental for the
+          moment; although the viewers and fixtures/in-memory object store
+          work fine, it has not been fully tested out with other object
+          stores. Further details are available in the
+          {{{./support/languages/groovy/index.html}groovy}} module.</para>
 
           <para></para>
 
@@ -1347,8 +473,8 @@
 
       <para></para>
 
-      <para>[[NAME]] normally performs lazy loading of references and
-      dirty tracking by proxying all domain objects. Two implementations are
+      <para>[[NAME]] normally performs lazy loading of references and dirty
+      tracking by proxying all domain objects. Two implementations are
       provided, using either cglib or javassist. The application archetype
       automatically configures the use of these proxies. However, some object
       stores (notably, the {{{./plugins/jpa-persistor/index.html}JPA object

Modified: incubator/isis/trunk/core/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/site/apt/index.apt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/src/site/apt/index.apt Fri Oct 22 14:51:42 2010
@@ -19,13 +19,32 @@
 
 Core Framework
  
- The <core> module is the parent of a set of submodules that collectively form the core of [[NAME]].
- Specifically, they provide:
+  The <core> module is the parent of a set of submodules that collectively form the core of Apache Isis.
+  Specifically, they provide:
  
- * metamodel
- 
- * runtime instance management
- 
- * persistence of domain objects (delegates to an object store implementation)
+  * metamodel
+
+  * reusable programming model elements
+
+  * runtime instance management
+  
+  * bootstrapping/deployment support for commandline or webapp
+  
+  * JUnit/JMock testing support
+
+  []
+  
+  Across these modules a number of APIs are defined:  
+  
+  * persistence (object store API)
+   
+  * bytecode enhancement
+   
+  * security (authentication and authorization)
+   
+  * programming model definition
+   
+  []
+
  
  []
\ No newline at end of file

Modified: incubator/isis/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/site/site.xml (original)
+++ incubator/isis/trunk/core/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,10 +6,15 @@
 			<item name="Core" />
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+        
 		<menu name="Core Framework">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
+        <menu ref="modules"/>
+        
 		<menu name="Documentation">
 			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
 			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />

Modified: incubator/isis/trunk/core/testsupport/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/site/site.xml (original)
+++ incubator/isis/trunk/core/testsupport/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="Test Support"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+        
 		<menu name="Test Support">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 		
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/core/webapp/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/site/site.xml (original)
+++ incubator/isis/trunk/core/webapp/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="WebApp Support"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="WebApp Support">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/core/webserver/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/site/site.xml (original)
+++ incubator/isis/trunk/core/webserver/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="WebServer" href="index.html" />
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="WebServer Bootstrapping">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/defaults/bytecode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/pom.xml (original)
+++ incubator/isis/trunk/defaults/bytecode/pom.xml Fri Oct 22 14:51:42 2010
@@ -14,7 +14,7 @@
 	<properties>
         <siteBaseDir>../..</siteBaseDir>
 	</properties>
-	
+
     <reporting>
         <plugins>
             <plugin>

Modified: incubator/isis/trunk/defaults/bytecode/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/bytecode/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="Bytecode" href="index.html" />
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Default ByteCode">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/defaults/objectstore/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/objectstore/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,10 +6,13 @@
 			<item name="Default ObjectStore"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Default ObjectStore">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
-
+        
 		<menu name="Maven Reports" ref="reports"/>
 	</body>
 </project>

Modified: incubator/isis/trunk/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/pom.xml (original)
+++ incubator/isis/trunk/defaults/pom.xml Fri Oct 22 14:51:42 2010
@@ -21,7 +21,8 @@
     <properties>
         <siteBaseDir>..</siteBaseDir>
 
-        <docbkxGuideTitle>Apache Isis Default Implementations</docbkxGuideTitle>
+        <docbkxGuideTitle>Apache Isis Defaults</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Default Implementations of Core APIs</docbkxGuideSubTitle>
         <docbkxGuideName>isis-defaults</docbkxGuideName>
     </properties>
 

Modified: incubator/isis/trunk/defaults/progmodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/progmodel/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="Default ProgModel"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Default ProgModel">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/defaults/security/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/security/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,8 +6,11 @@
 			<item name="Default Security" />
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+
 		<menu name="Default Security">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
 		<menu name="Maven Reports" ref="reports"/>

Modified: incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml (original)
+++ incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml Fri Oct 22 14:51:42 2010
@@ -23,9 +23,7 @@
 <book>
   <bookinfo>
     <title><?eval ${docbkxGuideTitle}?></title>
-
-    <subtitle>Developers Guide</subtitle>
-
+    <subtitle><?eval ${docbkxGuideSubTitle}?></subtitle>
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 
     <authorgroup>

Modified: incubator/isis/trunk/defaults/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/src/site/site.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/src/site/site.xml Fri Oct 22 14:51:42 2010
@@ -6,10 +6,15 @@
 			<item name="Defaults"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+        
 		<menu name="Default Implementations">
 			<item name="About" href="index.html" />
+            <item name="Jottings" href="jottings.html" />
 		</menu>
 
+        <menu ref="modules"/>
+
 		<menu name="Documentation">
 			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
 			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />

Modified: incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml Fri Oct 22 14:51:42 2010
@@ -3,7 +3,7 @@
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
-    <display-name>[[NAME]] HTML Viewer</display-name>
+    <display-name>Apache Isis HTML Viewer</display-name>
 
 	<filter>
 		<filter-name>IsisSessionFilter</filter-name>

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/commandline/eclipse-launch/NO-DnD.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/commandline/eclipse-launch/NO-DnD.launch?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/commandline/eclipse-launch/NO-DnD.launch (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/commandline/eclipse-launch/NO-DnD.launch Fri Oct 22 14:51:42 2010
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/claims-commandline/eclipse-launc"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/claims-commandline"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.runtime.Isis"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.extensions.groovy-testapp-claims-commandline"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/claims-commandline/eclipse-launc"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/claims-commandline"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.runtime.Isis"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.extensions.groovy-testapp-claims-commandline"/>
+</launchConfiguration>

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/commandline/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/commandline/pom.xml Fri Oct 22 14:51:42 2010
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>groovy-testapp-claims</artifactId>
+		<groupId>org.apache.isis.examples.apps</groupId>
+		<artifactId>groovy-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>groovy-testapp-claims-commandline</artifactId>
+	<artifactId>groovy-claims-commandline</artifactId>
 	<name>Groovy Support TestApp: Claims Commandline</name>
 
 	<properties>
@@ -20,57 +20,42 @@
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>groovy-testapp-claims-fixture</artifactId>
+			<artifactId>groovy-claims-fixture</artifactId>
 		</dependency>
 
 		<!-- Groovy Support -->
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.alternatives.progmodel</groupId>
 			<artifactId>groovy-metamodel</artifactId>
 		</dependency>
 		
 		<!-- apache isis -->
-	    <dependency>
-			<groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-cglib</artifactId>
-	    </dependency>
-	    <dependency>
-			<groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-javassist</artifactId>
-	    </dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>remoting</artifactId>
-		</dependency>
         <dependency>
 			<groupId>org.apache.isis.core</groupId>
             <artifactId>webserver</artifactId>
         </dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>dnd-viewer</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>html-viewer</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>dnd</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-client</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-server</artifactId>
-		</dependency>
-	    <dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-	        <artifactId>headless-embedded</artifactId>
-	    </dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>xml-persistor</artifactId>
+			<groupId>org.apache.isis.alternatives.objectstore</groupId>
+			<artifactId>xml</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.isis.defaults</groupId>
+            <artifactId>bytecode</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.alternatives.bytecode</groupId>
+            <artifactId>javassist</artifactId>
+        </dependency>
+
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/dom/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/dom/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/dom/pom.xml Fri Oct 22 14:51:42 2010
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-        <artifactId>groovy-testapp-claims</artifactId>
+		<groupId>org.apache.isis.examples.apps</groupId>
+        <artifactId>groovy-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>groovy-testapp-claims-dom</artifactId>
+	<artifactId>groovy-claims-dom</artifactId>
 	<name>Groovy Support TestApp: Claims DOM</name>
 
     <build>
@@ -23,7 +23,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.alternatives.progmodel</groupId>
 			<artifactId>groovy-applib</artifactId>
 		</dependency>
 		

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/fixture/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/fixture/pom.xml Fri Oct 22 14:51:42 2010
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-	    <artifactId>groovy-testapp-claims</artifactId>
+		<groupId>org.apache.isis.examples.apps</groupId>
+	    <artifactId>groovy-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>groovy-testapp-claims-fixture</artifactId>
+	<artifactId>groovy-claims-fixture</artifactId>
 	<name>Groovy Support TestApp: Claims Fxtures</name>
 
     <build>
@@ -22,13 +22,13 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.alternatives.progmodel</groupId>
 			<artifactId>groovy-applib</artifactId>
 		</dependency>
 		
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>groovy-testapp-claims-service</artifactId>
+			<artifactId>groovy-claims-service</artifactId>
 		</dependency>
 	</dependencies>
 

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/pom.xml Fri Oct 22 14:51:42 2010
@@ -9,8 +9,8 @@
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.apache.isis.extensions</groupId>
-	<artifactId>groovy-testapp-claims</artifactId>
+	<groupId>org.apache.isis.examples.apps</groupId>
+	<artifactId>groovy-claims</artifactId>
 	<version>0.1-SNAPSHOT</version>
 	
 	<name>Groovy Support TestApp: Claims</name>
@@ -110,44 +110,44 @@
 			<!-- this project's own modules -->
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>groovy-testapp-claims-dom</artifactId>
+				<artifactId>groovy-claims-dom</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>groovy-testapp-claims-fixture</artifactId>
+				<artifactId>groovy-claims-fixture</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>groovy-testapp-claims-service</artifactId>
+				<artifactId>groovy-claims-service</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>groovy-testapp-claims-commandline</artifactId>
+				<artifactId>groovy-claims-commandline</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>groovy-testapp-claims-webapp</artifactId>
+				<artifactId>groovy-claims-webapp</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 
 			<!-- Groovy Support -->
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.alternatives.progmodel</groupId>
 				<artifactId>groovy-applib</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.alternatives.progmodel</groupId>
 				<artifactId>groovy-metamodel</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/service/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/service/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/service/pom.xml Fri Oct 22 14:51:42 2010
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>groovy-testapp-claims</artifactId>
+		<groupId>org.apache.isis.examples.apps</groupId>
+		<artifactId>groovy-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>groovy-testapp-claims-service</artifactId>
+	<artifactId>groovy-claims-service</artifactId>
 	<name>Groovy Support TestApp: Claims Services</name>
 
 	<build>
@@ -24,14 +24,14 @@
 
 	<dependencies>
 		<dependency>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.alternatives.progmodel</groupId>
 			<artifactId>groovy-applib</artifactId>
 		</dependency>
 
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>groovy-testapp-claims-dom</artifactId>
+			<artifactId>groovy-claims-dom</artifactId>
 		</dependency>
 	</dependencies>
 

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/webapp/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/webapp/pom.xml Fri Oct 22 14:51:42 2010
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>groovy-testapp-claims</artifactId>
+		<groupId>org.apache.isis.examples.apps</groupId>
+		<artifactId>groovy-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>groovy-testapp-claims-webapp</artifactId>
+	<artifactId>groovy-claims-webapp</artifactId>
 	<name>Groovy Support TestApp: Claims WebApp</name>
 
 	<packaging>war</packaging>
@@ -28,38 +28,26 @@
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>groovy-testapp-claims-fixture</artifactId>
+			<artifactId>groovy-claims-fixture</artifactId>
 		</dependency>
 
 		<!-- apache isis -->
 
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>bytecode-cglib</artifactId>
+			<groupId>org.apache.isis.defaults</groupId>
+			<artifactId>bytecode</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>bytecode-javassist</artifactId>
+			<groupId>org.apache.isis.alternatives.bytecode</groupId>
+			<artifactId>javassist</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>remoting</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>html-viewer</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>headless-embedded</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>xml-persistor</artifactId>
+			<groupId>org.apache.isis.alternatives.objectstore</groupId>
+			<artifactId>xml</artifactId>
 		</dependency>
 		<!-- comment in to run simple web server (uses Jetty) <dependency> <groupId>org.nakedobjects.core</groupId> 
 			<artifactId>webserver</artifactId> </dependency> -->

Modified: incubator/isis/trunk/examples/restful-testapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/pom.xml Fri Oct 22 14:51:42 2010
@@ -36,36 +36,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.2</version>
-				<configuration>
-					<excludes>
-						<exclude>**/Test*.java</exclude>
-					</excludes>
-					<useFile>true</useFile>
-					<printSummary>false</printSummary>
-					<outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/Test*.java</exclude>
-					</excludes>
-					<showSuccess>false</showSuccess>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>test</phase>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 

Modified: incubator/isis/trunk/examples/shopping-cart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/shopping-cart/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/shopping-cart/pom.xml (original)
+++ incubator/isis/trunk/examples/shopping-cart/pom.xml Fri Oct 22 14:51:42 2010
@@ -165,7 +165,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
 					<aggregate>true</aggregate>
-					<doctitle>[[NAME]] Application</doctitle>
+					<doctitle>Apache Isis Application</doctitle>
 					<splitindex>false</splitindex>
 				</configuration>
 			</plugin>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-DnD.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-DnD.launch?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-DnD.launch (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-DnD.launch Fri Oct 22 14:51:42 2010
@@ -9,6 +9,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.runtime.Isis"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.extensions.wicket-testapp-claims-commandline"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.examples.apps.wicket-claims-commandline"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-WebServer.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-WebServer.launch?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-WebServer.launch (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/commandline/eclipse-launch/claims-NO-WebServer.launch Fri Oct 22 14:51:42 2010
@@ -8,6 +8,6 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.webserver.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.extensions.wicket-testapp-claims-commandline"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.examples.apps.wicket-claims-commandline"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Fri Oct 22 14:51:42 2010
@@ -55,8 +55,9 @@
         <url>http://svn.apache.org/repos/asf/incubator/isis/trunk</url>
     </scm>
 
-    <!-- used in Site generation for relative references -->
-    <url>http://incubator.apache.org/isis</url>
+    <!-- used in Site generation for relative references.
+    -->
+    <url>http://incubator.apache.org/isis/</url>
 
     <properties>
         <compileSource>1.6</compileSource>
@@ -68,6 +69,7 @@
 
         <!-- used by docbkx-maven-plugin for DocBook guide; override as required -->
         <docbkxGuideTitle>Apache Isis</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Apache Isis</docbkxGuideSubTitle>
         <docbkxGuideName>apache-isis</docbkxGuideName>
 
         <!-- used by maven-pdf-plugin for site PDFs; override as required -->
@@ -79,8 +81,8 @@
 
         <!-- should not need to be modified -->
         <trunkBaseDir>${project.build.directory}/${siteBaseDir}/..</trunkBaseDir>
-        <checkstyle.configLocation>${trunkBaseDir}/src/main/checkstyle/checkstyle.xml</checkstyle.configLocation>
-        <pmd.ruleset>${trunkBaseDir}/src/main/pmd/pmd.xml</pmd.ruleset>
+        <checkstyle.configLocation>${trunkBaseDir}/src/site/resources/codequality/checkstyle.xml</checkstyle.configLocation>
+        <pmd.ruleset>${trunkBaseDir}/src/site/resources/codequality/pmd.xml</pmd.ruleset>
 
         <projectUrl>${project.url}</projectUrl>
     </properties>
@@ -1287,6 +1289,13 @@
                 <module>support</module>
             </modules>
         </profile>
+        <profile>
+            <id>scratch</id>
+            <modules>
+                <module>applib</module>
+                <module>defaults</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>

Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Fri Oct 22 14:51:42 2010
@@ -40,14 +40,12 @@
         <!-- used for javassist, identity -->
         <isis.alternatives-bytecode.version>0.1-SNAPSHOT</isis.alternatives-bytecode.version>
 
+        <isis.alternatives-progmodel-groovy.version>0.1-SNAPSHOT</isis.alternatives-progmodel-groovy.version>
         <isis.alternatives-progmodel-headless.version>0.1-SNAPSHOT</isis.alternatives-progmodel-headless.version>
 
         <!-- used for common, transport-sockets, marshalling-encoding, marshalling-serialize -->
         <isis.alternatives-remoting.version>0.1-SNAPSHOT</isis.alternatives-remoting.version>
 
-        <isis.alternatives-remoting-transport-http.version>0.1-SNAPSHOT</isis.alternatives-remoting-transport-http.version>
-        <isis.alternatives-remoting-marshalling-xstream.version>0.1-SNAPSHOT</isis.alternatives-remoting-marshalling-xstream.version>
-
         <isis.alternatives-security-ldap.version>0.1-SNAPSHOT</isis.alternatives-security-ldap.version>
         <isis.alternatives-security-file.version>0.1-SNAPSHOT</isis.alternatives-security-file.version>
     </properties>
@@ -117,7 +115,6 @@
                 <version>${isis.version}</version>
             </dependency>
 
-
             <!-- viewer: dnd -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
@@ -205,7 +202,6 @@
                 <version>${isis.viewer-restful.version}</version>
             </dependency>
 
-
             <!-- alternatives: bytecode -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.bytecode</groupId>
@@ -218,37 +214,69 @@
                 <version>${isis.alternatives-bytecode.version}</version>
             </dependency>
 
-
-            <!-- alternatives: security -->
+            <!-- alternatives: security: ldap -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.security</groupId>
                 <artifactId>ldap</artifactId>
                 <version>${isis.alternatives-security-ldap.version}</version>
             </dependency>
+
+            <!-- alternatives: security: ldap -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.security</groupId>
                 <artifactId>file</artifactId>
                 <version>${isis.alternatives-security-file.version}</version>
             </dependency>
 
-
-            <!-- alternatives: objectstores -->
+            <!-- alternatives: objectstore: xml -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.objectstore</groupId>
                 <artifactId>xml</artifactId>
                 <version>${isis.alternatives-objectstore-xml.version}</version>
             </dependency>
+
+            <!-- alternatives: objectstore: nosql -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.objectstore</groupId>
                 <artifactId>nosql</artifactId>
                 <version>${isis.alternatives-objectstore-nosql.version}</version>
             </dependency>
+
+            <!-- alternatives: objectstore: sql -->
             <dependency>
                 <groupId>org.apache.isis.alternatives.objectstore</groupId>
                 <artifactId>sql</artifactId>
                 <version>${isis.alternatives-objectstore-sql.version}</version>
             </dependency>
 
+            <!-- alternatives: progmodel: headless -->
+            <dependency>
+                <groupId>org.apache.isis.alternatives.progmodel</groupId>
+                <artifactId>headless</artifactId>
+                <version>${isis.alternatives-progmodel-headless.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.alternatives.progmodel</groupId>
+                <artifactId>headless-applib</artifactId>
+                <version>${isis.alternatives-progmodel-headless.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.alternatives.progmodel</groupId>
+                <artifactId>headless-embedded</artifactId>
+                <version>${isis.alternatives-progmodel-headless.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.alternatives.progmodel</groupId>
+                <artifactId>headless-viewer</artifactId>
+                <version>${isis.alternatives-progmodel-headless.version}</version>
+            </dependency>
+
+            <!-- alternatives: progmodel: groovy -->
+            <dependency>
+                <groupId>org.apache.isis.alternatives.progmodel</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${isis.alternatives-progmodel-groovy.version}</version>
+            </dependency>
 
             <!-- alternatives: remoting -->
             <dependency>
@@ -293,29 +321,6 @@
                 <artifactId>marshalling-xstream</artifactId>
                 <version>${isis.alternatives-remoting-marshalling-xstream.version}</version>
             </dependency>
-
-
-            <!-- alternatives: progmodel -->
-            <dependency>
-                <groupId>org.apache.isis.alternatives.progmodel</groupId>
-                <artifactId>headless</artifactId>
-                <version>${isis.alternatives-progmodel-headless.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.alternatives.progmodel</groupId>
-                <artifactId>headless-applib</artifactId>
-                <version>${isis.alternatives-progmodel-headless.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.alternatives.progmodel</groupId>
-                <artifactId>headless-embedded</artifactId>
-                <version>${isis.alternatives-progmodel-headless.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.alternatives.progmodel</groupId>
-                <artifactId>headless-viewer</artifactId>
-                <version>${isis.alternatives-progmodel-headless.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: incubator/isis/trunk/site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/META-INF/maven/site.vm?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ incubator/isis/trunk/site-skin/src/main/resources/META-INF/maven/site.vm Fri Oct 22 14:51:42 2010
@@ -468,8 +468,7 @@
   <body class="composite">
     <div id="wrapper">
       <div id="banner">
-        <a href="http://incubator.apache.org/isis" id="bannerLeft">&nbsp;</a>
-        <a href="http://incubator.apache.org" id="bannerRight">&nbsp;</a>
+        <a href="http://incubator.apache.org/isis" id="bannerFull">&nbsp;</a>
         <div class="clear">
           <hr/>
         </div>

Modified: incubator/isis/trunk/site-skin/src/main/resources/css/site.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/css/site.css?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/site-skin/src/main/resources/css/site.css (original)
+++ incubator/isis/trunk/site-skin/src/main/resources/css/site.css Fri Oct 22 14:51:42 2010
@@ -1,10 +1,11 @@
 body {
-  background: AntiqueWhite;
+  background: #4A6074;
   text-align: center;
 }
 #wrapper {
-  width: 1024px;
-  margin: 0 auto;
+  width: 980px;
+  border:3px solid white;
+  margin:8px auto;
   text-align: left;
   background: white;
 }
@@ -17,19 +18,28 @@ body {
 	text-align: right;
 }
 
+#bannerFull {
+  background: url(../images/logos/banner.png) left top no-repeat;
+  height: 100px;
+  width: 980px;
+  float: left;
+}
+
+/*
 #bannerLeft {
   background: url(../images/logos/banner-left.png) left top no-repeat;
-  height: 85px;
+  height: 100px;
   width: 627px;
   float: left;
 }
 
 #bannerRight {
-  background: url(../images/logos/apache-incubator-logo.png) right top no-repeat;
-  height: 85px;
+  background: url(../images/logos/apache-incubator-logo.png) right center no-repeat;
+  height: 100px;
   width: 240px;
   float: right;
 }
+*/
 
 img.wrap-left {
     float: left;

Modified: incubator/isis/trunk/site-skin/src/main/resources/images/logos/apache-incubator-logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/images/logos/apache-incubator-logo.png?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-big.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-big.pdn?rev=1026350&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-big.pdn
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-normal.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-normal.pdn?rev=1026350&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner-normal.pdn
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner.png?rev=1026350&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/site-skin/src/main/resources/images/logos/banner.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/isis/trunk/site-skin/src/main/resources/images/logos/isis-logo.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/images/logos/isis-logo.pdn?rev=1026350&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/site-skin/src/main/resources/images/logos/isis-logo.pdn
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/isis/trunk/site-skin/src/main/resources/resources.txt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/resources.txt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/site-skin/src/main/resources/resources.txt (original)
+++ incubator/isis/trunk/site-skin/src/main/resources/resources.txt Fri Oct 22 14:51:42 2010
@@ -3,5 +3,7 @@ images/collapsed.gif
 images/logos/maven-feather.png
 images/logos/build-by-maven-white.png
 images/logos/build-by-maven-black.png
+images/logos/apache-incubator-logo.png
+images/logos/banner.png
 css/maven-base.css
 css/print.css

Modified: incubator/isis/trunk/src/site/apt/contributors-building.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/contributors-building.apt?rev=1026350&r1=1026349&r2=1026350&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/contributors-building.apt (original)
+++ incubator/isis/trunk/src/site/apt/contributors-building.apt Fri Oct 22 14:51:42 2010
@@ -17,37 +17,33 @@
 
 
 
-Building [[NAME]]
+Building Isis
 
- [[NAME]] is built using Maven; generally we develop with Eclipse with the m2eclipse plugin.
+ Isis is built using Maven; generally we develop with Eclipse with the m2eclipse plugin.
  
 Prerequisites
 
- Install {{{http://maven.apache.org}Maven}} 2.x (2.0.9 or later should be fine; we haven't yet tried building with Maven 3).
+ Install {{{http://maven.apache.org}Maven}} 3.0.
  
-Build the "Corporate" POM
+ 
+Build the Code Base
 
- Like many Maven-based apps, the Maven modules have a "corporate" super-POM.  This should be built first:
+ Next, you can build trunk.  This will recursively the entire tree.  If it's the first time you're running this, then it'll take some time downloading prerequisites... 
+ a good time to go grab a coffee.
  
 +----------------------------------------------------+
-cd pom
-mvn clean install
-cd ..
+mvn clean install -P all
 +----------------------------------------------------+
 
- 
-Build the Trunk
-
- Next, you can build trunk.  This will recursively build all the core, and its plugins.  If it's the first time you're running this, then it'll take some time downloading prerequisites... 
- a good time to go grab a coffee.
- 
+  You can also build the site and documentation using:
+  
 +----------------------------------------------------+
-mvn clean install
+mvn site-deploy -P deploy-local
 +----------------------------------------------------+
 
+  This will deploy the site to <<</tmp/m2-sites/isis>>>, where you can check it out.
+  
+  There are a few other variations and profiles; there's a summary in the <<<isis-parent/pom.xml>>> itself.
 
-What Next?
 
- We recommend you load up one of the example apps (in <<<distribution>>> directory) and get them running against your new snapshot.
- We tend to use Eclipse with the {{{http://m2eclipse.sonatype.org}m2eclipse}} plugin.
  
\ No newline at end of file



Mime
View raw message