Author: natalia
Date: Mon Nov 26 19:17:10 2007
New Revision: 598506
URL: http://svn.apache.org/viewvc?rev=598506&view=rev
Log:
Added how-tos for 1.2, minor corrections, navigation completely moved to
site.xml
Added:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/
- copied from r598484,
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/
Removed:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/book.xml
xml/xindice/trunk/src/documentation/content/xdocs/dev/book.xml
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-unix.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-windows.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/installation-tomcat.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/upgrading-one-one.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-unix.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-windows.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/installation-tomcat.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-oh.xml
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-one.xml
xml/xindice/trunk/src/documentation/content/xdocs/site.xml
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-unix.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-unix.xml?rev=598506&r1=598505&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-unix.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-unix.xml
Mon Nov 26 19:17:10 2007
@@ -110,8 +110,8 @@
[copy] Copying 65 files to {XINDICE_HOME}/build/classes-tests
jar:
- [jar] Building jar: {XINDICE_HOME}/xindice-1.2-dev.jar
- [jar] Building jar: {XINDICE_HOME}/xindice-dom-1.2-dev.jar
+ [jar] Building jar: {XINDICE_HOME}/xindice-1.1-dev.jar
+ [jar] Building jar: {XINDICE_HOME}/xindice-dom-1.1-dev.jar
bin:
[mkdir] Created dir: {XINDICE_HOME}/build/bin
@@ -119,7 +119,7 @@
war:
[copy] Copying 1 file to {XINDICE_HOME}
- [war] Building war: {XINDICE_HOME}/xindice-1.2-dev.war
+ [war] Building war: {XINDICE_HOME}/xindice-1.1-dev.war
BUILD SUCCESSFUL
Total time: 5 seconds
@@ -135,7 +135,7 @@
<p>If the compile was succeeded, you will find the output files in the
current directory.</p>
<source>
$ ls xindice-*
- xindice-1.2-dev.jar xindice-1.2-dev.war xindice-1.2-dev.xml
xindice-dom-1.2-dev.jar
+ xindice-1.1-dev.jar xindice-1.1-dev.war xindice-1.1-dev.xml
xindice-dom-1.1-dev.jar
</source>
</section>
<section>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-windows.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-windows.xml?rev=598506&r1=598505&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-windows.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/compilation-windows.xml
Mon Nov 26 19:17:10 2007
@@ -113,8 +113,8 @@
[copy] Copying 65 files to {XINDICE_HOME}\build\classes-tests
jar:
- [jar] Building jar: {XINDICE_HOME}\xindice-1.2-dev.jar
- [jar] Building jar: {XINDICE_HOME}\xindice-dom-1.2-dev.jar
+ [jar] Building jar: {XINDICE_HOME}\xindice-1.1-dev.jar
+ [jar] Building jar: {XINDICE_HOME}\xindice-dom-1.1-dev.jar
bin:
[mkdir] Created dir: {XINDICE_HOME}\build\bin
@@ -122,7 +122,7 @@
war:
[copy] Copying 1 file to {XINDICE_HOME}
- [war] Building war: {XINDICE_HOME}\xindice-1.2-dev.war
+ [war] Building war: {XINDICE_HOME}\xindice-1.1-dev.war
BUILD SUCCESSFUL
Total time: 13 seconds
@@ -136,10 +136,10 @@
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
+ 09/27/2007 09:24 PM 628,694 xindice-1.1-dev.jar
+ 09/27/2007 09:24 PM 5,184,315 xindice-1.1-dev.war
+ 09/27/2007 09:24 PM 1,791 xindice-1.1-dev.xml
+ 09/27/2007 09:24 PM 6,535 xindice-dom-1.1-dev.jar
4 File(s) 5,821,335 bytes
0 Dir(s) 3,745,992,704 bytes free
</source>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/installation-tomcat.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/installation-tomcat.xml?rev=598506&r1=598505&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/installation-tomcat.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/installation-tomcat.xml
Mon Nov 26 19:17:10 2007
@@ -27,7 +27,7 @@
-->
<howto>
<header>
- <title>Xindice Tomcat How-To</title>
+ <title>Running Xindice with Tomcat</title>
<version>1.2</version>
<authors>
<person name="Dave Viner" email="[EMAIL PROTECTED]"/>
@@ -99,14 +99,14 @@
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
+ 09/27/2007 09:24 PM 628,694 xindice-1.1-dev.jar
+ 09/27/2007 09:24 PM 5,184,315 xindice-1.1-dev.war
+ 09/27/2007 09:24 PM 1,791 xindice-1.1-dev.xml
+ 09/27/2007 09:24 PM 6,535 xindice-dom-1.1-dev.jar
4 File(s) 5,821,335 bytes
0 Dir(s) 3,745,992,704 bytes free
- > copy xindice-1.2-dev.war %CATALINA_HOME%\webapps\xindice.war
+ > copy xindice-1.1-dev.war %CATALINA_HOME%\webapps\xindice.war
1 file(s) copied.
</source>
<p> </p>
@@ -114,8 +114,8 @@
<source>
$ 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
+ xindice-1.1-dev.jar xindice-1.1-dev.war xindice-1.1-dev.xml
xindice-dom-1.1-dev.jar
+ $ cp xindice-1.1-dev.war $CATALINA_HOME/webapps/xindice.war
</source>
</section>
@@ -125,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}/xindice-1.2-dev.xml</code> file.
+ in the <code>{XINDICE_HOME}/xindice-1.1-dev.xml</code> file.
</p>
</section>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/upgrading-one-one.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/upgrading-one-one.xml?rev=598506&r1=598505&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/upgrading-one-one.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.1/howto/upgrading-one-one.xml
Mon Nov 26 19:17:10 2007
@@ -108,7 +108,7 @@
(If using XINDICE_DB_HOME variable, substitute 'db' with
'$XINDICE_DB_HOME/db'.)
</li>
<li>
- Check tool output for any problems. If any of the collections or
indeces could
+ Check tool output for any problems. If any of the collections or
indices could
not be rebuilt to new format, do not panic - just follow an
alternate approach
outlined below.
</li>
@@ -120,7 +120,7 @@
<section>
<title>Alternate Procedure</title>
<p>
- If any of the collections or indeces could not be converted to new
format,
+ If any of the collections or indices could not be converted to new
format,
follow these steps. To migrate collections over to the new database:
</p>
<ul>
@@ -166,17 +166,17 @@
</li>
</ul>
<p>
- For indeces which can not be converted:
+ For indices which can not be converted:
</p>
<ul>
<li>
Start new database.
</li>
<li>
- Drop corrupted indeces.
+ Drop corrupted indices.
</li>
<li>
- Recreate indeces anew.
+ Recreate indices anew.
</li>
</ul>
</section>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-unix.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-unix.xml?rev=598506&r1=598484&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-unix.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-unix.xml
Mon Nov 26 19:17:10 2007
@@ -45,7 +45,7 @@
</purpose>
<prerequisites title="Prerequisites">
<p>
- Obtain a working version of the JDK 1.3 or higher. You can get the jdk
+ Obtain a working version of the JDK 1.4 or higher. You can get the jdk
from lots of places, one of which is <fork
href="http://java.sun.com/j2se/downloads.html";>Sun</fork>.
</p>
<p>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-windows.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-windows.xml?rev=598506&r1=598484&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-windows.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/compilation-windows.xml
Mon Nov 26 19:17:10 2007
@@ -48,7 +48,7 @@
</purpose>
<prerequisites title="Prerequisites">
<p>
- Obtain a working version of the JDK 1.3 or higher. You can get the jdk
+ Obtain a working version of the JDK 1.4 or higher. You can get the jdk
from lots of places, one of which is <fork
href="http://java.sun.com/j2se/downloads.html";>Sun</fork>.
</p>
<p>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/installation-tomcat.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/installation-tomcat.xml?rev=598506&r1=598484&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/installation-tomcat.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/installation-tomcat.xml
Mon Nov 26 19:17:10 2007
@@ -27,7 +27,7 @@
-->
<howto>
<header>
- <title>Xindice Tomcat How-To</title>
+ <title>Running Xindice with Tomcat</title>
<version>1.2</version>
<authors>
<person name="Dave Viner" email="[EMAIL PROTECTED]"/>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-oh.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-oh.xml?rev=598506&r1=598484&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-oh.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-oh.xml
Mon Nov 26 19:17:10 2007
@@ -37,7 +37,7 @@
<audience title="Intended audience">
<p>
This How-to is aimed at developers or administrator performing
- upgrade of 1.0 release of Xindice to the final 1.1 release.
+ upgrade of 1.0 release of Xindice to the latest 1.2 release.
</p>
</audience>
@@ -54,18 +54,18 @@
<section>
<title>Overview</title>
<p>
- Xindice 1.0 and 1.1 have significant differences, namely:
+ Xindice 1.0 and 1.2 have significant differences, namely:
</p>
<ul>
<li>
<strong>Transport.</strong> Xindice 1.0 used CORBA for
communications between
- clients and the server. Xindice 1.1 uses <link
href="http://www.xmlrpc.com/";>XML-RPC</link>
+ clients and the server. Xindice 1.2 uses <link
href="http://www.xmlrpc.com/";>XML-RPC</link>
instead, which is a lightweight XML over HTTP communication
protocol. Due to
cross platform nature of XML-RPC, clients in Perl or PHP can be
easily written
- for the Xindice 1.1.
+ for the Xindice 1.2.
</li>
<li>
- <strong>XMLObjects.</strong> Xindice 1.1 does not have support for
Xindice 1.0
+ <strong>XMLObjects.</strong> Xindice 1.2 does not have support for
Xindice 1.0
XMLObjects.
</li>
</ul>
Modified:
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-one.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-one.xml?rev=598506&r1=598484&r2=598506&view=diff
==============================================================================
---
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-one.xml
(original)
+++
xml/xindice/trunk/src/documentation/content/xdocs/1.2/howto/upgrading-one-one.xml
Mon Nov 26 19:17:10 2007
@@ -26,7 +26,7 @@
-->
<howto>
<header>
- <title>Xindice Release 1.1b1 Through 1.1b4 Upgrading How-To</title>
+ <title>Xindice Release 1.1b1 Through 1.1b4 and 1.1 Upgrading How-To</title>
<version>$Revision$</version>
<authors>
<person name="Vadim Gritsenko" email="[EMAIL PROTECTED]"/>
@@ -37,7 +37,8 @@
<audience title="Intended audience">
<p>
This How-to is aimed at developers or administrator performing
- upgrade of one of 1.1 beta releases of Xindice to the final 1.1 release.
+ upgrade of one of 1.1 beta releases or 1.1 final release of Xindice
+ to the latest 1.2 release.
</p>
</audience>
@@ -77,6 +78,10 @@
a way to start Xindice database with embedded HTTP server (Jetty).
</li>
</ul>
+ <p>
+ There are no format or layout differences between 1.1 final release
and the latest
+ 1.2 release.
+ </p>
</section>
<section>
@@ -86,7 +91,9 @@
</p>
<ul>
<li>
- Install Xindice 1.1 release.
+ Install Xindice 1.2 release. If you are upgrading from 1.1 final
release, this is
+ the only step you need to perform. If you are upgrading from one of
the beta
+ releases, please follow the following steps.
</li>
<li>
Point XINDICE_HOME environment variable to the Xindice installation
directory.
@@ -108,7 +115,7 @@
(If using XINDICE_DB_HOME variable, substitute 'db' with
'$XINDICE_DB_HOME/db'.)
</li>
<li>
- Check tool output for any problems. If any of the collections or
indeces could
+ Check tool output for any problems. If any of the collections or
indices could
not be rebuilt to new format, do not panic - just follow an
alternate approach
outlined below.
</li>
@@ -120,7 +127,7 @@
<section>
<title>Alternate Procedure</title>
<p>
- If any of the collections or indeces could not be converted to new
format,
+ If any of the collections or indices could not be converted to new
format,
follow these steps. To migrate collections over to the new database:
</p>
<ul>
@@ -166,17 +173,17 @@
</li>
</ul>
<p>
- For indeces which can not be converted:
+ For indices which can not be converted:
</p>
<ul>
<li>
Start new database.
</li>
<li>
- Drop corrupted indeces.
+ Drop corrupted indices.
</li>
<li>
- Recreate indeces anew.
+ Recreate indices anew.
</li>
</ul>
</section>
Modified: xml/xindice/trunk/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/src/documentation/content/xdocs/site.xml?rev=598506&r1=598505&r2=598506&view=diff
==============================================================================
--- xml/xindice/trunk/src/documentation/content/xdocs/site.xml (original)
+++ xml/xindice/trunk/src/documentation/content/xdocs/site.xml Mon Nov 26
19:17:10 2007
@@ -100,12 +100,61 @@
</menu>
<menu label="Upgrading">
- <menu-item label="1.1b1 and up" href="1.1/howto/upgrading-one-one.html"/>
- <menu-item label="1.0" href="1.1/howto/upgrading-one-oh.html"/>
+ <menu-item label="From 1.1b1 and up"
href="1.1/howto/upgrading-one-one.html"/>
+ <menu-item label="From 1.0" href="1.1/howto/upgrading-one-oh.html"/>
</menu>
</menu>
<menu label="Resources" tab="1.1">
<menu-item label="XML:DB Initiative"
href="http://xmldb-org.sourceforge.net/"/>
+ </menu>
+ <menu label="Overview" tab="1.2">
+ <menu-item label="Overview" href="1.2/index.html"/>
+ </menu>
+ <menu label="Documentation" tab="1.2">
+ <menu-item label="Administrator Guide"
href="1.2/guide-administrator.html"/>
+ <menu-item label="User Guide" href="1.2/guide-user.html"/>
+ <menu-item label="Developer Guide" href="1.2/guide-developer.html"/>
+ <menu-item label="Tool Guide" href="1.2/guide-tools.html"/>
+ <menu-item label="XPath Guide" href="1.2/guide-xpath.html"/>
+ <menu-item label="FAQ" href="1.2/faq.html"/>
+ <menu-item label="Wiki" href="http://wiki.apache.org/xindice"/>
+ <external label="Javadocs" href="ext:api-1.2"/>
+ </menu>
+ <menu label="How-Tos" tab="1.2">
+ <menu-item label="Overview" href="1.2/howto/index.html"/>
+
+ <menu label="Compilation">
+ <menu-item label="Unix" href="1.2/howto/compilation-unix.html"/>
+ <menu-item label="Windows" href="1.2/howto/compilation-windows.html"/>
+ </menu>
+
+ <menu label="Installation">
+ <menu-item label="Tomcat How-to"
href="1.2/howto/installation-tomcat.html"/>
+ </menu>
+
+ <menu label="Upgrading">
+ <menu-item label="From 1.1b1 and up"
href="1.2/howto/upgrading-one-one.html"/>
+ <menu-item label="From 1.0" href="1.2/howto/upgrading-one-oh.html"/>
+ </menu>
+ </menu>
+ <menu label="Resources" tab="1.2">
+ <menu-item label="XML:DB Initiative"
href="http://xmldb-org.sourceforge.net/"/>
+ </menu>
+ <menu label="Dev Zone" tab="dev">
+ <menu-item label="Overview" href="dev/index.html"/>
+ <menu-item label="News" href="dev/news.html"/>
+ <menu-item label="Todo" href="dev/todo.html"/>
+ </menu>
+ <menu label="Resources" tab="dev">
+ <menu-item label="Bug Database"
href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=specific&bug_status=__open__&product=Xindice&order=bugs.bug_id"/>
+ <menu-item label="Test Coverage"
href="http://xml.apache.org/xindice/coverage/"/>
+ <menu-item label="Historical Coverage"
href="http://xml.apache.org/xindice/coverage/historical.html"/>
+ </menu>
+ <menu label="Documentation" tab="dev">
+ <menu-item label="Xindice Internals" href="dev/guide-internals.html"/>
+ <menu-item label="Xindice Wiki" href="http://wiki.apache.org/xindice"/>
+ <menu-item label="Contributing Documentation"
href="doc-contributing.html"/>
+ <menu-item label="Updating Website" href="dev/site-updating.html"/>
</menu>
<!-- External References (for ext: links) -->
