vgritsenko 2004/01/31 05:22:54
Modified: src/documentation/content/xdocs guide-developer.xml java/tests/src/org/apache/xindice/core CollectionTest.java java/tests/src/org/apache/xindice/integration/client XmlDbClient.java java/tests/src/org/apache/xindice/integration/client/resources BinaryResourceTest.java Log: Remove filer parameter gzip="true" from everywhere. Actual gzip compression was removed before 1.0b1. Revision Changes Path 1.12 +20 -21 xml-xindice/src/documentation/content/xdocs/guide-developer.xml Index: guide-developer.xml =================================================================== RCS file: /home/cvs/xml-xindice/src/documentation/content/xdocs/guide-developer.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- guide-developer.xml 25 Dec 2003 22:06:48 -0000 1.11 +++ guide-developer.xml 31 Jan 2004 13:22:53 -0000 1.12 @@ -250,7 +250,7 @@ <code>java/examples/guide/xml</code>. Run these commands to add the documents. </p> - <source> + <source> cd $XINDICE_HOME/java/examples/guide/xml xindice ad -c /db/addressbook -f address1.xml -n address1 xindice ad -c /db/addressbook -f address2.xml -n address2 @@ -335,7 +335,7 @@ If all goes well, you should see a result that looks something like this. </p> <source><![CDATA[<?xml version="1.0"?> -<person xmlns:src="http://xml.apache.org/xindice/Query" +<person xmlns:src="http://xml.apache.org/xindice/Query" src:col="/db/addressbook" src:key="address1"> <fname>John</fname> <lname>Smith</lname> @@ -391,7 +391,7 @@ </p> <source> String uri = "xmldb:xindice:///db/addressbook"; -Collection col = +Collection col = DatabaseManager.getCollection(uri); </source> <p> @@ -534,7 +534,7 @@ name. Xindice assumes that the server will be deployed under <code>/xindice</code> servlet context. To do this, you just need to rename Xindice WAR file to <code>xindice.war</code>, and deploy this renamed WAR - file. Alternatively, you need to specify system property + file. Alternatively, you need to specify system property <code>xindice.xmlrpc.service-location</code>, or set property <code>service-location</code> on the <code>Database</code> XML:DB object right after its creation. @@ -593,7 +593,7 @@ import org.apache.xindice.xml.dom.*; public class CreateCollection { - + public static void main(String[] args) throws Exception { Collection col = null; try { @@ -613,12 +613,11 @@ // Build up the Collection XML configuration. String collectionConfig = "<collection compressed=\"true\" " + - " name=\"" + collectionName + "\">" + - " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\" "+ - " gzip=\"true\"/>" + + " name=\"" + collectionName + "\">" + + " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\"/>" + "</collection>"; - service.createCollection(collectionName, + service.createCollection(collectionName, DOMParser.toDocument(collectionConfig)); System.out.println("Collection " + collectionName + " created."); @@ -714,7 +713,7 @@ String data = readFileFromDisk(args[0]); - XMLResource document = + XMLResource document = (XMLResource) col.createResource(null,"XMLResource"); document.setContent(data); col.storeResource(document); @@ -911,7 +910,7 @@ Database database = (Database) c.newInstance(); DatabaseManager.registerDatabase(database); - col = + col = DatabaseManager.getCollection("xmldb:xindice:///db/addressbook"); String xpath = "//person[fname='John']"; @@ -1119,7 +1118,7 @@ has a MetaData object associated with it. The MetaData object is composed of three sections and is represented in XML like this: </p> - <source><![CDATA[ + <source><![CDATA[ <meta> <system type="doc"> <attr name="created" value="10128378882" /> @@ -1167,7 +1166,7 @@ </p> <p> If properly configured, when you restart your container, you will see a - log message that looks like this: + log message that looks like this: </p> <source> Dec 30, 2002 10:21:51 AM org.apache.xindice.core.Database setConfig @@ -1188,7 +1187,7 @@ series of states through which it must pass. The states might be controlled by a finite state machine, but each document's current state would be stored in the metadata associated with it. - </p> + </p> </section> <section> <title>Sample metadata code</title> @@ -1197,7 +1196,7 @@ information service which can be obtained via XML:DB API (name "MetaService", version "1.0"), and it also available via the XML-RPC code. </p> - <p> + <p> The Xindice XML-RPC server has four metadata related methods: GetCollectionMeta, GetDocumentMeta, SetCollectionMeta, SetDocumentMeta. Here's quick perl script which creates a collection and then dumps out @@ -1234,7 +1233,7 @@ $args->{'collection'} = '/db/'.$colname; $result = $server->call('run',$args); -## this should print out the xml for the +## this should print out the xml for the ## collection's metadata. print Dumper($result); @@ -1243,8 +1242,8 @@ my $meta=<<EOF; <?xml version="1.0"?> <meta> - <!-- since the system is controlled by - Xindice, this doesn't matter... + <!-- since the system is controlled by + Xindice, this doesn't matter... --> <system type="col"> <attr name="created" value="1" /> @@ -1266,7 +1265,7 @@ $args->{'meta'} = $meta; $result = $server->call('run',$args); -## this should print out the xml for the +## this should print out the xml for the ## collection's revised metadata. print Dumper($result); ]]></source> 1.2 +3 -3 xml-xindice/java/tests/src/org/apache/xindice/core/CollectionTest.java Index: CollectionTest.java =================================================================== RCS file: /home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/CollectionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CollectionTest.java 24 Dec 2003 15:18:40 -0000 1.1 +++ CollectionTest.java 31 Jan 2004 13:22:53 -0000 1.2 @@ -89,7 +89,7 @@ collection = db.createCollection(name, new Configuration( DOMParser.toDocument( "<collection compressed=\"true\" name=\"" + name + "\" inline-metadata=\"true\">" + - "<filer class=\"org.apache.xindice.core.filer.BTreeFiler\" gzip=\"true\"/>" + + "<filer class=\"org.apache.xindice.core.filer.BTreeFiler\">" + "</collection>"), false )); } 1.15 +3 -3 xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClient.java Index: XmlDbClient.java =================================================================== RCS file: /home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClient.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- XmlDbClient.java 9 Jan 2004 03:52:35 -0000 1.14 +++ XmlDbClient.java 31 Jan 2004 13:22:54 -0000 1.15 @@ -101,7 +101,7 @@ // Inline meta data is on String config = "<collection compressed=\"true\" name=\"" + name + "\" inline-metadata=\"true\">" + - " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\" gzip=\"true\"/>" + + " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\"/>" + "</collection>"; return createCollection(parent, path, DOMParser.toDocument(config)); } 1.4 +2 -2 xml-xindice/java/tests/src/org/apache/xindice/integration/client/resources/BinaryResourceTest.java Index: BinaryResourceTest.java =================================================================== RCS file: /home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/resources/BinaryResourceTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BinaryResourceTest.java 26 Dec 2003 02:41:58 -0000 1.3 +++ BinaryResourceTest.java 31 Jan 2004 13:22:54 -0000 1.4 @@ -76,7 +76,7 @@ // Override super.setUp(): Need inline meta. See client.createCollection(String, String) String cfg = "<collection compressed=\"true\" name=\"" + name + "\" inline-metadata=\"true\">" - + " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\" gzip=\"true\"/>" + + " <filer class=\"org.apache.xindice.core.filer.BTreeFiler\"/>" + "</collection>"; this.client.createCollection(XmlDbClientSetup.INSTANCE_NAME + "/" + XmlDbClientSetup.TEST_COLLECTION_NAME, name, DOMParser.toDocument(cfg));