Return-Path: 
 <isis-commits-return-543-apmail-incubator-isis-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org
Received: (qmail 25705 invoked from network); 16 Dec 2010 15:34:47 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 16 Dec 2010 15:34:47 -0000
Received: (qmail 34863 invoked by uid 500); 16 Dec 2010 15:34:47 -0000
Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org
Received: (qmail 34840 invoked by uid 500); 16 Dec 2010 15:34:46 -0000
Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:isis-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:isis-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:isis-commits@incubator.apache.org>
List-Id: <isis-commits.incubator.apache.org>
Reply-To: isis-dev@incubator.apache.org
Delivered-To: mailing list isis-commits@incubator.apache.org
Received: (qmail 34833 invoked by uid 99); 16 Dec 2010 15:34:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 15:34:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 15:34:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 452302388A64; Thu, 16 Dec 2010 15:34:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1050009 - in /incubator/isis/trunk/src: docbkx/guide/
 site/
 site/apt/ site/apt/TOREVIEW/
Date: Thu, 16 Dec 2010 15:34:25 -0000
To: isis-commits@incubator.apache.org
From: danhaywood@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101216153425.452302388A64@eris.apache.org>

Author: danhaywood
Date: Thu Dec 16 15:34:24 2010
New Revision: 1050009

URL: http://svn.apache.org/viewvc?rev=1050009&view=rev
Log:
updates to the main site, deleting some defunct pages; minor edit to contributors guide (ISIS-43)

Removed:
    incubator/isis/trunk/src/site/apt/TOREVIEW/contributing.apt
    incubator/isis/trunk/src/site/apt/contributors-building.apt
    incubator/isis/trunk/src/site/apt/contributors-devenv.apt
    incubator/isis/trunk/src/site/apt/contributors-writing-docs.apt
Modified:
    incubator/isis/trunk/src/docbkx/guide/isis-contributors-guide.xml
    incubator/isis/trunk/src/site/apt/TOREVIEW/gotchas.apt
    incubator/isis/trunk/src/site/site.xml

Modified: incubator/isis/trunk/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/docbkx/guide/isis-contributors-guide.xml?rev=1050009&r1=1050008&r2=1050009&view=diff
==============================================================================
--- incubator/isis/trunk/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/src/docbkx/guide/isis-contributors-guide.xml Thu Dec 16 15:34:24 2010
@@ -47,7 +47,7 @@
   <toc></toc>
 
   <preface id="preface">
-    <title>Preface2</title>
+    <title>Preface</title>
 
     <para><emphasis>Apache Isis</emphasis> is designed to allow programmers
     rapidly develop domain-driven applications following the <ulink
@@ -3001,12 +3001,21 @@ sentences in the paragraph to be indente
       <sect1>
         <title>Links and Figures</title>
 
-        <para>To create a hyperlink, use:</para>
+        <para>To create an external link, use:</para>
 
         <screen>  Link to {{http://www.pixware.fr}}.
   or 
   Link to {{{http://www.pixware.fr}Pixware home page}}.</screen>
 
+        <para>To create an internal link (to a page relative to this one),
+        use:</para>
+
+        <screen>  Link to {{{./docbkx/guide/isis-applib.pdf}AppLib Guide (PDF)}}</screen>
+
+        <warning>
+          <para>the "./" is required for internal links.</para>
+        </warning>
+
         <para>To create an anchor, use:</para>
 
         <screen>  {Anchor}. This text is anchored.

Modified: incubator/isis/trunk/src/site/apt/TOREVIEW/gotchas.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/TOREVIEW/gotchas.apt?rev=1050009&r1=1050008&r2=1050009&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/TOREVIEW/gotchas.apt (original)
+++ incubator/isis/trunk/src/site/apt/TOREVIEW/gotchas.apt Thu Dec 16 15:34:24 2010
@@ -19,42 +19,11 @@
 Using switchUser in a Fixture
 
 
-  Beware of when you call <<<switchUser()>>> in a <<<Fixture>>> as it causes the current transaction to be ended and a new one started (for the new user). If you share a reference between the two you will get an exception like this:
+  Beware of when you call <<<switchUser()>>> in a <<<Fixture>>> as it 
+  causes the current transaction to be ended and a new one started (for the 
+  new user). If you share a reference between the two you will get an 
+  exception like this.
 
-+----------
-2010-04-26 21:11:00,091 [FixturesInstallerDelegate main       ERROR]  installing fixture com.mydomain.fixture.PlanFixture failed; aborting 
-java.lang.IllegalStateException: Cannot save an object that is not persistent: PojoAdapter@79f7abae[T~~~:TOID#-7FFFFED7C441852B,specification=Participant,version=null,pojo-toString=com.mydomain.dom.Participant$$EnhancerByCGLIB$$754db115@5006279d,pojo-hash=#5006279d]
-        at org.apache.isis.extensions.xml.objectstore.internal.data.ObjectData.addAssociation(ObjectData.java:107)
-        at org.apache.isis.extensions.xml.objectstore.internal.commands.AbstractXmlPersistenceCommand.saveReference(AbstractXmlPersistenceCommand.java:60)
-        at org.apache.isis.extensions.xml.objectstore.internal.commands.AbstractXmlPersistenceCommand.createObjectData(AbstractXmlPersistenceCommand.java:51)
-        at org.apache.isis.extensions.xml.objectstore.internal.commands.XmlCreateObjectCommand.execute(XmlCreateObjectCommand.java:25)
-        at org.apache.isis.extensions.xml.objectstore.XmlObjectStore.execute(XmlObjectStore.java:263)
-        at org.apache.isis.runtime.persistence.objectstore.transaction.ObjectStoreTransaction.doFlush(ObjectStoreTransaction.java:111)
-        at org.apache.isis.runtime.transaction.[[NAME]]ObjectTransactionAbstract.commit([[NAME]]ObjectTransactionAbstract.java:91)
-        at org.apache.isis.runtime.persistence.objectstore.transaction.ObjectStoreTransactionManager.endTransaction(ObjectStoreTransactionManager.java:84)
-        at org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate.installFixtureInTransaction(FixturesInstallerDelegate.java:158)
-        at org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate.installFixtures(FixturesInstallerDelegate.java:143)
-        at org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate.installFixtures(FixturesInstallerDelegate.java:124)
-        at org.apache.isis.runtime.fixturesinstaller.FixturesInstallerAbstract.installFixtures(FixturesInstallerAbstract.java:19)
-        at org.apache.isis.runtime.system.IsisSystemAbstract.installFixturesIfRequired(IsisSystemAbstract.java:139)
-        at org.apache.isis.runtime.system.IsisSystemAbstract.init(IsisSystemAbstract.java:115)
-        at org.apache.isis.runtime.system.IsisSystemBootstrapper.bootSystem(IsisSystemBootstrapper.java:42)
-        at org.apache.isis.webapp.IsisWebAppBootstrapper.bootstrapIsis(IsisWebAppBootstrapper.java:124)
-        at org.apache.isis.webapp.IsisWebAppBootstrapper.contextInitialized(IsisWebAppBootstrapper.java:66)
-        at org.mortbay.jetty.handler.ContextHandler.startContext(ContextHandler.java:548)
-        at org.mortbay.jetty.servlet.Context.startContext(Context.java:136)
-        at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1239)
-        at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:517)
-        at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:466)
-        at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-        at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
-        at org.mortbay.jetty.Server.doStart(Server.java:222)
-        at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-        at org.apache.isis.webserver.WebServer.bootstrapIsis(WebServer.java:83)
-        at org.apache.isis.runtime.IsisAbstract.run(IsisAbstract.java:108)
-        at org.apache.isis.webserver.WebServer.main(WebServer.java:33)
-2010-04-26 21:11:00,093 [[[NAME]]ObjectTransactionAbstract main       INFO ]  abort transaction ObjectStoreTransaction@5b4bc4e6[state=IN_PROGRESS,commands=103]
-+----------
 
   The fixture code shared the <<<Participant>>> object between the two transactions when coded like this:
 
@@ -69,7 +38,8 @@ java.lang.IllegalStateException: Cannot 
         plan.getOwner().modifyLeader(peterPlanner);
 +----------
 
-  To resolve the problem you will need to retrieve the object again so it is part of the second transaction. In this example we can change to code to this:
+  To resolve the problem you will need to retrieve the object again so it is 
+  part of the second transaction. In this example we can change to code to this:
 
 +----------
         accounts.createAccount("ACME", "Peter Planner", "pplanner@acme.com");
@@ -82,6 +52,7 @@ java.lang.IllegalStateException: Cannot 
         Work work = plan1.createWork();
         BcpPlan plan = (BcpPlan) work.getTarget();
         plan.getOwner().modifyLeader(peterPlanner);
+
 +----------
 
   An alternative is to force this separation by putting the switch call into a separate fixture, as you now have no choice but to look it up.
@@ -90,7 +61,9 @@ java.lang.IllegalStateException: Cannot 
 
 * Deployment limitations of using switch user
 
-  Switch user will only work in exploration and prototype mode.  To make it run on the server (ie using Tomcat) I changed the deployment type by adding the following to the isis.properties file:
+  Switch user will only work in exploration and prototype mode.  To make it 
+  run on the server (ie using Tomcat) I changed the deployment type by adding 
+  the following to the isis.properties file:
 
 --------
 isis.deploymentType=prototype

Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1050009&r1=1050008&r2=1050009&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Thu Dec 16 15:34:24 2010
@@ -96,6 +96,14 @@
             </item>
 		</menu>
 
+        <menu name="For Contributors">
+            <item name="${docbkxGuideTitle} ${docbkxGuideSubTitle}">
+                <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+                <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
+            </item>
+            <item name="Jottings" href="jottings.html" />
+        </menu>
+
 		<menu name="Other Resources">
 			<item name="Blogs">
 				<item name="Dan Haywood's blog" href="http://danhaywood.com/" />
@@ -107,18 +115,6 @@
 			</item>
 		</menu>
 
-		<menu name="For Contributors">
-            <item name="Dev Env" href="contributors-devenv.html" />
-			<item name="Building" href="contributors-building.html" />
-            <item name="Writing Docs" href="contributors-writing-docs.html" />
-			<item name="Deploying" href="contributors-deploying.html" />
-			<item name="Jottings" href="jottings.html" />
-            <item name="${docbkxGuideTitle}">
-                <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
-                <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
-            </item>
-		</menu>
-
 
 	</body>
 </project>