You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/01/07 18:21:51 UTC
svn commit: r609705 - in /lenya/docu/src/documentation/content/xdocs:
docs/2_0_x/index.xml docs/2_0_x/installation/index.xml
docs/2_0_x/installation/source_version.xml
docs/2_0_x/tutorials/setupide/index.xml index.xml site.xml
Author: andreas
Date: Mon Jan 7 09:21:40 2008
New Revision: 609705
URL: http://svn.apache.org/viewvc?rev=609705&view=rev
Log:
Updating website: Reference 2.0 on download page, updated installation instrucations, removed 2.0 warning messages.
Modified:
lenya/docu/src/documentation/content/xdocs/docs/2_0_x/index.xml
lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/index.xml
lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/source_version.xml
lenya/docu/src/documentation/content/xdocs/docs/2_0_x/tutorials/setupide/index.xml
lenya/docu/src/documentation/content/xdocs/index.xml
lenya/docu/src/documentation/content/xdocs/site.xml
Modified: lenya/docu/src/documentation/content/xdocs/docs/2_0_x/index.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/docs/2_0_x/index.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/2_0_x/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/docs/2_0_x/index.xml Mon Jan 7 09:21:40 2008
@@ -24,11 +24,6 @@
<title>Apache Lenya 2.0 Documentation</title>
</header>
<body>
- <warning>
- Apache Lenya 2.0 is still under development and should not be used for production
- yet. A code freeze has been announced, and the release should be
- imminent.
- </warning>
<note label="Help wanted!"> Since 2.0 is new and provides many
enhancements and new features, please help to document them with us.
Send documentation patches and use the Wiki. Thanks in advance :)</note>
@@ -37,6 +32,13 @@
Wiki</a>. Please treat the Wiki with care for now, as much of the
information there is outdated.
</p>
+
+ <section>
+ <title>Download</title>
+ <p>
+ You find different download options on the <a href="site:download20">download page</a>.
+ </p>
+ </section>
<section>
<title>What's New in Lenya 2.0</title>
Modified: lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/index.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/index.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/index.xml Mon Jan 7 09:21:40 2008
@@ -22,16 +22,28 @@
<title>Downloading and Installing Apache Lenya 2.0</title>
</header>
<body>
- <warning> Apache Lenya 2.0 is still under heavy development and should not
- be used for production yet. </warning>
- <ul>
- <li> Download Apache Lenya 2.0 <ul> <li><a
- href="subversion.html">Subversion</a></li> </ul> <p> During the
- development of Apache Lenya 2.0, only source versions will be released.
- </p> <!--The Apache Software Foundation has <a href="http://people.apache.org/~henkp/cgi-bin/md5.cgi">more information on ASC Signatures and MD5 checksums</a>.-->
- </li>
- <li> Install Apache Lenya 2.0 <ul> <li><a
- href="source_version.html">Source Version</a></li> </ul> </li>
- </ul>
+ <section>
+ <title>Download</title>
+ <ul>
+ <li>
+ Lenya 2.0
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip">Windows source code</a> (ZIP archive),
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip.asc">ASC Signature</a>,
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip.md5">MD5 Checksum</a>
+ </li>
+ <li>
+ Lenya 2.0
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz">Unix source code</a> (tar.gz archive),
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz.asc">ASC Signature</a>,
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz.md5">MD5 Checksum</a>
+ </li>
+ </ul>
+ </section>
+ <section>
+ <title>Installation</title>
+ <p>
+ After the download, proceed with the <a href="site:install20">installation instructions</a>.
+ </p>
+ </section>
</body>
</document>
Modified: lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/source_version.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/source_version.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/source_version.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/docs/2_0_x/installation/source_version.xml Mon Jan 7 09:21:40 2008
@@ -21,16 +21,13 @@
<document>
<header>
- <title>Apache Lenya 2.0 install instructions</title>
+ <title>Apache Lenya 2.0 Installation Instructions</title>
</header>
<body>
<section id="introduction">
<title>Introduction</title>
- <warning>
- Apache Lenya 2.0 is still under heavy development and should not be used for production yet.
- </warning>
<p>
This document explains how to install Lenya 2.0 from source.
There are different ways to install and run Lenya:
@@ -38,8 +35,8 @@
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>
+ <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>
@@ -64,7 +61,7 @@
<br/>
version 1.4.2 or newer, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=32923">1.6.x works with limitations</a>.
<br/>
- Get it from <a href="site:java">http://java.sun.com/j2se/1.4.2/download.html</a>
+ Get it from <a href="site:java">http://java.sun.com/j2se/1.4.2/download.html</a>.
</p>
</li>
@@ -102,9 +99,9 @@
<p>
<strong>Get Apache Lenya</strong>
<br/>
- (see <a href="site:download14">Download Lenya</a>)
+ (see <a href="site:download20">Download Lenya</a>)
<br/>
- Using <a href="site:subversion14">Subversion</a>, checkout Lenya inside the
+ Using <a href="site:subversion20">Subversion</a>, checkout Lenya inside the
<code>src/</code> directory.
</p>
</li>
@@ -126,18 +123,15 @@
<p>
You need to edit your build properties and write
- local.build.properties. To do this execute configure.sh
- or configure.bat.
- </p>
- <note>Cocoon 2.1.x is now placed in Lenya as a svn:external
- you'll find cocoon in $LENYA_HOME/externals/cocoon_2_1_x.
- If you want to use cocoon from another location you can change
- the $COCOON_HOME point to your cocoon src directory.
- </note>
- <p>
- Copy $LENYA_HOME/src/cocoon/local.blocks.properties and
- local.build.properties to $COCOON_HOME.
+ <code>local.build.properties</code>. To do this, execute <code>configure.sh</code>
+ (Unix) or <code>configure.bat</code> (Windows).
</p>
+ <note>Cocoon 2.1.x is now included in the Lenya source tree using an
+ <code>svn:externals</code> property; you'll find it in the directory
+ <code>$LENYA_HOME/externals/cocoon_2_1_x</code>.
+ If you want to use Cocoon from another location, you can change
+ the <code>$COCOON_HOME</code> point to your Cocoon source directory.
+ </note>
</li>
<li>
@@ -146,34 +140,31 @@
</p>
<p>
- Execute <code>build.bat</code> or <code>build.sh</code> in
+ Execute <code>build.sh</code> (Unix) or <code>build.bat</code> (Windows) in
your Lenya source directory, depending on your platform.
</p>
- <note>Cocoon will be built when you build lenya. You can manually build or clean
- cocoon in $COCOON_HOME with ./build.sh or ./build.sh clean</note>
+ <note>Cocoon will be built when you build Lenya. You can manually build or clean
+ Cocoon in <code>$COCOON_HOME</code> with <code>./build.sh</code> or <code>./build.sh clean</code>.
+ </note>
<p>
<strong>MS Windows</strong>
</p>
- <source>
- $LENYA_HOME > build.bat
- </source>
+ <source>$LENYA_HOME > build.bat</source>
<p>
<strong>Unix</strong>
</p>
- <source>
- $LENYA_HOME > ./build.sh
- </source>
- <p>
- <br/><br/>
- If your build fails, because it cant delete cocoon.xconf.ant_patch try:
- in $LENYA_HOME/src/targets/webapp-build.xml LINE 69 add
- verbose="true" failonerror="false" to the delete tag.
- In $LENYA_HOME/src/targets/publets-build.xml LINE 53 add
- verbose="true" failonerror="false" to the delete tag.
+ <source>$LENYA_HOME > ./build.sh</source>
+ <p>
+ If your build fails, because it cant delete the file <code>cocoon.xconf.ant_patch</code>,
+ try the following:
+ In <code>$LENYA_HOME/src/targets/webapp-build.xml</code>, line 69, add
+ <code>verbose="true" failonerror="false"</code> to the <code><delete></code> tag.
+ In <code>$LENYA_HOME/src/targets/publets-build.xml</code>, line 53, add
+ <code>verbose="true" failonerror="false"</code> to the <code><delete></code> tag.
</p>
</li>
@@ -183,8 +174,8 @@
</p>
<p>
- Execute <code>lenya.bat</code> or <code>lenya.sh
- servlet</code> in your Lenya source directory, depending on
+ Execute <code>lenya.sh</code> (Unix) or <code>lenya.bat</code> (Windows)
+ 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 <a
@@ -195,17 +186,13 @@
<strong>MS Windows</strong>
</p>
- <source>
- $LENYA_HOME > lenya.bat
- </source>
+ <source>$LENYA_HOME > lenya.bat</source>
<p>
<strong>Unix</strong>
</p>
- <source>
- $LENYA_HOME > ./lenya.sh servlet
- </source>
+ <source>$LENYA_HOME > ./lenya.sh</source>
</li>
<li>
@@ -231,9 +218,12 @@
<p>
<strong>Get Apache Tomcat</strong> for JDK 1.4
<br/>
-Lenya is developed and tested with Tomcat 5.0.28; it is assumed in the following instructions, and we highly recommend it. Tomcat 4.0.0+, 4.1.24+, 5.0.18+ and 5.5.0+ should work too. <br/>
- <br/>
- Get it from <a href="site:tomcat5">http://jakarta.apache.org/site/binindex.cgi#tomcat-5.0</a>
+ Lenya is developed and tested with Tomcat 5.0.28; it is assumed in the
+ following instructions, and we highly recommend it. Tomcat 4.0.0+, 4.1.24+,
+ 5.0.18+ and 5.5.0+ should work too.
+ </p>
+ <p>
+ Get it from <a href="site:tomcat5">http://jakarta.apache.org/site/binindex.cgi#tomcat-5.0</a>.
</p>
</li>
@@ -271,7 +261,8 @@
<code>$LENYA_HOME/build.properties</code> to
<code>$LENYA_HOME/local.build.properties</code>.
</p>
- <note>You can use the configure.sh or configure.bat to configure your local.build.properties.</note>
+ <note>You can use the <code>configure.sh</code> or <code>configure.bat</code> to configure your
+ <code>local.build.properties</code>.</note>
<p>
Edit <code>local.build.properties</code>. For the described
Modified: lenya/docu/src/documentation/content/xdocs/docs/2_0_x/tutorials/setupide/index.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/docs/2_0_x/tutorials/setupide/index.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/docs/2_0_x/tutorials/setupide/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/docs/2_0_x/tutorials/setupide/index.xml Mon Jan 7 09:21:40 2008
@@ -38,7 +38,7 @@
<li>
<p>
Check out the Lenya trunk and the Cocoon branch 2.1 from the Subversion
- repository (see <a href="site:install14">Installation Instructions</a>).
+ repository (see <a href="site:install20">Installation Instructions</a>).
I suggest to use the following directory layout:
</p>
<source xml:space="preserve"><![CDATA[src/
Modified: lenya/docu/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/index.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/index.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/index.xml Mon Jan 7 09:21:40 2008
@@ -35,26 +35,34 @@
<section id="download">
<title>Downloads</title>
<p>
- The current stable version of Apache Lenya is 1.2.5. This is the recommended version
+ The current stable version of Apache Lenya is 2.0. This is the recommended version
for production use. You will at least need the Java 2 Platform, Standard Edition,
- version 1.4.2. Please follow the <a href="site:install">installation instructions</a>.
+ version 1.4.2. Please follow the <a href="site:install20">installation instructions</a>.
</p>
<ul>
- <li>Lenya 1.2.5 <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.zip">Windows binary</a> (ZIP archive) <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.zip.asc">ASC Signature</a> <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.zip.md5">MD5 Checksum</a></li>
- <li>Lenya 1.2.5 <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.zip">Windows source code</a> (ZIP archive) <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.zip.asc">ASC Signature</a> <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.zip.md5">MD5 Checksum</a></li>
- <li>Lenya 1.2.5 <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.tar.gz">Unix binary</a> (tar.gz archive) <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.tar.gz.asc">ASC Signature</a> <a href="http://www.apache.org/dyn/closer.cgi/lenya/BINARIES/apache-lenya-1.2.5-bin.tar.gz.md5">MD5 Checksum</a></li>
- <li>Lenya 1.2.5 <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.tar.gz">Unix source code</a> (tar.gz archive) <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.tar.gz.asc">ASC Signature</a> <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-1.2.5-src.tar.gz.md5">MD5 Checksum</a></li>
+ <li>
+ Lenya 2.0
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip">Windows source code</a> (ZIP archive),
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip.asc">ASC Signature</a>,
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.zip.md5">MD5 Checksum</a>
+ </li>
+ <li>
+ Lenya 2.0
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz">Unix source code</a> (tar.gz archive),
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz.asc">ASC Signature</a>,
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/SOURCES/apache-lenya-2.0-src.tar.gz.md5">MD5 Checksum</a>
+ </li>
</ul>
<p>
+ Previous releases can be obtained from the
+ <a href="http://www.apache.org/dyn/closer.cgi/lenya/">distribution page</a>.
+ </p>
+ <p>
The Apache Software Foundation has <a href="http://people.apache.org/~henkp/cgi-bin/md5.cgi">more
information on ASC Signatures and MD5 checksums</a>.</p>
<p>
- Please go to the <a href="site:download12">download section</a> of version 1.2 for more download
+ Please go to the <a href="site:download20">download section</a> of version 2.0 for more download
options such as Subversion.
- </p>
- <p>
- You may also <a href="site:download14">download 2.0</a>, the current development version, although
- this is still under heavy development and should not be used for production yet.
</p>
</section>
Modified: lenya/docu/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/site.xml?rev=609705&r1=609704&r2=609705&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/site.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/site.xml Mon Jan 7 09:21:40 2008
@@ -138,11 +138,11 @@
<!-- <whole_docu href="../documentation-1-4.pdf" label="2.0 PDF docs (all in one)" />
<whole_docu href="../documentation-1-4.html" label="2.0 HTML docs (all in one)" />
-->
- <installation14 href="installation/" label="Installation">
- <download14 href="index.html" label="Download"/>
- <subversion14 href="subversion.html" label="Subversion Access"/>
- <install14 href="source_version.html" label="Install Instructions"/>
- </installation14>
+ <installation20 href="installation/" label="Installation">
+ <download20 href="index.html" label="Download"/>
+ <subversion20 href="subversion.html" label="Subversion Access"/>
+ <install20 href="source_version.html" label="Install Instructions"/>
+ </installation20>
<tutorials href="tutorials/" label="Tutorials">
<newPublication14 href="newpublication/index.html" label="Create a Publication"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org