You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/10/15 17:35:33 UTC
svn commit: r1022968 [1/2] - in /incubator/isis/trunk: ./ alternatives/
alternatives/bytecode/ alternatives/bytecode/javassist/src/site/
alternatives/bytecode/javassist/src/site/apt/
alternatives/bytecode/src/site/ alternatives/bytecode/src/site/apt/ a...
Author: danhaywood
Date: Fri Oct 15 15:35:31 2010
New Revision: 1022968
URL: http://svn.apache.org/viewvc?rev=1022968&view=rev
Log:
more edits, pom.xml, site.xml etc
Added:
incubator/isis/trunk/viewer/src/
incubator/isis/trunk/viewer/src/site/
incubator/isis/trunk/viewer/src/site/apt/
incubator/isis/trunk/viewer/src/site/apt/index.apt
incubator/isis/trunk/viewer/src/site/apt/jottings.apt
incubator/isis/trunk/viewer/src/site/pdf.xml
incubator/isis/trunk/viewer/src/site/site.xml
Removed:
incubator/isis/trunk/alternatives/bytecode/javassist/src/site/pdf.xml
incubator/isis/trunk/alternatives/bytecode/src/site/pdf.xml
incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/pdf.xml
incubator/isis/trunk/alternatives/remoting/common/src/site/pdf.xml
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/META-INF/
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/docbkx/
incubator/isis/trunk/alternatives/remoting/src/site/pdf.xml
incubator/isis/trunk/alternatives/remoting/transport-http/src/docbkx/
incubator/isis/trunk/viewer/dnd/src/site/pdf.xml
incubator/isis/trunk/viewer/html/src/META-INF/
incubator/isis/trunk/viewer/html/src/site/pdf.xml
Modified:
incubator/isis/trunk/alternatives/bytecode/javassist/src/site/apt/index.apt
incubator/isis/trunk/alternatives/bytecode/javassist/src/site/site.xml
incubator/isis/trunk/alternatives/bytecode/pom.xml
incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt
incubator/isis/trunk/alternatives/bytecode/src/site/site.xml
incubator/isis/trunk/alternatives/objectstore/nosql/pom.xml
incubator/isis/trunk/alternatives/objectstore/pom.xml
incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/pom.xml
incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/site.xml
incubator/isis/trunk/alternatives/objectstore/sql/persistor/pom.xml
incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/site/site.xml
incubator/isis/trunk/alternatives/objectstore/sql/pom.xml
incubator/isis/trunk/alternatives/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml
incubator/isis/trunk/alternatives/objectstore/src/site/site.xml
incubator/isis/trunk/alternatives/objectstore/xml/pom.xml
incubator/isis/trunk/alternatives/objectstore/xml/src/docbkx/guide/isis-xml-objectstore.xml
incubator/isis/trunk/alternatives/objectstore/xml/src/site/site.xml
incubator/isis/trunk/alternatives/pom.xml
incubator/isis/trunk/alternatives/progmodel/headless/applib/src/site/site.xml
incubator/isis/trunk/alternatives/progmodel/headless/embedded/src/site/site.xml
incubator/isis/trunk/alternatives/progmodel/headless/pom.xml
incubator/isis/trunk/alternatives/progmodel/headless/src/docbkx/guide/isis-headless.xml
incubator/isis/trunk/alternatives/progmodel/headless/src/site/site.xml
incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/site/site.xml
incubator/isis/trunk/alternatives/progmodel/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/common/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/pom.xml
incubator/isis/trunk/alternatives/remoting/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/transport-http/pom.xml
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/site/site.xml
incubator/isis/trunk/alternatives/remoting/transport-http/src/site/site.xml
incubator/isis/trunk/alternatives/security/pom.xml
incubator/isis/trunk/alternatives/security/src/site/site.xml
incubator/isis/trunk/alternatives/src/site/site.xml
incubator/isis/trunk/applib/pom.xml
incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
incubator/isis/trunk/applib/src/site/site.xml
incubator/isis/trunk/core/commons/src/site/site.xml
incubator/isis/trunk/core/metamodel/src/site/site.xml
incubator/isis/trunk/core/pom.xml
incubator/isis/trunk/core/runtime/src/site/site.xml
incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml
incubator/isis/trunk/core/src/site/site.xml
incubator/isis/trunk/core/webapp/src/site/site.xml
incubator/isis/trunk/core/webserver/src/site/site.xml
incubator/isis/trunk/defaults/bytecode/src/site/site.xml
incubator/isis/trunk/defaults/pom.xml
incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml
incubator/isis/trunk/defaults/src/site/site.xml
incubator/isis/trunk/pom.xml
incubator/isis/trunk/viewer/dnd/pom.xml
incubator/isis/trunk/viewer/dnd/src/docbkx/guide/isis-dnd-viewer.xml
incubator/isis/trunk/viewer/dnd/src/site/site.xml
incubator/isis/trunk/viewer/html/pom.xml
incubator/isis/trunk/viewer/html/src/docbkx/guide/isis-html-viewer.xml
incubator/isis/trunk/viewer/html/src/site/site.xml
incubator/isis/trunk/viewer/junit/pom.xml
incubator/isis/trunk/viewer/junit/src/site/site.xml
incubator/isis/trunk/viewer/pom.xml
incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/site.xml
incubator/isis/trunk/viewer/scimpi/pom.xml
incubator/isis/trunk/viewer/scimpi/servlet/src/site/site.xml
incubator/isis/trunk/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml
incubator/isis/trunk/viewer/scimpi/src/site/site.xml
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/site/apt/index.apt?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/site/apt/index.apt Fri Oct 15 15:35:31 2010
@@ -22,13 +22,13 @@ Javassist Bytecode Support
The <Javassist Bytecode Support> module enables transparent lazy loading and object dirtying
support.
-Configuring CGLib
+Configuring Javassist
TODO... <<<isis.properties>>>
Alternatives
- As an alternative to Javassist you can use {{{../bytecode-cglib/index.html}CGLib}}.
+ As an alternative to Javassist you can use {{{../../defaults/bytecode/index.html}CGLib}}.
- Some object stores (for example <JPA Objects> sister project) do not need the use of this
+ Some object stores (for example the {{{../objectstore/jpa}JPA ObjectStore}} do not need the use of this
bytecode module, because they hook into the lazy loading of the underlying ORM.
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -2,14 +2,14 @@
<project>
<bannerLeft>
- <name>[[NAME]]</name>
+ <name>Apache Isis</name>
<src>../../images/banner-left.png</src>
- <href>http://isis.apache.org/index.html</href>
+ <href>http://incubator.apache.org/isis/index.html</href>
</bannerLeft>
<bannerRight>
<src>../../images/sflogo.png</src>
- <href>http://sourceforge.net/projects/isis</href>
+ <href>http://www.apache.org</href>
</bannerRight>
<body>
@@ -19,21 +19,9 @@
<menu name="Javassist ByteCode Support">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
+ <item name="Jottings" href="jottings.html" />
</menu>
-
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/bytecode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/pom.xml (original)
+++ incubator/isis/trunk/alternatives/bytecode/pom.xml Fri Oct 15 15:35:31 2010
@@ -17,8 +17,10 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../..</trunk.baseDir>
- </properties>
+ <docbkx.guideTitle>Apache Isis Alternative Bytecode Implementations</docbkx.guideTitle>
+ <docbkx.guideName>isis-alternatives-bytecode</docbkx.guideName>
+ </properties>
<modules>
<module>javassist</module>
Modified: incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt Fri Oct 15 15:35:31 2010
@@ -17,15 +17,9 @@
-Core Framework
+Alternative Bytecode Implementations
- The <core> module is the parent of a set of submodules that collectively form the core of [[NAME]].
- Specifically, they provide:
+ The <alternative bytecode implementations> module is ...
- * metamodel
-
- * runtime instance management
-
- * persistence of domain objects (delegates to an object store implementation)
[]
\ No newline at end of file
Modified: incubator/isis/trunk/alternatives/bytecode/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/bytecode/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -20,12 +20,11 @@
<menu name="Core Framework">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
</body>
</project>
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/pom.xml Fri Oct 15 15:35:31 2010
@@ -20,6 +20,9 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
+
+ <docbkx.guideTitle>Apache Isis NOSQL ObjectStore</docbkx.guideTitle>
+ <docbkx.guideName>isis-nosql-objectstore</docbkx.guideName>
</properties>
<build>
Modified: incubator/isis/trunk/alternatives/objectstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/pom.xml Fri Oct 15 15:35:31 2010
@@ -17,6 +17,9 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
+
+ <pdf.title>Apache Isis Alternative ObjectStores</pdf.title>
+ <pdf.outputName>apache-isis-alternatives-objectstores-${project.version}</pdf.outputName>
</properties>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/pom.xml Fri Oct 15 15:35:31 2010
@@ -20,9 +20,6 @@
<hsqldb.version>1.8.0.10</hsqldb.version>
<mysql.version>5.0.5</mysql.version>
- <pdf.title>SQL ObjectStore Integration Tests</pdf.title>
- <pdf.outputName>sql-objectstore-integration-tests-${project.version}</pdf.outputName>
-
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
</properties>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/integrationtests/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,29 +14,14 @@
</bannerRight>
<breadcrumbs>
- <item name="SQL Persistor" href="../index.html" />
+ <item name="SQL ObjectStore" href="../index.html" />
<item name="Tests" href="index.html" />
</breadcrumbs>
<menu name="SQL Persistor Tests">
<item name="About" href="index.html" />
- <!--
- Parent module has all documentation.
- -->
- <item name="${pdf.title} (PDF)" href="../${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">rs">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/pom.xml Fri Oct 15 15:35:31 2010
@@ -12,9 +12,6 @@
<name>SQL ObjectStore Implementation</name>
<properties>
- <pdf.title>SQL ObjectStore Configuration Guide</pdf.title>
- <pdf.outputName>sql-objectstore-config-guide</pdf.outputName>
-
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
</properties>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -15,30 +15,14 @@
<body>
<breadcrumbs>
- <item name="SQL Persistor" href="../index.html" />
+ <item name="SQL ObjectStore" href="../index.html" />
<item name="Implementation" href="index.html" />
</breadcrumbs>
-
<menu name="SQL Persistor">
<item name="About" href="index.html" />
- <!--
- Parent module has all documentation.
- -->
- <item name="${pdf.title} (PDF)" href="../${pdf.outputName}.pdf" />
- </menu>
-
- <!--
- <menu name="Documentation">
</menu>
- -->
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/pom.xml Fri Oct 15 15:35:31 2010
@@ -23,8 +23,8 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
- <docbkx.title>Apache Isis SQL Object Store</docbkx.title>
- <docbkx.outputName>isis-sql-objectstore</docbkx.outputName>
+ <docbkx.guideTitle>Apache Isis SQL ObjectStore</docbkx.guideTitle>
+ <docbkx.guideName>isis-sql-objectstore</docbkx.guideName>
</properties>
<build>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml Fri Oct 15 15:35:31 2010
@@ -22,7 +22,7 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<book>
<bookinfo>
- <title><?eval ${docbkx.title}?></title>
+ <title><?eval ${docbkx.guideTitleTitleTitleTitle}?></title>
<subtitle>Programmer, Configuration and Deployment Guide</subtitle>
<releaseinfo><?eval ${project.version}?></releaseinfo>
Modified: incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -15,17 +15,16 @@
<body>
<breadcrumbs>
- <item name="SQL Persistor" href="index.html" />
+ <item name="SQL ObjectStore" href="index.html" />
</breadcrumbs>
- <menu name="SQL Persistor">
+ <menu name="SQL ObjectStore">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
<menu name="Modules" ref="modules" />
Modified: incubator/isis/trunk/alternatives/objectstore/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,13 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
- <item name="Core" href="index.html" />
+ <item name="Alternatives" href="../index.html" />
+ <item name="Object Stores" href="index.html" />
</breadcrumbs>
- <menu name="Core Framework">
+ <menu name="Alternative ObjectStores">
<item name="About" href="index.html" />
<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
-
- <menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
- </menu>
</body>
</project>
Modified: incubator/isis/trunk/alternatives/objectstore/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/pom.xml Fri Oct 15 15:35:31 2010
@@ -16,9 +16,9 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
- <docbkx.title>Apache Isis XML Object Store</docbkx.title>
- <docbkx.outputName>isis-xml-objectstore</docbkx.outputName>
- </properties>
+ <docbkx.guideTitle>Apache Isis XML ObjectStore</docbkx.guideTitle>
+ <docbkx.guideName>isis-xml-objectstore</docbkx.guideName>
+ </properties>
<build>
<plugins>
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/docbkx/guide/isis-xml-objectstore.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/docbkx/guide/isis-xml-objectstore.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/docbkx/guide/isis-xml-objectstore.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/docbkx/guide/isis-xml-objectstore.xml Fri Oct 15 15:35:31 2010
@@ -21,7 +21,7 @@
-->
<book>
<bookinfo>
- <title><?eval ${docbkx.title}?></title>
+ <title><?eval ${docbkx.guideTitleTitleTitleTitle}?></title>
<subtitle>Programmer, Configuration and Deployment Guide</subtitle>
<releaseinfo><?eval ${project.version}?></releaseinfo>
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,17 +14,16 @@
<body>
<breadcrumbs>
- <item name="XML Persistor" href="index.html" />
+ <item name="XML ObjectStore" href="index.html" />
</breadcrumbs>
- <menu name="XML Persistor">
+ <menu name="XML ObjectStore">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
<menu name="Maven Reports" ref="reports" />
Modified: incubator/isis/trunk/alternatives/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/pom.xml (original)
+++ incubator/isis/trunk/alternatives/pom.xml Fri Oct 15 15:35:31 2010
@@ -21,6 +21,9 @@
<properties>
<trunk.baseDir>${project.build.directory}/../..</trunk.baseDir>
+
+ <pdf.title>Apache Isis Alternatives</pdf.title>
+ <pdf.outputName>apache-isis-alternatives-${project.version}</pdf.outputName>
</properties>
<modules>
Modified: incubator/isis/trunk/alternatives/progmodel/headless/applib/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/applib/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/applib/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/applib/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -18,20 +18,8 @@
<menu name="Headless AppLib">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/progmodel/headless/embedded/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/embedded/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/embedded/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/embedded/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,20 +19,8 @@
<menu name="Headless Embedded">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/progmodel/headless/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/pom.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/pom.xml Fri Oct 15 15:35:31 2010
@@ -19,9 +19,9 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
- <docbkx.title>Apache Isis Headless Viewer and Unit Testing</docbkx.title>
- <docbkx.outputName>isis-headless</docbkx.outputName>
- </properties>
+ <docbkx.title>Apache Isis Headless Programming Model</docbkx.title>
+ <docbkx.outputName>isis-headless</docbkx.outputName>
+ </properties>
<build>
<plugins>
Modified: incubator/isis/trunk/alternatives/progmodel/headless/src/docbkx/guide/isis-headless.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/src/docbkx/guide/isis-headless.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/src/docbkx/guide/isis-headless.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/src/docbkx/guide/isis-headless.xml Fri Oct 15 15:35:31 2010
@@ -22,7 +22,7 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<book>
<bookinfo>
- <title><?eval ${docbkx.title}?></title>
+ <title><?eval ${docbkx.guideTitle}?></title>
<subtitle>Configuring, using and testing with the Headless Viewer</subtitle>
<releaseinfo><?eval ${project.version}?></releaseinfo>
@@ -49,7 +49,7 @@
<para><emphasis>Apache Isis</emphasis> is designed to allow programmers
rapidly develop domain-driven applications following the <ulink
- url="http://en.wikipedia.org/wiki/[[NAME]]_objects">[[NAME]]</ulink>
+ url="http://en.wikipedia.org/wiki/Naked_Objects">Naked Objects</ulink>
pattern. It is made up of a core framework plus a number of alternate
implementations, and supports various viewers and object stores. Apache
Isis is hosted at the
Modified: incubator/isis/trunk/alternatives/progmodel/headless/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,21 +14,18 @@
<body>
<breadcrumbs>
- <item name="Headless Viewer" href="index.html" />
+ <item name="Headless" href="index.html" />
</breadcrumbs>
- <menu name="Headless Viewer">
+ <menu name="Headless ProgModel">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
-
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
<menu name="Modules" ref="modules" />
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/headless/viewer/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,25 +14,13 @@
<body>
<breadcrumbs>
- <item name="Implementation" href="index.html" />
+ <item name="Viewer" href="index.html" />
</breadcrumbs>
- <menu name="Headless Viewer Impl.">
+ <menu name="Headless Viewer">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/progmodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,12 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
- <item name="Core" href="index.html" />
+ <item name="ProgModels" href="index.html" />
</breadcrumbs>
- <menu name="Core Framework">
+ <menu name="Programming Models">
<item name="About" href="index.html" />
<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
-
- <menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
- </menu>
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/common/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,20 +19,8 @@
<menu name="Remoting">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml Fri Oct 15 15:35:31 2010
@@ -15,21 +15,8 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
-
- <docbkx.title>Apache Isis XStream Marshalling</docbkx.title>
- <docbkx.outputName>isis-xstream-marshalling</docbkx.outputName>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </build>
-
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -18,14 +18,8 @@
<menu name="XStream Marshalling">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
-
- <menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
- </menu>
-
+
<menu name="Maven Reports" ref="reports" />
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/pom.xml Fri Oct 15 15:35:31 2010
@@ -17,8 +17,21 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../..</trunk.baseDir>
+
+ <docbkx.title>Apache Isis Remoting Guide</docbkx.title>
+ <docbkx.outputName>isis-remoting</docbkx.outputName>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>common</module>
<module>marshalling-xstream</module>
Modified: incubator/isis/trunk/alternatives/remoting/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,16 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
- <item name="Core" href="index.html" />
+ <item name="Remoting" href="index.html" />
</breadcrumbs>
- <menu name="Core Framework">
+ <menu name="Remoting">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,23 +19,8 @@
<menu name="HTTP Remoting on Client">
<item name="About" href="index.html" />
- <!--
- Parent module has all documentation.
- -->
- <item name="${pdf.title} (PDF)" href="../${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/pom.xml Fri Oct 15 15:35:31 2010
@@ -18,20 +18,7 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
-
- <docbkx.title>Apache Isis HTTP Transport</docbkx.title>
- <docbkx.outputName>isis-remoting-transport-http</docbkx.outputName>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </build>
+ </properties>
<modules>
<module>client</module>
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,23 +19,8 @@
<menu name="HTTP Remoting on Server">
<item name="About" href="index.html" />
- <!--
- Parent module has all documentation.
- -->
- <item name="${pdf.title} (PDF)" href="../${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/alternatives/remoting/transport-http/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,12 +19,6 @@
<menu name="HTTP Remoting">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
- </menu>
-
- <menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
</menu>
<menu name="Modules" ref="modules" />
Modified: incubator/isis/trunk/alternatives/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/pom.xml (original)
+++ incubator/isis/trunk/alternatives/security/pom.xml Fri Oct 15 15:35:31 2010
@@ -16,10 +16,10 @@
<packaging>pom</packaging>
<properties>
- <pdf.title>Overview</pdf.title>
- <pdf.outputName>${project.artifactId}-overview</pdf.outputName>
-
<trunk.baseDir>${project.build.directory}/../../..</trunk.baseDir>
+
+ <pdf.title>Alternative Security Implementations</pdf.title>
+ <pdf.outputName>apache-isis-alternatives-security-${project.version}</pdf.outputName>
</properties>
Modified: incubator/isis/trunk/alternatives/security/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/security/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,12 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
- <item name="Core" href="index.html" />
+ <item name="Security" href="index.html" />
</breadcrumbs>
- <menu name="Core Framework">
+ <menu name="Alternative Security Implementations">
<item name="About" href="index.html" />
<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
-
- <menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
- </menu>
</body>
</project>
Modified: incubator/isis/trunk/alternatives/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,11 +14,10 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
- <item name="Plugins" href="index.html" />
+ <item name="Alternatives" href="index.html" />
</breadcrumbs>
- <menu name="Plugins">
+ <menu name="Alternatives">
<item name="About" href="index.html" />
<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
Modified: incubator/isis/trunk/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/applib/pom.xml (original)
+++ incubator/isis/trunk/applib/pom.xml Fri Oct 15 15:35:31 2010
@@ -19,8 +19,8 @@
<properties>
<trunk.baseDir>${project.build.directory}/../..</trunk.baseDir>
- <docbkx.title>Apache Isis Application Library</docbkx.title>
- <docbkx.outputName>isis-applib-${project.version}</docbkx.outputName>
+ <docbkx.guideTitle>Apache Isis Application Library</docbkx.guideTitle>
+ <docbkx.guideName>isis-applib</docbkx.guideName>
</properties>
<build>
Modified: incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml Fri Oct 15 15:35:31 2010
@@ -21,7 +21,7 @@
-->
<book>
<bookinfo>
- <title><?eval ${docbkx.title}?></title>
+ <title><?eval ${docbkx.guide}?></title>
<subtitle>Programming conventions, annotations and utilities</subtitle>
<releaseinfo><?eval ${project.version}?></releaseinfo>
@@ -56,7 +56,7 @@
<para><emphasis>Apache Isis</emphasis> is designed to allow programmers
rapidly develop domain-driven applications following the <ulink
- url="http://en.wikipedia.org/wiki/[[NAME]]_objects">[[NAME]]</ulink>
+ url="http://en.wikipedia.org/wiki/Naked_Objects">Naked Objects</ulink>
pattern. It is made up of a core framework plus a number of alternate
implementations, and supports various viewers and object stores. Apache
Isis is hosted at the
Modified: incubator/isis/trunk/applib/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/site/site.xml (original)
+++ incubator/isis/trunk/applib/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,17 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
+ <item name="Apache Isis" href="../index.html" />
<item name="AppLib" href="index.html" />
</breadcrumbs>
<menu name="Application Library">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
<!--
to incorporate into docbkx
<item name="Recognised Types" href="recognised-types.html" />
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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/site/site.xml (original)
+++ incubator/isis/trunk/core/commons/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,20 +19,8 @@
<menu name="Commons">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/site/site.xml (original)
+++ incubator/isis/trunk/core/metamodel/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,20 +19,8 @@
<menu name="MetaModel">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/pom.xml (original)
+++ incubator/isis/trunk/core/pom.xml Fri Oct 15 15:35:31 2010
@@ -30,9 +30,9 @@
<trunk.baseDir>${project.build.directory}/../..</trunk.baseDir>
- <docbkx.title>Apache Isis Core</docbkx.title>
- <docbkx.outputName>isis-core</docbkx.outputName>
- </properties>
+ <docbkx.guideTitle>Apache Isis Core</docbkx.guideTitle>
+ <docbkx.guideName>isis-core</docbkx.guideName>
+ </properties>
<modules>
<module>commons</module>
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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/site/site.xml (original)
+++ incubator/isis/trunk/core/runtime/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,18 +19,13 @@
<menu name="Runtime">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
+ <!-- REVIEW: should move into docbook in parent -->
<item name="Configuration" href="configuration.html" />
</menu>
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
</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=1022968&r1=1022967&r2=1022968&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 15 15:35:31 2010
@@ -22,7 +22,7 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<book>
<bookinfo>
- <title><?eval ${docbkx.title}?></title>
+ <title><?eval ${docbkx.guide}?></title>
<subtitle>Developing domain driven applications using Apache
Isis</subtitle>
@@ -65,7 +65,7 @@
<para><emphasis>Apache Isis</emphasis> is designed to allow programmers
rapidly develop domain-driven applications following the <ulink
- url="http://en.wikipedia.org/wiki/[[NAME]]_objects">[[NAME]]</ulink>
+ url="http://en.wikipedia.org/wiki/Naked_Objects">Naked Objects</ulink>
pattern. It is made up of a core framework plus a number of alternate
implementations, and supports various viewers and object stores.
<emphasis>Apache Isis</emphasis> is hosted at the <ulink
Modified: incubator/isis/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/site/site.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/site/site.xml (original)
+++ incubator/isis/trunk/core/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,18 +14,16 @@
<body>
<breadcrumbs>
- <item name="[[NAME]]" href="../index.html" />
<item name="Core" href="index.html" />
</breadcrumbs>
<menu name="Core Framework">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
<menu name="Documentation">
- <item name="${docbkx.title} (PDF)" href="docbkx/pdf/${docbkx.outputName}.pdf" />
- <item name="${docbkx.title} (HTML)" href="docbkx/html/guide/${docbkx.outputName}.html" />
+ <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName.pdf" />
+ <item name=${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html" />
</menu>
</body>
</project>
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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/site/site.xml (original)
+++ incubator/isis/trunk/core/webapp/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -20,22 +20,8 @@
<menu name="WebApp Support">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
-
-
</body>
</project>
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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/site/site.xml (original)
+++ incubator/isis/trunk/core/webserver/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -19,21 +19,8 @@
<menu name="WebServer Bootstrapping">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports" />
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
-
</body>
</project>
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=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/bytecode/src/site/site.xml Fri Oct 15 15:35:31 2010
@@ -14,25 +14,13 @@
<body>
<breadcrumbs>
- <item name="CgLib Bytecode" href="index.html" />
+ <item name="Bytecode" href="index.html" />
</breadcrumbs>
- <menu name="CgLib ByteCode Support">
+ <menu name="Default ByteCode">
<item name="About" href="index.html" />
- <item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
</menu>
- <!--
- <menu name="Documentation">
- </menu>
- -->
-
<menu name="Maven Reports" ref="reports"/>
-
- <!--
- <menu name="For Contributors">
- </menu>
- -->
-
</body>
</project>
Modified: incubator/isis/trunk/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/pom.xml?rev=1022968&r1=1022967&r2=1022968&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/pom.xml (original)
+++ incubator/isis/trunk/defaults/pom.xml Fri Oct 15 15:35:31 2010
@@ -21,8 +21,8 @@
<properties>
<trunk.baseDir>${project.build.directory}/../..</trunk.baseDir>
- <docbkx.title>Apache Isis Default Implementations</docbkx.title>
- <docbkx.outputName>apache-isis-defaults-${project.version}</docbkx.outputName>
+ <docbkx.guideTitle>Apache Isis Default Implementations</docbkx.guideTitle>
+ <docbkx.guideName>isis-defaults</docbkx.guideName>
</properties>
<modules>