You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/21 23:53:00 UTC

svn commit: r154735 [1/3] - in lenya/docu: ./ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xdocs/1_2_x/ src/documentation/content/xdocs/1_2_x/components/ src/documentation/content/xdocs/1_2_x/installation/ src/documentation/content/xdocs/1_2_x/misc/ src/documentation/content/xdocs/1_2_x/specs/ src/documentation/content/xdocs/1_4/ src/documentation/content/xdocs/1_4/installation/ src/documentation/content/xdocs/community/ src/documentation/content/xdocs/docs/1_2_x/ src/documentation/content/xdocs/docs/1_4/ src/documentation/content/xdocs/installation/ tools/

Author: gregor
Date: Mon Feb 21 14:52:55 2005
New Revision: 154735

URL: http://svn.apache.org/viewcvs?view=rev&rev=154735
Log:
Site restructured to distinguish between Lenya 1.2 and 1.4, roadmap updated with progress

Added:
    lenya/docu/src/documentation/content/xdocs/1_2_x/
      - copied from r123921, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/
    lenya/docu/src/documentation/content/xdocs/1_2_x/components/
      - copied from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/components/
    lenya/docu/src/documentation/content/xdocs/1_2_x/index.xml
      - copied, changed from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/index.xml
    lenya/docu/src/documentation/content/xdocs/1_2_x/installation/
    lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml   (with props)
    lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml   (with props)
    lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml   (with props)
    lenya/docu/src/documentation/content/xdocs/1_2_x/misc/
      - copied from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/misc/
    lenya/docu/src/documentation/content/xdocs/1_2_x/specs/
      - copied from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/specs/
    lenya/docu/src/documentation/content/xdocs/1_4/
      - copied from r123921, lenya/docu/src/documentation/content/xdocs/docs/1_4/
    lenya/docu/src/documentation/content/xdocs/1_4/index.xml
      - copied, changed from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_4/index.xml
    lenya/docu/src/documentation/content/xdocs/1_4/installation/
    lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml   (with props)
    lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml   (with props)
    lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml   (with props)
Removed:
    lenya/docu/src/documentation/content/xdocs/docs/1_2_x/
    lenya/docu/src/documentation/content/xdocs/docs/1_4/
    lenya/docu/src/documentation/content/xdocs/installation/
    lenya/docu/src/documentation/content/xdocs/release.xml
Modified:
    lenya/docu/forrest.properties
    lenya/docu/src/documentation/content/xdocs/community/website-update.xml
    lenya/docu/src/documentation/content/xdocs/resolution.xml   (contents, props changed)
    lenya/docu/src/documentation/content/xdocs/roadmap.xml
    lenya/docu/src/documentation/content/xdocs/site.xml
    lenya/docu/src/documentation/content/xdocs/tabs.xml
    lenya/docu/src/documentation/sitemap.xmap
    lenya/docu/src/documentation/skinconf.xml
    lenya/docu/status.xml
    lenya/docu/tools/svn2changes.xsl

Modified: lenya/docu/forrest.properties
URL: http://svn.apache.org/viewcvs/lenya/docu/forrest.properties?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/forrest.properties (original)
+++ lenya/docu/forrest.properties Mon Feb 21 14:52:55 2005
@@ -100,6 +100,6 @@
 # Any other arguments to pass to the JVM. For example, to run on an X-less
 # server, set to -Djava.awt.headless=true
 #forrest.jvmargs=
-#project.bugtracking-url=http://nagoya.apache.org/bugzilla/show_bug.cgi?id=
+#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 #I18n Property only works for the "forrest run" target.
 #project.i18n=true

Copied: lenya/docu/src/documentation/content/xdocs/1_2_x/index.xml (from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_2_x/index.xml)
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_2_x/index.xml?view=diff&rev=154735&p1=lenya/docu/src/documentation/content/xdocs/docs/1_2_x/index.xml&r1=154734&p2=lenya/docu/src/documentation/content/xdocs/1_2_x/index.xml&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/1_2_x/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/1_2_x/index.xml Mon Feb 21 14:52:55 2005
@@ -21,7 +21,7 @@
 
 <document>
   <header>
-    <title>Apache Lenya Documentation</title>
+    <title>Apache Lenya 1.2 Documentation</title>
     <version/>
     <type/>
     <authors>
@@ -30,23 +30,8 @@
   </header>
   <body>
         <p>
-           In getting started with Lenya, one must learn not only a number of concepts, but a number of details as well.
-           The Components section will explain the building blocks that make up Lenya, such as the sitemap, publications, and tasks.
-        </p>
-
-        <p>
-           You can find here release specific documentation. Although right now we have here the documentation mainly for 1.2.x..
-           This is our stable releases and should be used for productiv environments.
-        </p>
-        <p>
-           The 1.4. branch reflects our efforts to integrate Jackrabbit and building an even more flexible frameworks.
-           With the 1.4. branch we are trying to capsulate the functionalities of lenya into plugins.
-           This plugins then can be (hopefully) used in all following version independent from the lenya core.
-        </p>
-        <p>
-           This way we can make flexible changes in 2.0 where we want to refactor the underlinying code base.
-           The version 2.0 will be have the lenya core and a plugin base arround this way we hope to shorten the development time with lenya.
-           The idea is that the user (or admin) can choose from a width range of plugins that he can use in his (her) application.
+           This is the documentation for the 1.2.x releases, although most of it also applies to 1.4.
+           This is our stable release and should be used for production environments.
         </p>
 <p>
 More documentation (work in progress) can be found at the <link href="site:wiki/lenya/">Apache Lenya Wiki</link>.

Added: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: index.xml 47563 2004-09-30 07:19:08Z michi $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+
+<document> 
+
+<header> 
+    <title>Downloading and Installing Apache Lenya 1.2.x</title>
+    <version>0.1</version> 
+    <type>Documentation</type> 
+</header> 
+<body> 
+
+<ul>
+  <li>
+    Download Apache Lenya 1.2.x
+    <ul>
+      <li><link href="ext:releases">Releases</link></li>
+      <li><link href="ext:nightly.builds">Nightly Snapshots</link></li>
+      <li><link href="subversion.html">Subversion</link></li>
+    </ul>
+  </li>
+  <li>
+    Install Apache Lenya 1.2.x
+    <ul>
+      <li><link href="source_version.html">Source Version</link></li>
+    </ul>
+  </li>
+</ul>
+
+</body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,503 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: source_version.xml 55543 2004-10-26 00:14:59Z gregor $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+
+<document>
+  <header>
+    <title>Installation of the 1.2 Source Version</title>
+    <type>Documentation</type>
+    <authors>
+      <person name="Lenya community" email="dev@lenya.apache.org"/>
+    </authors>
+  </header>
+
+  <body>
+  	<section id="introduction">
+  		<title>Introduction</title>
+  	
+  		<p>
+  			This document explains how to install Lenya 1.2.x from source.
+  			There are different ways to install and run Lenya:
+  			<br/>
+  			Choose between
+  		</p>
+        <ol>
+            <li>running Lenya standalone using the built-in Jetty servlet container</li>
+            <li>using Tomcat and have the build process taking care of deploying Lenya in Tomcat</li>
+        </ol>
+
+  		<p>
+  			Please note that you can use other servlet
+        	containers as well, but Jetty and Tomcat are the tested ones.
+        </p>
+        
+        <p>
+  			In all cases, you will need to meet the following prerequisites,
+  			that describe the setup that is tested and recommended. 
+  		</p>
+  	
+  	</section>
+    <section id="prerequisites">
+      <title>Prerequisites</title>
+
+      <ul>
+      	      	
+        <li>
+          <p>
+            <strong>Java 2 Platform, Standard Edition</strong>
+            <br/>
+            version 1.4.2 or newer, 1.5.x is not tested yet.
+            <br/>
+            Get it from <link href="site:java">http://java.sun.com/j2se/1.4.2/download.html</link>
+          </p>
+        </li>
+        
+        <li>
+      		<p>
+      		<strong>Recommended: Create a directory</strong> to better organise the various source files
+      		<br/>
+      		In this document, we will assume the name <code>src/</code> for that directory. It is important to not have
+      		spaces in any of the directory names (so on Windows, make sure you don't create <code>src/</code> in
+      		<code>My Documents</code> but rather directly in <code>c:\</code>).
+      		This directory will contain the Lenya distribution as well as Cocoon.
+      		</p>
+      		
+      		<p>
+      		After expanding the	downloaded archives or after a <link href="site:subversion">svn checkout</link>,
+      		the directory structure should look like this:
+      		</p>
+      		
+      		<source>
+            your_home/ (or c:\ on Windows, NOT My Documents)
+              `-- src/
+                   |-- lenya-1.2.x/            $LENYA_HOME
+                   `-- cocoon-2.1.6/           $COCOON_HOME
+                        `-- build/
+                             `-- webapp/       $COCOON_WEBAPP
+     		</source>
+     		
+     		<p>
+     		The directories inside cocoon-2.1.6/ will be created when you build Cocoon. 
+     		The variables will later be used in the local.build.properties file that configures the Lenya build process.
+      		</p>
+      		
+      	</li>
+      	
+      	<li>
+          <p>
+            <strong>Get Apache Lenya</strong>
+            <br/>
+            (see <link href="site:download">Download Lenya</link>)
+            <br/>
+            Extract the downloaded Lenya archive in the
+            <code>src/</code> directory described above. This will create <code>lenya-1.2.x/</code> inside <code>src/</code>.
+            If you use <link href="site:subversion">Subversion</link>, checkout Lenya inside the
+            <code>src/</code> directory. 
+          </p>
+        </li>
+
+        <li>
+          <p>
+            <strong>Get Apache Cocoon</strong>
+            <br/>
+            version: 2.1.6
+            <br/>
+            Get it from <link href="site:cocoon/mirror">http://cocoon.apache.org/mirror.cgi</link><br/>
+            Unpack Coccon in <code>src/</code>.
+          </p>
+
+			<br/>
+			
+          <p>
+            Note that Cocoon is needed to build the source
+            version of Lenya, but the resulting Lenya webapp is
+            completely self contained and therefore  does not need
+            the Cocoon webapp to be installed. See the <link
+            href="site:wiki/lenya/FAQ">FAQ</link>
+            for details of configuration changes required when running
+            multiple Cocoon based applications.
+          </p>
+        </li>
+
+        
+        <li>
+          <p>
+            <strong>Build Cocoon</strong>
+          </p>
+
+          <p>
+       		Copy the Cocoon build properties supplied by Lenya
+          </p>
+
+          <ul>
+            <li><code>local.build.properties</code></li>
+            <li><code>local.blocks.properties</code></li>
+          </ul>
+
+          <p>
+            from <code>$LENYA_HOME/src/cocoon/</code> to
+            <code>$COCOON_HOME</code>.
+          </p>
+        </li>
+
+        <li>
+          <p>
+            <strong>Compile Cocoon</strong>
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $COCOON_HOME > build.bat
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $COCOON_HOME > ./build.sh -Dinclude.webapp.libs=yes webapp
+          </source>
+        </li>
+        
+      </ul>
+      
+      
+    </section>
+
+
+    <section>
+      <title>1: Standalone Installation (using the built-in Jetty)</title>
+
+      <ol>
+
+        <li>
+          <p>
+            <strong>Configure Lenya to point to Coccon</strong>
+          </p>
+
+          <p>
+            If your Cocoon source tree is set up as described above, you
+            can skip this step.  If your Cocoon source tree is not at
+            <code>../cocoon-2.1.6</code> relative to Lenya, you need
+            to edit your build properties. To do this, copy
+            <code>$LENYA_HOME/build.properties</code> to
+            <code>$LENYA_HOME/local.build.properties</code>.
+          </p>
+
+          <p>
+            Edit <code>local.build.properties</code>. For the described
+            configuration the following settings will work (<strong>MS
+            Windows:</strong> Don't use backslashes "<code>\</code>" for
+            directory separation.)
+          </p>
+
+          <ul>
+            <li><code>cocoon.src.dir=$COCOON_HOME</code></li>
+          </ul>
+        </li>
+
+        <li>
+          <p>
+            <strong>Build Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>build.bat</code> or <code>build.sh</code> in
+            your Lenya source directory, depending on your platform.
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > build.bat
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./build.sh
+          </source>
+        </li>
+
+        <li>
+          <p>
+            <strong>Start Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>lenya.bat</code> or <code>lenya.sh
+            servlet</code> in your Lenya source directory, depending on
+            your platform.  Make sure that you have the environment
+            variable <code>JAVA_HOME</code> defined to point to the
+            location of the Java SDK you installed (see <link
+            href="#prerequisites">Prerequisites</link>).
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > lenya.bat
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./lenya.sh servlet
+          </source>
+        </li>
+
+        <li>
+          <p>
+            <strong>Test the installation</strong>
+          </p>
+
+          <p>
+            <link href="http://localhost:8888">http://localhost:8888/</link>
+          </p>
+        </li>
+      </ol>
+    </section>
+
+    <section>
+      <title>2: Installation with Apache Tomcat</title>
+
+      <ol>
+
+		<li>
+          <p>
+            <strong>Get Apache Tomcat</strong> for JDK 1.4
+            <br/>
+            version: 5.0.28 or newer, 5.5.x not tested.
+            <br/>
+            Get it from  <link href="site:tomcat5">http://jakarta.apache.org/site/binindex.cgi#tomcat-5.0</link>
+          </p>
+
+        </li>
+        
+        <li>
+          <p>
+            <strong>Install Apache Tomcat</strong>
+          </p>
+
+          <p>
+            See <link
+            href="site:tomcat5.setup">Tomcat 5.0 Setup</link>
+          </p>
+
+          <p>
+            <strong>MS Windows:</strong>
+
+            <br/>
+
+            Basically you only need to set the <code>JAVA_HOME</code>
+            environment variable and run the Tomcat
+            installer. Decide to run Tomcat as a Windows
+            NT/2000/XP-Service.
+          </p>
+
+          <warning>
+            Make sure you do not install Tomcat at a location with spaces in
+            the path.
+          </warning>
+        </li>
+
+        <li>
+          <p>
+            <strong>Configure Lenya</strong>
+          </p>
+
+          <p>
+            To install Lenya with Tomcat, you need to edit your build
+            properties. To do this, copy
+            <code>$LENYA_HOME/build.properties</code> to
+            <code>$LENYA_HOME/local.build.properties</code>.
+          </p>
+
+          <p>
+            Edit <code>local.build.properties</code>. For the described
+            configuration the following settings will work (<strong>MS
+            Windows:</strong> Don't use backslashes "<code>\</code>" for
+            directory separation.) It is important that
+            <code>tomcat.home.dir</code> is an absolute path. Replace
+            <code>$TOMCAT_HOME</code> by your Tomcat installation
+            directory.  If your Cocoon source directory is not at
+            <code>../cocoon-2.1.6</code> relative to Lenya, then change
+            the <code>cocoon.webapp.dir</code>, <code>web.app.server</code> and
+            <code>cocoon.src.dir</code> properties.
+          </p>
+
+          <ul>
+            <li><code>web.app.server=Tomcat</code></li>
+            <li><code>cocoon.src.dir=$COCOON_HOME</code></li>
+            <li><code>tomcat.home.dir=$TOMCAT_HOME</code></li>
+          </ul>
+        </li>
+
+        <li>
+          <p>
+            <strong>Build Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>build</code> in your Lenya source directory.
+          </p>
+        </li>
+
+      <li>
+        <p>
+          <strong>Checked versions of endorsed libraries</strong>
+        </p>
+    
+        <p>
+          Lenya and Tomcat will inter-operate correctly only if the proper
+          versions of the Xalan and Xerces libraries are used consistently
+          throughout the deployment.  Unfortunately this can be difficult
+          to get to work correctly since both of these libraries are
+          shipped with Java 2 SDK, Tomcat, Cocoon and Lenya.
+        </p>
+    
+        <p>
+          The following libraries must be placed in the endorsed library
+          directory for your deployment.
+        </p>
+    
+        <ul>
+          <li><code>jakarta-bcel-20040329.jar</code></li>
+          <li><code>jakarta-regexp-1.3.jar</code></li>
+          <li><code>xalan-2.6.0.jar</code></li>
+          <li><code>xercesImpl-2.6.2.jar</code></li>
+          <li><code>xml-apis.jar</code></li>
+        </ul>
+    
+        <p>
+          They are placed by the build process in the directory specified
+          by <code>tomcat.endorsed.dir</code> in
+          <code>build.properties</code>.  You should validate that these
+          files are indeed in the proper location for your deployment.
+          You must then validate that no other instances of these
+          libraries exist in any of the following directories:
+        </p>
+    
+        <ul>
+          <li>
+            The Java 2 SDK endorsed standards directories.  This is
+            usually <code>${JAVA_HOME}/lib/endorsed/</code>.
+          </li>
+    
+          <li>
+            Any other location in your Tomcat deployment.  Specifically,
+            check <code>shared/lib/</code>, <code>common/lib/</code> and
+            <code>server/lib/</code>.
+          </li>
+    
+          <li>
+            Any other location in your Lenya deployment.  Specifically,
+            check <code>webapps/lenya/WEB-INF/lib/</code>.
+          </li>
+        </ul>
+    
+        <p>
+          A common symptom of incorrect library version are blank pages
+          after starting Lenya.  Try carefully checking the location and
+          version numbers of each of the libraries.
+        </p>
+    
+        <p>
+          References:
+        </p>
+    
+        <ul>
+          <li>
+            <link href="site:tomcat5.classloader">
+              Tomcat Class Loader HOWTO (http://jakarta.apache.org/tomcat/tomcat-5.0-doc/class-loader-howto.html)
+            </link>
+          </li>
+    
+          <li>
+            <link href="site:java.endorsedmechanism">
+              Java 2 Endorsed Standards Override Mechanism
+              (http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html)
+            </link>
+          </li>
+        </ul>
+      </li>
+         <li>
+           <p>
+            <strong>Clear Tomcat work directory</strong>
+          </p>
+
+          <p>
+            Tomcat's work cache may not be consistent with your newly installed
+            Lenya.  This can lead to any number of errors and exceptions.  To
+            prevent this, clear the work directory by executing
+            <code>build.bat</code> or <code>build.sh</code> in your Lenya source
+            directory, depending on your platform.
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > build.bat clean 
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./build.sh clean
+          </source>
+        </li>
+        <li>
+          <p>
+            <strong>Restart Tomcat</strong>
+          </p>
+
+          <p>
+            Restart Tomcat to load the Lenya webapp.
+          </p>
+        </li>
+
+        <li>
+          <p>
+            <strong>Test the installation</strong>
+          </p>
+
+          <p>
+            <link href="http://localhost:8080/lenya">http://localhost:8080/lenya/</link>
+          </p>
+        </li>
+      </ol>
+    </section>
+  </body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/source_version.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: cvs.xml 43104 2004-07-01 23:59:25Z thorsten $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+
+<document> 
+
+<header> 
+    <title>Lenya 1.2 Subversion Guide</title>
+    <version>0.1</version> 
+    <type>Documentation</type> 
+    <authors>
+      <person name="Lenya community" email="dev@lenya.apache.org"/>
+    </authors> 
+</header> 
+<body> 
+
+<section>
+<title>Subversion for the public</title>
+<p>
+Start the shell of your choice and enter:
+</p>
+<source>
+svn co http://svn.apache.org/repos/asf/lenya/branches/BRANCH_1_2_X lenya-1.2.x
+</source>
+<p>
+  If you have used the old incubating svn checkout, then please change to the dir
+  that contains the former checkout and:
+</p>
+<source>
+svn sw http://svn.apache.org/repos/asf/lenya/branches/BRANCH_1_2_X
+</source>
+<p>You can test that by using</p>
+<source>svn info</source>
+<source>Path: .
+URL: https://svn.apache.org/repos/asf/lenya/branches/BRANCH_1_2_X
+Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+Revision: 76126
+Node Kind: directory
+Schedule: normal
+Last Changed Author: gregor
+Last Changed Rev: 55623
+Last Changed Date: 2004-10-26 19:23:29 +0200 (Tue, 26 Oct 2004)
+Properties Last Updated: 2004-10-26 17:07:46 +0200 (Tue, 26 Oct 2004)</source>
+</section>
+
+<section>
+<title>Subversion for committers</title>
+<p>
+Start the shell of your choice and enter:
+</p>
+<source>
+svn co https://svn.apache.org/repos/asf/lenya/branches/BRANCH_1_2_X lenya-1.2.x
+ssh -l username svn.apache.org
+svnpasswd username
+exit
+</source>
+</section>
+
+<section>
+<title>View Subversion</title>
+<p>
+<link href="http://svn.apache.org/viewcvs.cgi/lenya/#dirlist">http://svn.apache.org/viewcvs.cgi/lenya/#dirlist</link>
+</p>
+</section>
+
+<section>
+  <title>Subversion Tips</title>
+  
+<p>
+Installing the SVN client with SSL enabled on Debian Woody:
+</p>
+<source>
+apt-get install openssl
+apt-get install libssl-dev (Important Header Files)
+
+./configure --with-ssl
+make
+make install (su)
+svn --version
+</source>
+  
+</section>
+
+</body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_2_x/installation/subversion.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: lenya/docu/src/documentation/content/xdocs/1_4/index.xml (from r154734, lenya/docu/src/documentation/content/xdocs/docs/1_4/index.xml)
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_4/index.xml?view=diff&rev=154735&p1=lenya/docu/src/documentation/content/xdocs/docs/1_4/index.xml&r1=154734&p2=lenya/docu/src/documentation/content/xdocs/1_4/index.xml&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/1_4/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/1_4/index.xml Mon Feb 21 14:52:55 2005
@@ -21,7 +21,7 @@
 
 <document>
   <header>
-    <title>Apache Lenya Documentation</title>
+    <title>Apache Lenya 1.4 Documentation</title>
     <version/>
     <type/>
     <authors>
@@ -29,11 +29,15 @@
     </authors>
   </header>
   <body>
-        <note> This is just a working draft not the actual finished documentation</note>
+          <warning>
+            Apache Lenya 1.4 is still under heavy development and should not be used for production yet.
+          </warning>
         <p>
-           The 1.4. branch reflects our efforts to integrate Jackrabbit and building an even more flexible frameworks. 
-           With the 1.4. branch we are trying to capsulate the functionalities of lenya into plugins. 
-           This plugins then can be used in all following version independent from the lenya core.
+           This is the documentation for the 1.4.x releases. The documentation is not as fleshed out as 1.2 yet, so
+           we suggest you also check there for more information while we build up this documentation.
         </p>
+<p>
+More documentation (work in progress) can be found at the <link href="site:wiki/lenya/">Apache Lenya Wiki</link>.
+</p>
   </body>
 </document>

Added: lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: index.xml 47563 2004-09-30 07:19:08Z michi $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+
+<document> 
+
+<header> 
+    <title>Downloading and Installing Apache Lenya 1.4</title>
+    <version>0.1</version> 
+    <type>Documentation</type> 
+</header> 
+<body> 
+
+          <warning>
+            Apache Lenya 1.4 is still under heavy development and should not be used for production yet.
+          </warning>
+  <ul>
+  <li>
+    Download Apache Lenya 1.4
+    <ul>
+      <li><link href="subversion.html">Subversion</link></li>
+    </ul>
+  </li>
+  <li>
+    Install Apache Lenya 1.4
+    <ul>
+      <li><link href="source_version.html">Source Version</link></li>
+    </ul>
+  </li>
+</ul>
+
+</body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_4/installation/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: source_version.xml 55543 2004-10-26 00:14:59Z gregor $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+
+<document>
+  <header>
+    <title>Installation of the 1.4 Source Version</title>
+    <type>Documentation</type>
+    <authors>
+      <person name="Lenya community" email="dev@lenya.apache.org"/>
+    </authors>
+  </header>
+
+  <body>
+  	<section id="introduction">
+  		<title>Introduction</title>
+  	
+          <warning>
+            Apache Lenya 1.4 is still under heavy development and should not be used for production yet.
+          </warning>
+  		<p>
+  			This document explains how to install Lenya 1.4 from source.
+  			There are different ways to install and run Lenya:
+  			<br/>
+  			Choose between
+  		</p>
+        <ol>
+            <li>running Lenya standalone using the built-in Jetty servlet container</li>
+            <li>using Tomcat and have the build process taking care of deploying Lenya in Tomcat</li>
+        </ol>
+
+  		<p>
+  			Please note that you can use other servlet
+        	containers as well, but Jetty and Tomcat are the tested ones.
+        </p>
+        
+        <p>
+  			In all cases, you will need to meet the following prerequisites,
+  			that describe the setup that is tested and recommended. 
+  		</p>
+  	
+  	</section>
+    <section id="prerequisites">
+      <title>Prerequisites</title>
+
+      <ul>
+      	      	
+        <li>
+          <p>
+            <strong>Java 2 Platform, Standard Edition</strong>
+            <br/>
+            version 1.4.2 or newer, 1.5.x is not tested yet.
+            <br/>
+            Get it from <link href="site:java">http://java.sun.com/j2se/1.4.2/download.html</link>
+          </p>
+        </li>
+        
+        <li>
+      		<p>
+      		<strong>Recommended: Create a directory</strong> to better organise the various source files
+      		<br/>
+      		In this document, we will assume the name <code>src/</code> for that directory. It is important to not have
+      		spaces in any of the directory names (so on Windows, make sure you don't create <code>src/</code> in
+      		<code>My Documents</code> but rather directly in <code>c:\</code>).
+      		This directory will contain the Lenya distribution as well as Cocoon.
+      		</p>
+      		
+      		<p>
+      		After expanding the	downloaded archives or after a <link href="site:subversion">svn checkout</link>,
+      		the directory structure should look like this:
+      		</p>
+      		
+      		<source>
+            your_home/ (or c:\ on Windows, NOT My Documents)
+              `-- src/
+                   |-- lenya-1.4.x/            $LENYA_HOME
+                   `-- cocoon-2.1.6/           $COCOON_HOME
+                        `-- build/
+                             `-- webapp/       $COCOON_WEBAPP
+     		</source>
+     		
+     		<p>
+     		The directories inside cocoon-2.1.6/ will be created when you build Cocoon. 
+     		The variables will later be used in the local.build.properties file that configures the Lenya build process.
+      		</p>
+      		
+      	</li>
+      	
+      	<li>
+          <p>
+            <strong>Get Apache Lenya</strong>
+            <br/>
+            (see <link href="site:download">Download Lenya</link>)
+            <br/>
+            Using <link href="site:subversion">Subversion</link>, checkout Lenya inside the
+            <code>src/</code> directory. 
+          </p>
+        </li>
+
+        <li>
+          <p>
+            <strong>Get Apache Cocoon</strong>
+            <br/>
+            version: 2.1.6
+            <br/>
+            Get it from <link href="site:cocoon/mirror">http://cocoon.apache.org/mirror.cgi</link><br/>
+            Unpack Coccon in <code>src/</code>.
+          </p>
+
+			<br/>
+			
+          <p>
+            Note that Cocoon is needed to build the source
+            version of Lenya, but the resulting Lenya webapp is
+            completely self contained and therefore  does not need
+            the Cocoon webapp to be installed. See the <link
+            href="site:wiki/lenya/FAQ">FAQ</link>
+            for details of configuration changes required when running
+            multiple Cocoon based applications. In 1.4, the Lenya build process takes
+            care of building Cocoon as well.
+          </p>
+        </li>
+      </ul>
+      
+      
+    </section>
+
+
+    <section>
+      <title>1: Standalone Installation (using the built-in Jetty)</title>
+
+      <ol>
+
+        <li>
+          <p>
+            <strong>Configure Lenya to point to Coccon</strong>
+          </p>
+
+          <p>
+            If your Cocoon source tree is set up as described above, you
+            can skip this step.  If your Cocoon source tree is not at
+            <code>../cocoon-2.1.6</code> relative to Lenya, you need
+            to edit your build properties. To do this, copy
+            <code>$LENYA_HOME/build.properties</code> to
+            <code>$LENYA_HOME/local.build.properties</code>.
+          </p>
+
+          <p>
+            Edit <code>local.build.properties</code>. For the described
+            configuration the following settings will work (<strong>MS
+            Windows:</strong> Don't use backslashes "<code>\</code>" for
+            directory separation.)
+          </p>
+
+          <ul>
+            <li><code>cocoon.src.dir=$COCOON_HOME</code></li>
+          </ul>
+        </li>
+
+        <li>
+          <p>
+            <strong>Build Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>build.bat</code> or <code>build.sh</code> in
+            your Lenya source directory, depending on your platform.
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > build.bat
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./build.sh
+          </source>
+        </li>
+
+        <li>
+          <p>
+            <strong>Start Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>lenya.bat</code> or <code>lenya.sh
+            servlet</code> in your Lenya source directory, depending on
+            your platform.  Make sure that you have the environment
+            variable <code>JAVA_HOME</code> defined to point to the
+            location of the Java SDK you installed (see <link
+            href="#prerequisites">Prerequisites</link>).
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > lenya.bat
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./lenya.sh servlet
+          </source>
+        </li>
+
+        <li>
+          <p>
+            <strong>Test the installation</strong>
+          </p>
+
+          <p>
+            <link href="http://localhost:8888">http://localhost:8888/</link>
+          </p>
+        </li>
+      </ol>
+    </section>
+
+    <section>
+      <title>2: Installation with Apache Tomcat</title>
+
+      <ol>
+
+		<li>
+          <p>
+            <strong>Get Apache Tomcat</strong> for JDK 1.4
+            <br/>
+            version: 5.0.28 or newer, 5.5.x not tested.
+            <br/>
+            Get it from  <link href="site:tomcat5">http://jakarta.apache.org/site/binindex.cgi#tomcat-5.0</link>
+          </p>
+
+        </li>
+        
+        <li>
+          <p>
+            <strong>Install Apache Tomcat</strong>
+          </p>
+
+          <p>
+            See <link
+            href="site:tomcat5.setup">Tomcat 5.0 Setup</link>
+          </p>
+
+          <p>
+            <strong>MS Windows:</strong>
+
+            <br/>
+
+            Basically you only need to set the <code>JAVA_HOME</code>
+            environment variable and run the Tomcat
+            installer. Decide to run Tomcat as a Windows
+            NT/2000/XP-Service.
+          </p>
+
+          <warning>
+            Make sure you do not install Tomcat at a location with spaces in
+            the path.
+          </warning>
+        </li>
+
+        <li>
+          <p>
+            <strong>Configure Lenya</strong>
+          </p>
+
+          <p>
+            To install Lenya with Tomcat, you need to edit your build
+            properties. To do this, copy
+            <code>$LENYA_HOME/build.properties</code> to
+            <code>$LENYA_HOME/local.build.properties</code>.
+          </p>
+
+          <p>
+            Edit <code>local.build.properties</code>. For the described
+            configuration the following settings will work (<strong>MS
+            Windows:</strong> Don't use backslashes "<code>\</code>" for
+            directory separation.) It is important that
+            <code>tomcat.home.dir</code> is an absolute path. Replace
+            <code>$TOMCAT_HOME</code> by your Tomcat installation
+            directory.  If your Cocoon source directory is not at
+            <code>../cocoon-2.1.6</code> relative to Lenya, then change
+            the <code>cocoon.webapp.dir</code>, <code>web.app.server</code> and
+            <code>cocoon.src.dir</code> properties.
+          </p>
+
+          <ul>
+            <li><code>web.app.server=Tomcat</code></li>
+            <li><code>cocoon.src.dir=$COCOON_HOME</code></li>
+            <li><code>tomcat.home.dir=$TOMCAT_HOME</code></li>
+          </ul>
+        </li>
+
+        <li>
+          <p>
+            <strong>Build Lenya</strong>
+          </p>
+
+          <p>
+            Execute <code>build</code> in your Lenya source directory.
+          </p>
+        </li>
+
+      <li>
+        <p>
+          <strong>Checked versions of endorsed libraries</strong>
+        </p>
+    
+        <p>
+          Lenya and Tomcat will inter-operate correctly only if the proper
+          versions of the Xalan and Xerces libraries are used consistently
+          throughout the deployment.  Unfortunately this can be difficult
+          to get to work correctly since both of these libraries are
+          shipped with Java 2 SDK, Tomcat, Cocoon and Lenya.
+        </p>
+    
+        <p>
+          The following libraries must be placed in the endorsed library
+          directory for your deployment.
+        </p>
+    
+        <ul>
+          <li><code>jakarta-bcel-20040329.jar</code></li>
+          <li><code>jakarta-regexp-1.3.jar</code></li>
+          <li><code>xalan-2.6.0.jar</code></li>
+          <li><code>xercesImpl-2.6.2.jar</code></li>
+          <li><code>xml-apis.jar</code></li>
+        </ul>
+    
+        <p>
+          They are placed by the build process in the directory specified
+          by <code>tomcat.endorsed.dir</code> in
+          <code>build.properties</code>.  You should validate that these
+          files are indeed in the proper location for your deployment.
+          You must then validate that no other instances of these
+          libraries exist in any of the following directories:
+        </p>
+    
+        <ul>
+          <li>
+            The Java 2 SDK endorsed standards directories.  This is
+            usually <code>${JAVA_HOME}/lib/endorsed/</code>.
+          </li>
+    
+          <li>
+            Any other location in your Tomcat deployment.  Specifically,
+            check <code>shared/lib/</code>, <code>common/lib/</code> and
+            <code>server/lib/</code>.
+          </li>
+    
+          <li>
+            Any other location in your Lenya deployment.  Specifically,
+            check <code>webapps/lenya/WEB-INF/lib/</code>.
+          </li>
+        </ul>
+    
+        <p>
+          A common symptom of incorrect library version are blank pages
+          after starting Lenya.  Try carefully checking the location and
+          version numbers of each of the libraries.
+        </p>
+    
+        <p>
+          References:
+        </p>
+    
+        <ul>
+          <li>
+            <link href="site:tomcat5.classloader">
+              Tomcat Class Loader HOWTO (http://jakarta.apache.org/tomcat/tomcat-5.0-doc/class-loader-howto.html)
+            </link>
+          </li>
+    
+          <li>
+            <link href="site:java.endorsedmechanism">
+              Java 2 Endorsed Standards Override Mechanism
+              (http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html)
+            </link>
+          </li>
+        </ul>
+      </li>
+         <li>
+           <p>
+            <strong>Clear Tomcat work directory</strong>
+          </p>
+
+          <p>
+            Tomcat's work cache may not be consistent with your newly installed
+            Lenya.  This can lead to any number of errors and exceptions.  To
+            prevent this, clear the work directory by executing
+            <code>build.bat</code> or <code>build.sh</code> in your Lenya source
+            directory, depending on your platform.
+          </p>
+
+          <p>
+            <strong>MS Windows</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > build.bat clean 
+          </source>
+
+          <p>
+            <strong>Unix</strong>
+          </p>
+
+          <source>
+            $LENYA_HOME > ./build.sh clean
+          </source>
+        </li>
+        <li>
+          <p>
+            <strong>Restart Tomcat</strong>
+          </p>
+
+          <p>
+            Restart Tomcat to load the Lenya webapp.
+          </p>
+        </li>
+
+        <li>
+          <p>
+            <strong>Test the installation</strong>
+          </p>
+
+          <p>
+            <link href="http://localhost:8080/lenya">http://localhost:8080/lenya/</link>
+          </p>
+        </li>
+      </ol>
+    </section>
+  </body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_4/installation/source_version.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml?view=auto&rev=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml (added)
+++ lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml Mon Feb 21 14:52:55 2005
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: cvs.xml 43104 2004-07-01 23:59:25Z thorsten $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+
+<document> 
+
+<header> 
+    <title>Lenya 1.4 Subversion Guide</title>
+    <version>0.1</version> 
+    <type>Documentation</type> 
+    <authors>
+      <person name="Lenya community" email="dev@lenya.apache.org"/>
+    </authors> 
+</header> 
+<body> 
+
+<section>
+<title>Subversion for the public</title>
+<p>
+Start the shell of your choice and enter:
+</p>
+<source>
+svn co http://svn.apache.org/repos/asf/lenya/trunk lenya-1.4.x
+</source>
+</section>
+
+<section>
+<title>Subversion for committers</title>
+<p>
+Start the shell of your choice and enter:
+</p>
+<source>
+svn co https://svn.apache.org/repos/asf/lenya/trunk lenya-1.4.x
+ssh -l username svn.apache.org
+svnpasswd username
+exit
+</source>
+</section>
+
+<section>
+<title>View Subversion</title>
+<p>
+<link href="http://svn.apache.org/viewcvs.cgi/lenya/#dirlist">http://svn.apache.org/viewcvs.cgi/lenya/#dirlist</link>
+</p>
+</section>
+
+<section>
+  <title>Subversion Tips</title>
+  
+<p>
+Installing the SVN client with SSL enabled on Debian Woody:
+</p>
+<source>
+apt-get install openssl
+apt-get install libssl-dev (Important Header Files)
+
+./configure --with-ssl
+make
+make install (su)
+svn --version
+</source>
+  
+</section>
+
+</body>
+</document>

Propchange: lenya/docu/src/documentation/content/xdocs/1_4/installation/subversion.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/docu/src/documentation/content/xdocs/community/website-update.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/community/website-update.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/community/website-update.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/community/website-update.xml Mon Feb 21 14:52:55 2005
@@ -44,7 +44,8 @@
   <li><code>go to the root of lenya/docu</code></li>
   <li><code>forrest</code> (Note that Forrest may claim that the build failed, most of the time this is only because of entries in brokenlinks that
     can be ignored. If the site looks ok to you, and there were no validation errors, go for it.)</li>
-  <li>Create and copy the Javadoc (<code>build javadocs</code>, Copy from <code>build/webapp/site/apidocs</code> to <code>lenya/site/apidocs/1.2</code>)</li>
+  <li>Create and copy the Javadoc for both branches (<code>build javadocs</code>, Copy from <code>build/webapp/site/apidocs</code> to <code>lenya/site/apidocs/1.2</code> and
+    <code>lenya/site/apidocs/1.4</code>)</li>
   <li>Add, remove, commit to <code>lenya/site</code></li>
 </ul>
 <p>There is a cron job on minotaur which will do 'svn update'

Modified: lenya/docu/src/documentation/content/xdocs/resolution.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/resolution.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/resolution.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/resolution.xml Mon Feb 21 14:52:55 2005
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 1999-2004 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!-- $Id: license.xml 55543 2004-10-26 00:14:59Z gregor $ -->
-
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
-
-<document>
-  <header>
-    <title>Resolution for the creation of Apache Lenya Project</title>
-    <version/>
-    <type/>
-    <authors>
-      <person name="Lenya community" email="dev@lenya.apache.org"/>
-    </authors>
-  </header>
-  <body>
-<section><title>Resolution for the creation of Apache Lenya Project</title>
-<p>
-WHEREAS, the Board of Directors deems it to be in the best
-interests of the Foundation and consistent with the
-Foundation's purpose to establish a Project Management
-Committee charged with the creation and maintenance of
-open-source software related to content management, for
-distribution at no charge to the public.
-</p><p>
-NOW, THEREFORE, BE IT RESOLVED, that a Project Management
-Committee (PMC), to be known as the "Apache Lenya PMC", be and hereby
-is established pursuant to Bylaws of the Foundation; and be it
-further
-</p><p>
-RESOLVED, that the Apache Lenya PMC be and hereby is responsible for
-the creation and maintenance of software related to content
-management, based on software licensed to the Foundation;
-and be it further
-</p><p>
-RESOLVED, that the office of "Vice President, Apache Lenya" be and
-hereby is created, the person holding such office to serve at
-the direction of the Board of Directors as the chair of the
-Apache Lenya PMC, and to have primary responsibility for management of
-the projects within the scope of responsibility of the Apache Lenya
-PMC; and be it further
-</p><p>
-RESOLVED, that the persons listed immediately below be and
-hereby are appointed to serve as the initial members of the
-Apache Lenya PMC:
-</p>
-<ul>
-   <li>Edith Chevier (edith@apache.org)</li>
-   <li>Dale Christ (bigdog@apache.org)</li>
-   <li>Christian Egli (egli@apache.org)</li>
-   <li>Andreas Hartmann (andreas@apache.org)</li>
-   <li>Rolf Kulemann (roku@apache.org)</li>
-   <li>Stefano Mazzocchi (stefano@apache.org)</li>
-   <li>Steven Noels (stevenn@outerthought.org)</li>
-   <li>Gregor J. Rothfuss (gregor@apache.org)</li>
-   <li>Thorsten Scherler (thorsten@apache.org)</li>
-   <li>Michael Wechner (michi@apache.org)</li>
-</ul>
-<p>
-NOW, THEREFORE, BE IT FURTHER RESOLVED, that
-</p><p>
-Rolf Kulemann
-</p><p>
-  be and hereby is appointed to the office of Vice President, Apache Lenya,
-to serve in accordance with and subject to the direction of the
-Board of Directors and the Bylaws of the Foundation until
-death, resignation, retirement, removal or disqualification, or
-until a successor is appointed; and be it further
-</p><p>
-RESOLVED, that the initial Apache Lenya PMC be and hereby is tasked
-with the creation of a set of bylaws intended to encourage open
-development and increased participation in the Lenya Project;
-and be it further
-</p><p>
-RESOLVED, that the initial Apache Lenya PMC be and hereby is tasked
-with the migration and rationalization of the incubating PMC
-Apache Lenya project; and be it further
-</p><p>
-RESOLVED, that all responsibility pertaining to the incubating
-Apache Lenya project encumbered upon the incubator PMC
-be hereafter discharged. 
-</p>
-</section>
-  </body>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: license.xml 55543 2004-10-26 00:14:59Z gregor $ -->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
+
+<document>
+  <header>
+    <title>Resolution for the creation of Apache Lenya Project</title>
+    <version/>
+    <type/>
+    <authors>
+      <person name="Lenya community" email="dev@lenya.apache.org"/>
+    </authors>
+  </header>
+  <body>
+<section><title>Resolution for the creation of Apache Lenya Project</title>
+<p>
+WHEREAS, the Board of Directors deems it to be in the best
+interests of the Foundation and consistent with the
+Foundation's purpose to establish a Project Management
+Committee charged with the creation and maintenance of
+open-source software related to content management, for
+distribution at no charge to the public.
+</p><p>
+NOW, THEREFORE, BE IT RESOLVED, that a Project Management
+Committee (PMC), to be known as the "Apache Lenya PMC", be and hereby
+is established pursuant to Bylaws of the Foundation; and be it
+further
+</p><p>
+RESOLVED, that the Apache Lenya PMC be and hereby is responsible for
+the creation and maintenance of software related to content
+management, based on software licensed to the Foundation;
+and be it further
+</p><p>
+RESOLVED, that the office of "Vice President, Apache Lenya" be and
+hereby is created, the person holding such office to serve at
+the direction of the Board of Directors as the chair of the
+Apache Lenya PMC, and to have primary responsibility for management of
+the projects within the scope of responsibility of the Apache Lenya
+PMC; and be it further
+</p><p>
+RESOLVED, that the persons listed immediately below be and
+hereby are appointed to serve as the initial members of the
+Apache Lenya PMC:
+</p>
+<ul>
+   <li>Edith Chevier (edith@apache.org)</li>
+   <li>Dale Christ (bigdog@apache.org)</li>
+   <li>Christian Egli (egli@apache.org)</li>
+   <li>Andreas Hartmann (andreas@apache.org)</li>
+   <li>Rolf Kulemann (roku@apache.org)</li>
+   <li>Stefano Mazzocchi (stefano@apache.org)</li>
+   <li>Steven Noels (stevenn@outerthought.org)</li>
+   <li>Gregor J. Rothfuss (gregor@apache.org)</li>
+   <li>Thorsten Scherler (thorsten@apache.org)</li>
+   <li>Michael Wechner (michi@apache.org)</li>
+</ul>
+<p>
+NOW, THEREFORE, BE IT FURTHER RESOLVED, that
+</p><p>
+Rolf Kulemann
+</p><p>
+  be and hereby is appointed to the office of Vice President, Apache Lenya,
+to serve in accordance with and subject to the direction of the
+Board of Directors and the Bylaws of the Foundation until
+death, resignation, retirement, removal or disqualification, or
+until a successor is appointed; and be it further
+</p><p>
+RESOLVED, that the initial Apache Lenya PMC be and hereby is tasked
+with the creation of a set of bylaws intended to encourage open
+development and increased participation in the Lenya Project;
+and be it further
+</p><p>
+RESOLVED, that the initial Apache Lenya PMC be and hereby is tasked
+with the migration and rationalization of the incubating PMC
+Apache Lenya project; and be it further
+</p><p>
+RESOLVED, that all responsibility pertaining to the incubating
+Apache Lenya project encumbered upon the incubator PMC
+be hereafter discharged. 
+</p>
+</section>
+  </body>
 </document>

Propchange: lenya/docu/src/documentation/content/xdocs/resolution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/docu/src/documentation/content/xdocs/roadmap.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/roadmap.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/roadmap.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/roadmap.xml Mon Feb 21 14:52:55 2005
@@ -46,8 +46,7 @@
 The Lenya roadmap is determined by the Lenya positioning diagram. It specifies the priorities
 and orientation, and shows areas for futher development. The 1.0 release marks the point
 where Lenya is donated to the Apache foundation. Subsequent releases are under the Apache
-umbrella. Items in bold type mark completed items. This roadmap was created in Spring 2003 and may be out
-    of date.<br /><br />
+umbrella. Items in bold type mark completed items. <br /><br />
 <img src="images/live/cms-positioning.png" alt=""/><br /><br />
 
 The positioning diagram defines 8 areas, with a relative weight of 1-7. The current Lenya code base is
@@ -150,7 +149,7 @@
 
 <ul>
 <li><strong>Update from JDK 1.3.1 to 1.4</strong></li>
-<li>Replace DOM4J</li>
+<li><strong>Replace DOM4J</strong></li>
 </ul>
 
 </section>
@@ -193,17 +192,17 @@
 <ul>
 <li><strong>Improve and standardize templating (XHTML)</strong></li>
 <li>Allow for documentation annotation (like php.net)</li>
-<li>Write a publication HOWTO</li>
-<li>Maintain a FAQ</li>
+<li><strong>Write a publication HOWTO</strong></li>
+<li><strong>Maintain a FAQ</strong></li>
 <li><strong>Elminate redundancies between authoring and live areas</strong></li>
-<li>Write Lenya Tutorials</li>
+<li><strong>Write Lenya Tutorials</strong></li>
 </ul>
 
 </section>
 <section><title>Product Maturity</title>
 
 <ul>
-<li>Complete JavaDoc</li>
+<li><strong>omplete JavaDoc</strong></li>
 <li><strong>Unify CMS URIs</strong></li>
 <li><strong>Standardize sitemaps</strong></li>
 <li><strong>Work out upgrade schedule for dependent components (Cocoon etc)</strong></li>
@@ -221,14 +220,14 @@
 <section><title>Off The Shelf Components</title>
 
 <ul>
-<li>Migrate Lenya xinclude processor to Cocoon (or vice versa)</li>
+<li><strong>Migrate Lenya xinclude processor to Cocoon (or vice versa)</strong></li>
 </ul>
 
 </section>
 <section><title>Feature Set</title>
 
 <ul>
-<li>Integrate Slide</li>
+<li>Integrate Repository</li>
 <li><strong>Implement workflow engine</strong></li>
 <li><strong>Implement generic sitetree navigation framework</strong></li>
 <li><strong>Integrate HTML Form Editor</strong></li>
@@ -248,7 +247,7 @@
 <ul>
 <li>Improve Lenya menu to float across the page</li>
 <li>Improve CMS screens with help tooltips</li>
-<li>Improve Bitflux / Xopus integration</li>
+<li><strong>Improve Bitflux / Xopus integration</strong></li>
 </ul>
 
 </section></section>
@@ -273,18 +272,18 @@
 <section><title>Product Maturity</title>
 
 <ul>
-<li>Rewrite Resource Creation Framework</li>
-<li>Rewrite Publishing / Replication Framework</li>
+<li><strong>Rewrite Resource Creation Framework</strong></li>
+<li><strong>Rewrite Publishing / Replication Framework</strong></li>
 <li>Complete Unit test coverage</li>
-<li>Complete JavaDoc</li>
+<li><strong>Complete JavaDoc</strong></li>
 </ul>
 
 </section>
 <section><title>Industrial Strength</title>
 
 <ul>
-<li>Improve reverse proxying</li>
-<li>Research advanced caching strategies</li>
+<li><strong>Improve reverse proxying</strong></li>
+<li><strong>Research advanced caching strategies</strong></li>
 <li>Implement transaction management</li>
 </ul>
 

Modified: lenya/docu/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/site.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/site.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/site.xml Mon Feb 21 14:52:55 2005
@@ -28,18 +28,27 @@
         <resolution href="resolution.html" label="Resolution"/>
         <node-i href="related-projects.html" label="Related Projects"/>
     </project-information>
-    <installation href="installation/" label="Installation" tab="installation">
-        <download href="index.html" label="Download"/>
-        <cvs href="subversion.html" label="Subversion Access"/>
-        <install href="source_version.html" label="Installation Instructions"/>
-    </installation>
-    <documentation href="docs/" label="Documentation" tab="docs">
+      <docu1.4 href="1_4/" label="Version 1.4" target="1.4">
+<!--          <whole_docu href="../documentation-1-4.pdf" label="1.4 PDF docs (all in one)" />
+          <whole_docu href="../documentation-1-4.html" label="1.4 HTML docs (all in one)" />
+-->          <installation href="installation/" label="Installation">
+              <download href="index.html" label="Download"/>
+              <cvs href="subversion.html" label="Subversion Access"/>
+              <install href="source_version.html" label="Installation Instructions"/>
+          </installation>
+          <javadoc1.4 href="../../../../apidocs/1.4/index.html" label="1.4 API (Javadoc)"/>
+      </docu1.4>
+  <!--    <documentation href="docs/" label="Documentation" tab="docs">
         <index_doc href="index.html" label="Documentation" wholesite="true"/>
-        <whole_docu href="../docu.pdf" label="pdf docu 1.2.x (whole)" />
-        <whole_docu href="../docu.html" label="html docu 1.2.x (whole)" />
-        <docu1.2.x href="1_2_x/" label="1.2.x">
-
-            <components href="components/" label="Components" wholesite="true">
+-->        <docu1.2.x href="1_2_x/" label="Version 1.2" target="1.2">
+<!--          <whole_docu href="../documentation-1-2.pdf" label="1.2 PDF docs (all in one)" />
+          <whole_docu href="../documentation-1-2.html" label="1.2 HTML docs (all in one)" />
+-->          <installation12 href="installation/" label="Installation">
+              <download href="index.html" label="Download"/>
+              <cvs href="subversion.html" label="Subversion Access"/>
+              <install href="source_version.html" label="Installation Instructions"/>
+          </installation12>
+            <components href="components/" label="Components">
                 <accesscontrol href="accesscontrol/" label="Access&#160;Control">
                     <ac-terms href="terms.html" label="Basic Terms"/>
                     <accesscontrollers href="accesscontrollers.html" label="Access&#160;Controllers"/>
@@ -50,7 +59,7 @@
                     <accr-mng href="accreditablemanagers.html" label="Accreditable&#160;Managers"/>
                     <ssl href="ssl.html" label="SSL Encryption"/>
                 </accesscontrol>
-                <authoring href="authoring/" labe="Authoring">
+                <authoring href="authoring/" label="Authoring">
                     <namespaces href="adding-document-creator.html" label="Adding a new document creator"/>
                     <namespaces href="image-upload.html" label="Image Upload"/>
                     <openoffice href="openoffice.html" label="OpenOffice"/>
@@ -151,11 +160,7 @@
             </misc>
             <javadoc1.2 href="../../apidocs/1.2/index.html" label="1.2 API (Javadoc)"/>
         </docu1.2.x>
-        <docu1.4 href="1_4/index.html" label="1.4">
-            <javadoc1.4 href="../../../../apidocs/1.4/index.html" label="1.4 API (Javadoc)"/>
-        </docu1.4>
-    </documentation>
-    <community href="community/" label="Community" tab="community">
+        <community href="community/" label="Community" tab="community">
         <index_com href="index.html" label="Contributing"/>
         <node-h href="acknowledgements.html" label="Credits"/>
         <node-f href="http://svn.apache.org/viewcvs.cgi/lenya/#dirlist" label="SVN Web"/>

Modified: lenya/docu/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/content/xdocs/tabs.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/tabs.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/tabs.xml Mon Feb 21 14:52:55 2005
@@ -32,7 +32,7 @@
 
 
   <tab label="Project" dir="" id="project" indexfile="index.html"/>
-  <tab label="Installation" dir="installation" id="installation" indexfile="index.html"/>
-  <tab label="Documentation" dir="docs" id="docs" indexfile="index.html"/>
+  <tab label="Version 1.4" dir="1_4" id="1_4" indexfile="index.html"/>
+  <tab label="Version 1.2" dir="1_2_x" id="1_2" indexfile="index.html"/>
   <tab label="Community" dir="community" id="community" indexfile="index.html"/>
 </tabs>

Modified: lenya/docu/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/sitemap.xmap?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/sitemap.xmap (original)
+++ lenya/docu/src/documentation/sitemap.xmap Mon Feb 21 14:52:55 2005
@@ -27,15 +27,16 @@
 <!-- Pipelines -->
  <map:pipelines>
   <map:pipeline>
-<!--Aggregation out of a couple of sites-->
-    <map:match pattern="docu.xml">
+    <!-- Pipeline to aggregate the documentation for a branch.
+      eg. documentation-1.2.xml -->
+    <map:match pattern="documentation-*-*.xml">
       <map:generate src="cocoon://abs-linkmap"/>
       <map:transform type="xpath">
-        <map:parameter name="include" value="//*[@wholesite='true']"/>
+        <map:parameter name="include" value="//*[@target='{1}.{2}']"/>
       </map:transform>
       <map:transform src="{forrest:stylesheets}/site2book.xsl" />
       <map:transform src="{forrest:stylesheets}/aggregates/book2cinclude.xsl">
- 	  <map:parameter name="title" value="{conf:project-name}: Whole documentation"/>
+     	  <map:parameter name="title" value="{conf:project-name}: Whole documentation"/>
       </map:transform>
       <map:transform type="cinclude"/>
       <map:transform src="{forrest:stylesheets}/aggregates/doc2doc-uniqueids.xsl"/>

Modified: lenya/docu/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/lenya/docu/src/documentation/skinconf.xml?view=diff&r1=154734&r2=154735
==============================================================================
--- lenya/docu/src/documentation/skinconf.xml (original)
+++ lenya/docu/src/documentation/skinconf.xml Mon Feb 21 14:52:55 2005
@@ -122,7 +122,7 @@
   <favicon-url>favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2002-2004</year>
+  <year>2002-2005</year>
   <vendor>The Apache Software Foundation.</vendor>
   <!-- The optional copyright-link URL will be used as a link in the copyright statement -->
   <copyright-link>http://www.apache.org/licenses/LICENSE-2.0</copyright-link>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org