You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by ks...@apache.org on 2002/07/11 06:37:03 UTC
cvs commit: xml-xindice/java/src/org/apache/xindice/tools DeploymentTask.java XMLTools.java XMLAdminTools.java
kstaken 2002/07/10 21:37:03
Modified: . build.xml start
bin .cmdwrapper
config commands.xml system.xml
docs INSTALL INSTALL.windows README
docs/src AdministratorsGuide.xml DevelopersGuide.xml
ToolsReference.xml UsersGuide.xml
java/src/org/apache/xindice/tools DeploymentTask.java
XMLTools.java
Removed: bin xindiceadmin.bat
java/src/org/apache/xindice/tools XMLAdminTools.java
Log:
Removing xindiceadmin
Revision Changes Path
1.14 +1 -6 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 4 Apr 2002 08:04:53 -0000 1.13
+++ build.xml 11 Jul 2002 04:37:02 -0000 1.14
@@ -87,9 +87,7 @@
<!-- these should really be links but I'm not sure how to get links using exec
that don't blow up on windows. Documentation on the os string would be nice-->
<copy file="bin/.cmdwrapper" tofile="bin/xindice"/>
- <copy file="bin/.cmdwrapper" tofile="bin/xindiceadmin"/>
<chmod file="bin/xindice" perm="+x"/>
- <chmod file="bin/xindiceadmin" perm="+x"/>
</target>
<!-- =================================================================== -->
@@ -413,7 +411,6 @@
<chmod file="${distrib.file}/bin/antRun" perm="+x"/>
<chmod file="${distrib.file}/bin/.cmdwrapper" perm="+x"/>
<chmod file="${distrib.file}/bin/xindice" perm="+x"/>
- <chmod file="${distrib.file}/bin/xindiceadmin" perm="+x"/>
<chmod file="${distrib.file}/java/examples/guide/run" perm="+x"/>
<chmod file="${distrib.file}/java/examples/api/run" perm="+x"/>
@@ -430,7 +427,6 @@
<include name="${distrib.file}/bin/antRun"/>
<include name="${distrib.file}/bin/.cmdwrapper"/>
<include name="${distrib.file}/bin/xindice"/>
- <include name="${distrib.file}/bin/xindiceadmin"/>
</tarfileset>
<tarfileset dir="${distrib.file}/..">
<include name="${distrib.file}/**"/>
@@ -440,7 +436,6 @@
<exclude name="${distrib.file}/bin/antRun"/>
<exclude name="${distrib.file}/bin/.cmdwrapper"/>
<exclude name="${distrib.file}/bin/xindice"/>
- <exclude name="${distrib.file}/bin/xindiceadmin"/>
</tarfileset>
</tar>
1.4 +1 -1 xml-xindice/start
Index: start
===================================================================
RCS file: /home/cvs/xml-xindice/start,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- start 22 Mar 2002 06:31:30 -0000 1.3
+++ start 11 Jul 2002 04:37:02 -0000 1.4
@@ -51,7 +51,7 @@
INSTANCES="`cat $XINDICE_HOME/config/instances.cfg`"
for instance in $INSTANCES
do
- $XINDICE_HOME/bin/xindiceadmin shutdown -c /$instance 1> /dev/null 2> /dev/null
+ $XINDICE_HOME/bin/xindice shutdown -c /$instance 1> /dev/null 2> /dev/null
done
}
1.4 +1 -2 xml-xindice/bin/.cmdwrapper
Index: .cmdwrapper
===================================================================
RCS file: /home/cvs/xml-xindice/bin/.cmdwrapper,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cmdwrapper 22 Mar 2002 06:31:30 -0000 1.3
+++ .cmdwrapper 11 Jul 2002 04:37:02 -0000 1.4
@@ -29,8 +29,7 @@
fi
case $CMD_NAME in
- xindice) CLASS_NAME="org.apache.xindice.tools.XMLUserTools" ;;
- xindiceadmin) CLASS_NAME="org.apache.xindice.tools.XMLAdminTools" ;;
+ xindice) CLASS_NAME="org.apache.xindice.tools.XMLTools" ;;
*) echo "Error mapping command link to Java class"
exit 1 ;;
esac
1.2 +2 -4 xml-xindice/config/commands.xml
Index: commands.xml
===================================================================
RCS file: /home/cvs/xml-xindice/config/commands.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commands.xml 6 Dec 2001 19:33:45 -0000 1.1
+++ commands.xml 11 Jul 2002 04:37:02 -0000 1.2
@@ -10,7 +10,7 @@
$Id$
-->
<commands>
- <admin>
+ <user>
<command switch="ac"
name="add_collection"
class="org.apache.xindice.tools.command.AddCollection"
@@ -56,8 +56,6 @@
class="org.apache.xindice.tools.command.Shutdown"
helpclass="security"
description="Shuts down the Xindice Server" />
- </admin>
- <user>
<command switch="ad"
name="add_document"
class="org.apache.xindice.tools.command.AddDocument"
1.4 +3 -2 xml-xindice/config/system.xml
Index: system.xml
===================================================================
RCS file: /home/cvs/xml-xindice/config/system.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system.xml 3 May 2002 16:29:02 -0000 1.3
+++ system.xml 11 Jul 2002 04:37:02 -0000 1.4
@@ -90,6 +90,7 @@
<resources class="org.apache.xindice.server.standard.StdResourceManager" vulture="20" />
<files chunksize="32768" class="org.apache.xindice.server.standard.StdFileManager" maxbytes="131072" minbytes="0" tmpdir="./tmp/" />
<components class="org.apache.xindice.server.standard.StdComponentManager">
+ <component class="org.apache.xindice.server.rpc.RPCMessageHandler" name="RPCHandler"/>
<component browse="yes" class="org.apache.xindice.server.methods.GET" defaulticon="/icons/file.gif" foldericon="/icons/folder.gif" folderupicon="/icons/folderup.gif" index="index.html" name="GET" spacericon="/icons/spacer.gif">
<icons>
<icon ext="txt" path="/icons/text.gif" />
@@ -100,8 +101,8 @@
<icon ext="png" path="/icons/image.gif" />
</icons>
</component>
- <component class="org.apache.xindice.server.rpc.RPCMessageHandler"
- name="RPCHandler"/>
+ <!--component class="org.apache.xindice.server.rpc.RPCMessageHandler"
+ name="RPCHandler"/-->
</components>
<scripts class="org.apache.xindice.server.standard.StdScriptManager" exceptions="yes" scriptdir="./scripts/" stablescripts="yes" />
</server>
1.6 +6 -6 xml-xindice/docs/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/xml-xindice/docs/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALL 2 Feb 2002 01:22:20 -0000 1.5
+++ INSTALL 11 Jul 2002 04:37:02 -0000 1.6
@@ -1,4 +1,4 @@
-See docs/LICENSE for The Xindice License
+xindiceSee docs/LICENSE for The Xindice License
Xindice Version 1.0 UNIX installation.
@@ -20,8 +20,8 @@
you would set XINDICE_HOME=/usr/local/Xindice
3. Add the $XINDICE_HOME/bin directory to your PATH environment variable. This
- will enable you to run the xindice and xindiceadmin command line tools
- without specifying the full path.
+ will enable you to run the xindice command line tool without specifying the
+ full path.
4. Start the Xindice server.
@@ -35,7 +35,7 @@
running the examples.
Type:
- xindiceadmin ac -c /db -n addressbook
+ xindice ac -c /db -n addressbook
If it worked successfully you should see
@@ -78,8 +78,8 @@
you would set XINDICE_HOME=/usr/local/Xindice
4. Add the $XINDICE_HOME/bin directory to your PATH environment variable. This
- will enable you to run the xindice and xindiceadmin command line tools
- without specifying the full path.
+ will enable you to run the xindice command line tool without specifying the
+ full path.
5. You are now prepared to build.
1.6 +2 -2 xml-xindice/docs/INSTALL.windows
Index: INSTALL.windows
===================================================================
RCS file: /home/cvs/xml-xindice/docs/INSTALL.windows,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALL.windows 2 Feb 2002 01:22:20 -0000 1.5
+++ INSTALL.windows 11 Jul 2002 04:37:02 -0000 1.6
@@ -39,7 +39,7 @@
running the examples.
Type:
- xindiceadmin ac -c /db -n addressbook
+ xindice ac -c /db -n addressbook
If it worked successfully you should see
@@ -107,7 +107,7 @@
running the examples.
Type:
- xindiceadmin ac -c /db -n addressbook
+ xindice ac -c /db -n addressbook
If it worked successfully you should see
1.5 +22 -0 xml-xindice/docs/README
Index: README
===================================================================
RCS file: /home/cvs/xml-xindice/docs/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README 14 Mar 2002 06:15:16 -0000 1.4
+++ README 11 Jul 2002 04:37:02 -0000 1.5
@@ -40,6 +40,28 @@
Release Notes
-------------
+Apache Xindice Version 1.1
+=============================
+
+- The network access API is now based on XML-RPC rather then
+ CORBA. This was done for simplification and to eliminate the
+ constant problems with the CORBA ORB and consumption of
+ resources. It also was done to address UTF-8 encoding issues
+ that were present with CORBA.
+
+- The server should now fully support the storage and retrieval
+ of documents encoded as UTF-8.
+
+- The xindiceadmin tools has been removed. All commands the were
+ previously only accessible through xindiceadmin are now
+ available through the xindice command. This should make working
+ working with the server a little simpler.
+
+- An option was added to the command line tools to allow the
+ specification of namespaces to be used with XPath queries.
+ This option is -s. Refer to the Tools Reference document for
+ more information.
+
Apache Xindice Version 1.0
=============================
This is the first production release of Xindice. Changes from the
1.6 +16 -16 xml-xindice/docs/src/AdministratorsGuide.xml
Index: AdministratorsGuide.xml
===================================================================
RCS file: /home/cvs/xml-xindice/docs/src/AdministratorsGuide.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AdministratorsGuide.xml 14 Mar 2002 06:15:16 -0000 1.5
+++ AdministratorsGuide.xml 11 Jul 2002 04:37:02 -0000 1.6
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+xindice<?xml version="1.0" encoding="utf-8"?>
<!--DOCTYPE book
PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.7//EN"
"http://nwalsh.com/docbook/xml/3.1.7/docbookx.dtd"-->
<book id="admin-guide">
<bookinfo>
- <title>Xindice Administration 0.6</title>
+ <title>Xindice Administration 0.6.1</title>
<author>
<surname>Staken</surname>
<firstname>Kimbro</firstname>
@@ -35,7 +35,7 @@
</docinfo>
<para>
Database administration of Xindice is accomplished from the command
- line using the <command>xindiceadmin</command> command. This command
+ line using the <command>xindice</command> command. This command
allows you to view and alter the database configuration on the fly
on a running system. A complete list of available commands and more
detail about each command can be found in the <ulink
@@ -52,7 +52,7 @@
Adds a collection named products under the collection /db/data.
</para>
<screen>
-xindiceadmin add_collection -c /db/data -n products
+xindice add_collection -c /db/data -n products
</screen>
</example>
<example>
@@ -61,7 +61,7 @@
Deletes the collection named products from the collection /db/data.
</para>
<screen>
-xindiceadmin delete_collection -c /db/data/products
+xindice delete_collection -c /db/data/products
</screen>
</example>
<example>
@@ -71,7 +71,7 @@
collection /db/data
</para>
<screen>
-xindiceadmin list_collections -c /db/data
+xindice list_collections -c /db/data
</screen>
</example>
</sect1>
@@ -86,7 +86,7 @@
result node-set.
</para>
<para>
- Indexes can be added using the <command>xindiceadmin</command>
+ Indexes can be added using the <command>xindice</command>
command.
</para>
<example>
@@ -108,7 +108,7 @@
elements in the collection /db/data/catalog.
</para>
<screen>
-xindiceadmin add_indexer -c /db/data/catalog -n idindex -p product_id
+xindice add_indexer -c /db/data/catalog -n idindex -p product_id
</screen>
<para>
Once this is done the query engine will now use this index to
@@ -162,8 +162,8 @@
all attributes of all elements.
</para>
<screen>
-xindiceadmin add_collection_indexer -c /db/data/catalog -n idindex -p '*'
-xindiceadmin add_collection_indexer -c /db/data/catalog -n idindex -p '*@*'
+xindice add_collection_indexer -c /db/data/catalog -n idindex -p '*'
+xindice add_collection_indexer -c /db/data/catalog -n idindex -p '*@*'
</screen>
</example>
@@ -220,7 +220,7 @@
is in your path.
</para>
<screen>
- xindiceadmin shutdown -c /db
+ xindice shutdown -c /db
</screen>
</example>
</sect1>
@@ -243,7 +243,7 @@
</para>
<screen>
cd Xindice
- xindiceadmin shutdown
+ xindice shutdown
cp -pr db /backup/db
./start
</screen>
@@ -258,7 +258,7 @@
</para>
<screen>
cd Xindice
- xindiceadmin shutdown
+ xindice shutdown
rm -rf db
cp -pr /backup/db db
./start
@@ -281,7 +281,7 @@
is in your path.
</para>
<screen>
- xindiceadmin export -c /db/root -f /path/to/data
+ xindice export -c /db/root -f /path/to/data
</screen>
<para>
The entire contents of the collection /db/root will be exported to the
@@ -295,7 +295,7 @@
is in your path.
</para>
<screen>
- xindiceadmin import -c /db -f /path/to/data/root
+ xindice import -c /db -f /path/to/data/root
</screen>
<para>
Each directory under /path/to/data will be used to create a collection and
1.7 +6 -6 xml-xindice/docs/src/DevelopersGuide.xml
Index: DevelopersGuide.xml
===================================================================
RCS file: /home/cvs/xml-xindice/docs/src/DevelopersGuide.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DevelopersGuide.xml 14 Mar 2002 06:15:16 -0000 1.6
+++ DevelopersGuide.xml 11 Jul 2002 04:37:02 -0000 1.7
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+xindice<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/css" href="docbook.css" ?>
<!DOCTYPE book
@@ -7,7 +7,7 @@
<book id="developers-guide">
<bookinfo>
- <title>Xindice Developers Guide 0.7</title>
+ <title>Xindice Developers Guide 0.7.1</title>
<author>
<surname>Staken</surname>
<firstname>Kimbro</firstname>
@@ -291,7 +291,7 @@
the collection. To create it just run:
</para>
<screen>
-xindiceadmin ac -c /db -n addressbook
+xindice ac -c /db -n addressbook
</screen>
<para>
Now that we have the collection, we can add a few example documents
@@ -1281,7 +1281,7 @@
<filename>/db/addressbook</filename> collection.
</para>
<screen>
-xindiceadmin add_xmlobject -i org.apache.xindice.examples.HelloWorldXMLObject -n Hello -c /db/addressbook
+xindice add_xmlobject -i org.apache.xindice.examples.HelloWorldXMLObject -n Hello -c /db/addressbook
</screen>
<para>
And then you can run it.
@@ -1406,7 +1406,7 @@
<computeroutput>addressbook</computeroutput> collection.
</para>
<screen>
-xindiceadmin add_xmlobject -i org.apache.xindice.examples.XPathQueryXMLObject -n XPath -c /db/addressbook
+xindice add_xmlobject -i org.apache.xindice.examples.XPathQueryXMLObject -n XPath -c /db/addressbook
</screen>
<para>
Before we can use it though we need some sample data. Again we're
1.6 +26 -26 xml-xindice/docs/src/ToolsReference.xml
Index: ToolsReference.xml
===================================================================
RCS file: /home/cvs/xml-xindice/docs/src/ToolsReference.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ToolsReference.xml 2 Jul 2002 08:50:37 -0000 1.5
+++ ToolsReference.xml 11 Jul 2002 04:37:03 -0000 1.6
@@ -5,7 +5,7 @@
<book id="tools-reference">
<bookinfo>
- <title>Xindice Command Line Tools Reference 0.9.1</title>
+ <title>Xindice Command Line Tools Reference 0.9.2</title>
<author>
<surname>Kalafus</surname>
<firstname>Jay</firstname>
@@ -49,7 +49,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin add_collection</command>
+ <command>xindice add_collection</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-n <replaceable>name</replaceable></arg>
<arg choice="opt">-v <replaceable></replaceable></arg>
@@ -83,13 +83,13 @@
<example>
<title>Creating a Top Level Collection</title>
<screen>
- xindiceadmin add_collection -c /db -n pebbles
+ xindice add_collection -c /db -n pebbles
</screen>
</example>
<example>
<title>Creating a Sub Collection Under an Existing Collection</title>
<screen>
- xindiceadmin add_collection -c /db/pebbles -n boulder
+ xindice add_collection -c /db/pebbles -n boulder
</screen>
</example>
</sect1>
@@ -104,7 +104,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin delete_collection</command>
+ <command>xindice delete_collection</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-n <replaceable>name</replaceable></arg>
<arg choice="opt">-y <replaceable></replaceable></arg>
@@ -141,13 +141,13 @@
<example>
<title>Deleting a Top Level Collection</title>
<screen>
- xindiceadmin delete_collection -c /db -n pebbles
+ xindice delete_collection -c /db -n pebbles
</screen>
</example>
<example>
<title>Deleting a Sub Collection</title>
<screen>
- xindiceadmin delete_collection -c /db/pebbles -n boulder
+ xindice delete_collection -c /db/pebbles -n boulder
</screen>
</example>
</sect1>
@@ -443,7 +443,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin import</command>
+ <command>xindice import</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-f <replaceable>file path and name </replaceable></arg>
<arg choice="opt">-e <replaceable>file extenstion </replaceable></arg>
@@ -480,13 +480,13 @@
<example>
<title>Importing all directories and documents</title>
<screen>
- xindiceadmin import -c /db/pebbles -f /tmp/flintstones
+ xindice import -c /db/pebbles -f /tmp/flintstones
</screen>
</example>
<example>
<title>Importing all directories and documents with an extension of ".xml" </title>
<screen>
- xindiceadmin import -c /db/pebbles -f /tmp/flintstones -e xml
+ xindice import -c /db/pebbles -f /tmp/flintstones -e xml
</screen>
</example>
</sect1>
@@ -558,7 +558,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin add_xmlobject</command>
+ <command>xindice add_xmlobject</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-i <replaceable>implementing class</replaceable></arg>
<arg choice="req">-n <replaceable>object name </replaceable></arg>
@@ -595,13 +595,13 @@
<example>
<title>Create a XMLObject in the pebbles collection </title>
<screen>
- xindiceadmin add_xmlobject -c /db/pebbles -i example.XmlRockObject -n rockXMLObject
+ xindice add_xmlobject -c /db/pebbles -i example.XmlRockObject -n rockXMLObject
</screen>
</example>
<example>
<title>Create a XMLObject in a sub collection</title>
<screen>
- xindiceadmin add_xmlobject -c /db/pebbles/boulder -i example.XmlRockObject -n rockXMLObject
+ xindice add_xmlobject -c /db/pebbles/boulder -i example.XmlRockObject -n rockXMLObject
</screen>
</example>
</sect1>
@@ -615,7 +615,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin delete_xmlobject</command>
+ <command>xindice delete_xmlobject</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-n <replaceable>name </replaceable></arg>
<arg choice="opt">-v <replaceable></replaceable></arg>
@@ -648,13 +648,13 @@
<example>
<title>Delete an XMLObject in the pebbles collection </title>
<screen>
- xindiceadmin delete_xmlobject -c /db/pebbles -n rockXMLObject
+ xindice delete_xmlobject -c /db/pebbles -n rockXMLObject
</screen>
</example>
<example>
<title>Delete an XMLObject from the boulder sub collection</title>
<screen>
- xindiceadmin delete_xmlobject -c /db/pebbles/boulder -n rockXMLObject
+ xindice delete_xmlobject -c /db/pebbles/boulder -n rockXMLObject
</screen>
</example>
</sect1>
@@ -785,7 +785,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin add_indexer</command>
+ <command>xindice add_indexer</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-n <replaceable>index name </replaceable></arg>
<arg choice="req">-p <replaceable>index pattern</replaceable></arg>
@@ -845,13 +845,13 @@
<example>
<title>To create a collection index in the pebbles collection for docuemnts with a "rock" element</title>
<screen>
- xindiceadmin add_indexer -c /db/pebbles -n rockindex -p rock
+ xindice add_indexer -c /db/pebbles -n rockindex -p rock
</screen>
</example>
<example>
<title>To create a collection index in the boulder sub collection for documents containing a rock elements with an attribute of "hard"</title>
<screen>
- xindiceadmin add_indexer -c /db/pebbles/boulder -n hardindex -p rock@type
+ xindice add_indexer -c /db/pebbles/boulder -n hardindex -p rock@type
</screen>
</example>
</sect1>
@@ -865,7 +865,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin delete_indexer</command>
+ <command>xindice delete_indexer</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="req">-n <replaceable>index name</replaceable></arg>
<arg choice="opt">-v <replaceable></replaceable></arg>
@@ -898,7 +898,7 @@
<example>
<title>Delete a collecion index in the pebbles collection</title>
<screen>
- xindiceadmin delete_indexer -c /db/pebbles -n hardindex
+ xindice delete_indexer -c /db/pebbles -n hardindex
</screen>
</example>
</sect1>
@@ -912,7 +912,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin list_indexers</command>
+ <command>xindice list_indexers</command>
<arg choice="req">-c <replaceable>context</replaceable></arg>
<arg choice="opt">-v <replaceable></replaceable></arg>
</cmdsynopsis>
@@ -941,7 +941,7 @@
<example>
<title>To list all collection indexes from the pebbles collection </title>
<screen>
- xindiceadmin list_indexers -c /db/pebbles
+ xindice list_indexers -c /db/pebbles
</screen>
</example>
</sect1>
@@ -1030,7 +1030,7 @@
<bridgehead renderas="sect2">Summary:</bridgehead>
<cmdsynopsis>
- <command>xindiceadmin shutdown</command>
+ <command>xindice shutdown</command>
<arg choice="opt">-v <replaceable></replaceable></arg>
</cmdsynopsis>
@@ -1055,7 +1055,7 @@
<example>
<title>Shutdown the server </title>
<screen>
- xindiceadmin shutdown
+ xindice shutdown
</screen>
</example>
</sect1>
1.5 +8 -14 xml-xindice/docs/src/UsersGuide.xml
Index: UsersGuide.xml
===================================================================
RCS file: /home/cvs/xml-xindice/docs/src/UsersGuide.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UsersGuide.xml 14 Mar 2002 06:15:16 -0000 1.4
+++ UsersGuide.xml 11 Jul 2002 04:37:03 -0000 1.5
@@ -5,7 +5,7 @@
<book id="users-guide">
<bookinfo>
- <title>Xindice Users Guide 0.7</title>
+ <title>Xindice Users Guide 0.7.1</title>
<author>
<surname>Staken</surname>
<firstname>Kimbro</firstname>
@@ -255,22 +255,16 @@
<sect1>
<title>Introducing the Command Line Tools</title>
<para>
- The Xindice server includes two command line programs that can be used
- to work with the server. The two tools are the
- <command>xindice</command> command and the
- <command>xindiceadmin</command> command. The <command>xindice</command>
- command is intended for use by end
- users and the <command>xindiceadmin</command> tool is for use by
- admininistrators. All
- commands that are available through the <command>xindice</command>
- command are also
- available to the <command>xindiceadmin</command> command. A complete
- list of available commands and more
+ The Xindice server includes a command line program named
+ <command>xindice</command> that allows you to manage the
+ data stored in the server.
+ A complete list of available commands and more
detail about each command can be found in the <ulink
url="ToolsReference.html">Command Line Tools Reference Guide</ulink>.
</para>
<para>
- The commands are located in the Xindice-Core/bin directory and it is
+ The <command>xindice</command> tool is located in the
+ Xindice-Core/bin directory and it is
probably a good idea to add this directory to your PATH environment
variable. All examples in this manual will assume that the
Xindice-Core/bin directory is on the operating system path.
1.2 +3 -3 xml-xindice/java/src/org/apache/xindice/tools/DeploymentTask.java
Index: DeploymentTask.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/tools/DeploymentTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeploymentTask.java 6 Dec 2001 19:33:56 -0000 1.1
+++ DeploymentTask.java 11 Jul 2002 04:37:03 -0000 1.2
@@ -75,13 +75,13 @@
private String collection = "test/ocs";
private String db = "Database";
private String home = "";
- private XMLAdminTools admin = null;
+ private XMLTools admin = null;
/**
* Constructor for creating a new DeploymentTask.
*/
public DeploymentTask() {
- admin = new XMLAdminTools();
+ admin = new XMLTools();
}
/**
1.5 +38 -23 xml-xindice/java/src/org/apache/xindice/tools/XMLTools.java
Index: XMLTools.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/tools/XMLTools.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLTools.java 2 Jul 2002 08:03:07 -0000 1.4
+++ XMLTools.java 11 Jul 2002 04:37:03 -0000 1.5
@@ -89,10 +89,7 @@
* XMLAdmin is designed to take command line arguments and give
* user Xindice management flexibility within the current Database.
*/
-
-abstract class XMLTools {
-
-
+public class XMLTools {
public static final String COLLECTION = "collection";
public static final String EXTENSION = "extension";
public static final String FILE_PATH = "filePath";
@@ -116,12 +113,23 @@
public static final String AUTO_KEY = "autoKey";
public static final String NAMESPACES = "namespaces";
-
-
- private Hashtable table;
- private static boolean verbose = false;
+
+ private Hashtable table;
protected String location = null;
+ private boolean initialized = false;
+ private static boolean verbose = false;
+ public static void main(String[] args) {
+ try {
+ new XMLTools().process(args);
+ }
+ catch (Exception e) {
+ System.out.println(e.getMessage());
+ if (verbose == true) {
+ e.printStackTrace(System.out);
+ }
+ }
+ }
/** Constructor for XMLTools, includes default variables for the command line
*/
@@ -136,9 +144,28 @@
table.put( VERBOSE, "false" );
}
+ protected void initCommandsList() {
+ // Get all user elements
+ NodeList list = getCommandsDocument().getElementsByTagName("user");
+
+ if ( list.getLength() > 0 ) {
+ // Retrieve the index of the first element (<user>)
+ Element node = (Element) list.item(0);
+ // get all command children from the user element
+ list = node.getElementsByTagName( "command" );
+ }
- private boolean initialized = false;
- /**
+ // Return the list generated
+ commandsList = list;
+ }
+
+ /** Return true if this class has admin access
+ */
+ public boolean isAdmin() {
+ return false;
+ }
+
+ /**
* Carries out necessary initialization of this class.
**/
public void init() throws XindiceException, FileNotFoundException {
@@ -159,11 +186,6 @@
DOMParser parser = new DOMParser();
commandsDocument = parser.toDocument( new FileInputStream( commandsFile ) );
}
- /**
- * Carries out the initialization of the Commands List.
- **/
- protected abstract void initCommandsList();
-
private Document commandsDocument = null;
/**
@@ -182,13 +204,6 @@
protected NodeList getCommands() {
return commandsList;
}
-
-
- /**
- * Returns a boolean value stating if this class has admin access.
- **/
- public abstract boolean isAdmin();
-
/**
* The Process function is designed for the implementation of the