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 2003/10/14 00:54:55 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/installation prerequisites.xml source_version.xml
gregor 2003/10/13 15:54:55
Modified: src/webapp/lenya/pubs/docs-new/content/xdocs/installation
prerequisites.xml source_version.xml
Log:
fixed some errors and obsolete instructions in the install docs
Revision Changes Path
1.11 +1 -12 cocoon-lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/installation/prerequisites.xml
Index: prerequisites.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/installation/prerequisites.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- prerequisites.xml 13 Aug 2003 16:11:44 -0000 1.10
+++ prerequisites.xml 13 Oct 2003 22:54:55 -0000 1.11
@@ -42,21 +42,10 @@
<li>
<p>
- <strong>Apache Cocoon</strong> (recommended: Cocoon 2.1 M1 for the CVS version of Lenya)<br/>
+ <strong>Apache Cocoon</strong> (recommended: Cocoon 2.1 or later)<br/>
<link href="http://cocoon.apache.org/mirror.cgi">Cocoon download page</link>
</p>
- <p><strong>Note:</strong> The files in <code>tools/bin</code> in the Cocoon 2.1 M1 tarball on the Apache
- site have DOS line ends.
- So you'll need to do the following if you're building on some forms of UNIX:
- </p>
- <ul>
- <li><code>chmod 755 $LENYA_HOME/build.sh</code></li>
- <li>fix the line ends of <code>ant</code> and <code>antRun</code> in <code>$LENYA_HOME/tools/bin</code></li>
- <li>make those executable as well</li>
- </ul>
- <p/>
</li>
-
</ul>
</body>
1.5 +11 -13 cocoon-lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/installation/source_version.xml
Index: source_version.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/installation/source_version.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- source_version.xml 16 Jun 2003 19:32:34 -0000 1.4
+++ source_version.xml 13 Oct 2003 22:54:55 -0000 1.5
@@ -9,7 +9,8 @@
<type>Documentation</type>
<authors>
<person name="Jan Prill" email="JanPrill@blauton.de"/>
- <person name="Andreas Hartmann" email="andreas.hartmann@wyona.org"/>
+ <person name="Andreas Hartmann" email="andreas@apache.org"/>
+ <person name="Gregor J. Rothfuss" email="gregor@apache.org"/>
</authors>
</header>
<body>
@@ -20,10 +21,10 @@
structure:</p>
<source>
-your_home
+your_home (or c:\ on Windows, NOT My Dcouments)
/src
- /lenya $LENYA_HOME
- /cocoon-2.1-M1 $COCOON_HOME
+ /cocoon-lenya $LENYA_HOME
+ /cocoon-2.1 $COCOON_HOME
/build
/webapp $COCOON_WEBAPP
/build
@@ -54,8 +55,8 @@
<p>
<strong>MS Windows:</strong><br/>
Basically this is setting the <code>JAVA_HOME</code> environment variable and
- double-clicking on tomcat-4.1.24.exe. Decide to run Tomcat as a Windows NT/2000/XP-Service.
- </p>
+ double-clicking on tomcat-4.1.24.exe. Decide to run Tomcat as a Windows NT/2000/XP-Service.</p>
+ <warning>Make sure you do install at a location with spaces in the path</warning>
</li>
<li>
<p>
@@ -93,7 +94,7 @@
<ul>
<li><code>JAVA_HOME = C:\Programme\j2sdk1.4.1_01</code></li>
<li><code>ANT_HOME = C:\Programme\Apache Group\apache-ant-1.5.2</code></li>
- <li><code>CATALINA_HOME = C:\Programme\Apache Group\Tomcat 4.1</code></li>
+ <li><code>CATALINA_HOME = C:\build\tomcat-4.1.24</code></li>
<li><code>CLASSPATH = .\;C:\Programme\Apache Group\apache-ant-1.5.2\lib</code></li>
<li><code>PATH = <snip>;C:\Programme\j2sdk1.4.1_01\bin;C:\Programme\Apache Group\apache-ant-1.5.2\bin</code></li>
</ul>
@@ -103,14 +104,11 @@
<p>
<strong>Get Apache Cocoon</strong> (see <link href="prerequisites.html">Prerequisites</link>)
</p>
- <p>
- <strong>Note:</strong> The current CVS version of Lenya works only with Cocoon Milestone 1
- and newer versions.
- </p>
+ <warning>The current CVS version of Lenya works only with Cocoon 2.1
+ and newer versions.</warning>
</li>
<li>
<p>
- If you use a Cocoon source version:
<strong>Compile Cocoon</strong>
</p>
<p>
@@ -120,7 +118,7 @@
<strong>MS Windows</strong>
</p>
<source>
-$COCOON_HOME > build -Dinclude.webapp.libs=yes webapp
+$COCOON_HOME > build.bat
</source>
<p>
<strong>Unix</strong>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org