Author: vgritsenko
Date: Tue Oct 2 09:51:52 2007
New Revision: 581298
URL: http://svn.apache.org/viewvc?rev=581298&view=rev
Log:
applying patch
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/community/howto/installation/tomcat.xml
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/community/howto/installation/tomcat.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/community/howto/installation/tomcat.xml?rev=581298&r1=581297&r2=581298&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/community/howto/installation/tomcat.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/community/howto/installation/tomcat.xml
Tue Oct 2 09:51:52 2007
@@ -23,17 +23,17 @@
<!--
- Version: $Revision$ $Date$
+ - Author: Ganesh Babu J ([EMAIL PROTECTED])
-->
-
<howto>
<header>
<title>Xindice Tomcat How-To</title>
- <version>$Revision$</version>
+ <version>1.2</version>
<authors>
<person name="Dave Viner" email="[EMAIL PROTECTED]"/>
<person name="Vadim Gritsenko" email="[EMAIL PROTECTED]"/>
</authors>
- <last-modified-content-date date="2004-01-01"/>
+ <last-modified-content-date date="2007-09-21"/>
</header>
<audience title="Intended audience">
@@ -67,11 +67,24 @@
<steps title="Steps">
<section>
+ <title>Place holders used in the Steps</title>
+ <p>
+ </p>
+ <ul>
+ <li>
+ <code>{XINDICE_HOME}</code> - Directory where you have unzipped your
Xindice source files.
+ </li>
+ <li>
+ <code>{JAVA_VERSION}</code> - Installed JDK Version.
+ </li>
+ </ul>
+ </section>
+ <section>
<title>Copy the WAR file</title>
<p>
If you've followed the prerequisites, then you will have a working
version
of Tomcat installed, and the sources of Xindice compiled. Now, copy the
- <code>xindice-*.war</code> file from dist to the
+ <code>xindice-*.war</code> file from {XINDICE_HOME} to the
<code>%CATALINA_HOME%/webapps</code>.
</p>
<warning>
@@ -81,49 +94,29 @@
</warning>
<p>Here's what that looks like in Windows:</p>
<source>
-D:\xindice\current\xml-xindice>dir dist
- Volume in drive D is Data
- Volume Serial Number is A3EB-9689
-
- Directory of D:\xindice\current\xml-xindice\dist
-
-01/01/2004 03:34 PM <DIR> .
-01/01/2004 03:34 PM <DIR> ..
-01/01/2004 03:34 PM 464,594 xindice-1.1b3.jar
-01/01/2004 03:35 PM 4,313,587 xindice-1.1b3.war
-01/01/2004 03:34 PM 253 xindice-1.1b3.xml
- 3 File(s) 4,778,434 bytes
- 2 Dir(s) 42,307,837,952 bytes free
+ > cd {XINDICE_HOME}
+ > dir xindice-*
+
+ Directory of {XINDICE_HOME}
+
+ 09/27/2007 09:24 PM 628,694 xindice-1.2-dev.jar
+ 09/27/2007 09:24 PM 5,184,315 xindice-1.2-dev.war
+ 09/27/2007 09:24 PM 1,791 xindice-1.2-dev.xml
+ 09/27/2007 09:24 PM 6,535 xindice-dom-1.2-dev.jar
+ 4 File(s) 5,821,335 bytes
+ 0 Dir(s) 3,745,992,704 bytes free
-D:\xindice\current\xml-xindice>copy dist\xindice-1.1b3.war
%CATALINA_HOME%\webapp
-s\xindice.war
+ > copy xindice-1.2-dev.war %CATALINA_HOME%\webapps\xindice.war
1 file(s) copied.
-
-D:\xindice\current\xml-xindice>
</source>
- <note>
- In this example, I have built Xindice in
<code>D:\xindice\current</code>.
- If you compile the source in another location, just substitute that
path for
- <code>D:\xindice\current</code>.
- </note>
<p> </p>
<p>If you are using Linux, your session might resemble:</p>
<source>
[EMAIL PROTECTED]:/local/xml-xindice# ls -oa dist
-total 4668
-drwxr-xr-x 2 root 4096 Nov 25 20:10 .
-drwxr-xr-x 13 root 4096 Nov 25 00:01 ..
--rw-r--r-- 1 root 464594 Jan 1 15:34 xindice-1.1b3.jar
--rw-r--r-- 1 root 4313587 Jan 1 15:35 xindice-1.1b3.war
--rw-r--r-- 1 root 253 Jan 1 15:34 xindice-1.1b3.xml
[EMAIL PROTECTED]:/local/xml-xindice# cp dist/xindice-1.1b3.war
$CATALINA_HOME/webapps/xindice.war
[EMAIL PROTECTED]:/local/xml-xindice#
+ $ cd {XINDICE_HOME}
+ $ ls xindice-*
+ xindice-1.2-dev.jar xindice-1.2-dev.war xindice-1.2-dev.xml
xindice-dom-1.2-dev.jar
+ $ cp xindice-1.2-dev.war $CATALINA_HOME/webapps/xindice.war
</source>
- <note>
- In this Linux session, the Xindice root directory is in
- <code>/local/xml-xindice</code>. You should substitute your actual
- <code>XINDICE_HOME</code> path for <code>/local/xml-xindice</code>.
- </note>
</section>
<section>
@@ -132,7 +125,7 @@
Tomcat will automatically deploy copied war file with the default
settings.
To modify those defaults, <code>CATALINA_HOME/conf/server.xml</code>
file
should be edited. Suggested changes for the server.xml file are
contained
- in the <code>XINDICE_HOME/dist/xindice-1.1b3.xml</code> file.
+ in the <code>{XINDICE_HOME}/xindice-1.2-dev.xml</code> file.
</p>
</section>
@@ -145,14 +138,12 @@
</p>
<p>Here's what that looks like in Windows</p>
<source>
-D:\xindice\current\xml-xindice>cd %CATALINA_HOME%\bin
-
-D:\jakarta-tomcat-4.1.12\bin>startup
-Using CATALINA_BASE: D:\jakarta-tomcat-4.1.12
-Using CATALINA_HOME: D:\jakarta-tomcat-4.1.12
-Using CATALINA_TMPDIR: D:\jakarta-tomcat-4.1.12\temp
-Using JAVA_HOME: C:\j2sdk1.4.1_01
-D:\jakarta-tomcat-4.1.12\bin>
+ > cd %CATALINA_HOME%\bin
+ > startup
+ Using CATALINA_BASE: D:\jakarta-tomcat-4.1.12
+ Using CATALINA_HOME: D:\jakarta-tomcat-4.1.12
+ Using CATALINA_TMPDIR: D:\jakarta-tomcat-4.1.12\temp
+ Using JAVA_HOME: C:\j2sdk{JAVA_VERSION}
</source>
<note>
In this example, I have installed Tomcat in
<code>D:\jakarta-tomcat-4.1.12</code>.
@@ -164,12 +155,12 @@
<p> </p>
<p>Here's what that might look like on Linux</p>
<source>
[EMAIL PROTECTED]:/var/tomcat4/bin# ./catalina.sh start
-Using CATALINA_BASE: /var/tomcat4
-Using CATALINA_HOME: /var/tomcat4
-Using CATALINA_TMPDIR: /var/tomcat4/temp
-Using JAVA_HOME: /usr/java/jdk1.3.1_06
[EMAIL PROTECTED]:/var/tomcat4/bin#
+ $ cd $CATALINA_HOME/bin
+ $ ./catalina.sh start
+ Using CATALINA_BASE: /var/tomcat4
+ Using CATALINA_HOME: /var/tomcat4
+ Using CATALINA_TMPDIR: /var/tomcat4/temp
+ Using JAVA_HOME: /usr/java/jdk{JAVA_VERSION}
</source>
<note>
The name of the Tomcat installation directory may differ for your Linux
@@ -237,8 +228,8 @@
<p>
In addition, you should be able to verify that xindice is running by
loading this URL in your browser
<code>http://localhost:8080/xindice</code>.
- If it works, you should see something that says
- "<code>THIS IS AN UGLY DEBUG TOOL!</code>".
+ If it works, you should see the Xindice
+ "<code>List Databases</code>" page which allows you to browse the
contents of the database.
</p>
</section>
<p>