vgritsenko 2003/08/07 13:13:27
Modified: java/examples/Addressbook/src/java/addressbook Action.java
AddContact.java DBConnection.java
DeleteContact.java EditContact.java Group.java
ListContacts.java Person.java SearchContacts.java
Task.java
java/examples/Addressbook/src/jsp addContact.jsp
editContactForm.jsp error.jsp footer.jsp header.jsp
index.jsp listContacts.jsp searchContacts.jsp
showAllContactInfo.jsp showContact.jsp showXML.jsp
showXMLInfo.jsp
java/examples/guide/src/org/apache/xindice/examples
AbstractExample.java AddDocument.java
CreateCollection.java DeleteDocument.java
Example1.java ListCollections.java
RetrieveDocument.java XUpdate.java
java/src/org/apache/xindice Stopwatch.java
java/src/org/apache/xindice/client/xmldb
CommonConfigurable.java DatabaseImpl.java
ResourceIteratorImpl.java ResourceSetImpl.java
XindiceCollection.java
java/src/org/apache/xindice/client/xmldb/embed
CollectionImpl.java DatabaseImpl.java
java/src/org/apache/xindice/client/xmldb/managed
ManagedDatabaseImpl.java
java/src/org/apache/xindice/client/xmldb/resources
BinaryResourceImpl.java XMLResourceImpl.java
java/src/org/apache/xindice/client/xmldb/services
CollectionManagementServiceImpl.java
CollectionManager.java DatabaseInstanceManager.java
MetaService.java QueryService.java
XPathQueryServiceImpl.java
XUpdateQueryServiceImpl.java
java/src/org/apache/xindice/client/xmldb/xmlrpc
CollectionImpl.java DatabaseImpl.java
java/src/org/apache/xindice/core Collection.java
CollectionManager.java Container.java
DBException.java DBObject.java DBObserver.java
Database.java DocumentCache.java FaultCodes.java
MetaSystemCollection.java SystemCollection.java
java/src/org/apache/xindice/core/data DocumentSet.java
EmptyDocumentSet.java EmptyNodeSet.java
EmptyRecordSet.java Key.java NodeSet.java
Record.java RecordSet.java Types.java Value.java
Variant.java
java/src/org/apache/xindice/core/filer BTree.java
BTreeCallback.java BTreeCorruptException.java
BTreeException.java BTreeFiler.java
BTreeNotFoundException.java FSFiler.java Filer.java
FilerException.java HashFiler.java MemFiler.java
Paged.java SizeableMemFiler.java Streamable.java
java/src/org/apache/xindice/core/indexer
CannotCreateException.java
DuplicateIndexException.java IndexManager.java
IndexMatch.java IndexPattern.java IndexQuery.java
Indexer.java IndexerException.java
MemValueIndexer.java NameIndexer.java
ValueIndexer.java
java/src/org/apache/xindice/core/indexer/helpers
IndexQueryANY.java IndexQueryBW.java
IndexQueryBWX.java IndexQueryEQ.java
IndexQueryGEQ.java IndexQueryGT.java
IndexQueryIN.java IndexQueryLEQ.java
IndexQueryLT.java IndexQueryNBW.java
IndexQueryNBWX.java IndexQueryNEQ.java
IndexQueryNIN.java IndexQueryNSW.java
IndexQuerySW.java
java/src/org/apache/xindice/core/meta MetaData.java
TimeRecord.java
java/src/org/apache/xindice/core/meta/inline
InlineHeaderBuilder.java InlineMetaException.java
InlineMetaMap.java InlineMetaReader.java
InlineMetaService.java InlineMetaWriter.java
NullReader.java NullWriter.java
ResourceTypeReader.java ResourceTypeWriter.java
java/src/org/apache/xindice/core/query
CompilationException.java NodeListSet.java
ProcessingException.java Query.java
QueryEngine.java QueryException.java
QueryResolver.java StyleNotFoundException.java
XPathQueryResolver.java
java/src/org/apache/xindice/core/request URIMapper.java
XindiceStreamHandler.java
XindiceStreamHandlerFactory.java
java/src/org/apache/xindice/core/xupdate XObjectImpl.java
XPathQueryFactoryImpl.java XPathQueryImpl.java
XUpdateImpl.java XUpdateQueryResolver.java
java/src/org/apache/xindice/server ManagedServer.java
UglyBrowser.java Xindice.java XindiceServlet.java
java/src/org/apache/xindice/server/rpc
RPCDefaultMessage.java RPCMessage.java
RPCMessageInterface.java
java/src/org/apache/xindice/server/rpc/messages
CreateCollection.java CreateIndexer.java
CreateNewOID.java GetApiVersion.java
GetCollectionConfiguration.java
GetCollectionCount.java GetCollectionMeta.java
GetDocument.java GetDocumentCount.java
GetDocumentMeta.java GetIndexerConfiguration.java
GetServerVersion.java InsertDocument.java
ListCollections.java ListDocuments.java
ListIndexers.java Query.java RemoveCollection.java
RemoveDocument.java RemoveIndexer.java
SetCollectionMeta.java SetDocument.java
SetDocumentMeta.java Shutdown.java
UpdateIndexer.java
java/src/org/apache/xindice/tools ArgTokenizer.java
DeploymentTask.java XMLTools.java
java/src/org/apache/xindice/tools/command AddCollection.java
AddDocument.java AddIndexer.java
AddMultipleDocuments.java Command.java
DeleteCollection.java DeleteDocument.java
DeleteIndexer.java ExportTree.java ImportTree.java
ListCollectionDocuments.java ListCollections.java
ListIndexers.java RetrieveDocument.java
Shutdown.java StringSerializer.java XPathQuery.java
XUpdate.java
java/src/org/apache/xindice/util ByteArrayInput.java
ByteBuffer.java Configurable.java
Configuration.java ConfigurationCallback.java
ConfigurationException.java DateUtilities.java
DirectoryClassLoader.java Disposable.java
FileCache.java LockManager.java MD5.java Named.java
ObjectPool.java ObjectQueue.java ObjectStack.java
Poolable.java ReadOnlyException.java
SimpleConfigurable.java StringUtilities.java
SymbolDeserializer.java SymbolSerializer.java
XindiceException.java XindiceRuntimeException.java
java/src/org/apache/xindice/xml NamespaceMap.java
NodeSource.java Signatures.java SymbolTable.java
SymbolTableSymbols.java TextWriter.java
XMLCompressedInput.java XMLCompressedOutput.java
XMLSerializable.java
java/src/org/apache/xindice/xml/dom AttrImpl.java
CDATASectionImpl.java CharacterDataImpl.java
CommentImpl.java CompressedDocument.java
CompressedNode.java ContainerNodeImpl.java
DBDocument.java DBNode.java DOMCompressor.java
DOMImplementationImpl.java DOMParser.java
DocumentFragmentImpl.java DocumentImpl.java
DocumentTypeImpl.java ElementImpl.java
EntityImpl.java EntityReferenceImpl.java
NamedNodeMapImpl.java NodeImpl.java
NodeListImpl.java NotationImpl.java
ProcessingInstructionImpl.java TextImpl.java
java/src/org/apache/xindice/xml/dom/traversal
TreeWalkerImpl.java
java/src/org/apache/xindice/xml/jaxp
DocumentBuilderFactoryImpl.java
DocumentBuilderImpl.java
java/src/org/apache/xindice/xml/sax CompressionHandler.java
SAXEventGenerator.java SetContentHandler.java
java/tests/src/org/apache/xindice IntegrationEmbedTests.java
IntegrationManagedTests.java
IntegrationXmlRpcTests.java StressTests.java
UnitTests.java
java/tests/src/org/apache/xindice/client/xmldb
DatabaseImplTest.java ResourceIteratorImplTest.java
java/tests/src/org/apache/xindice/client/xmldb/resources
BinaryResourceTest.java
java/tests/src/org/apache/xindice/core/data KeyTest.java
ValueTest.java
java/tests/src/org/apache/xindice/core/filer
FilerTestCase.java FilerTestSetup.java
java/tests/src/org/apache/xindice/core/meta MetaTest.java
java/tests/src/org/apache/xindice/core/meta/inline
InlineHeaderBuilderTest.java InlineMetaTests.java
ResourceTypeReaderTest.java
java/tests/src/org/apache/xindice/integration
IntegrationTests.java
java/tests/src/org/apache/xindice/integration/client
AbstractXmlDbClientTest.java XmlDbClient.java
XmlDbClientSetup.java
java/tests/src/org/apache/xindice/integration/client/basic
CollectionTest.java DocumentTest.java
IndexTest.java
java/tests/src/org/apache/xindice/integration/client/services
XPathQueryTest.java XUpdateQueryTest.java
java/tests/src/org/apache/xindice/stress/filer
StressFilerTestSetup.java
java/tests/src/org/apache/xindice/tools XMLToolsTest.java
java/tests/src/org/apache/xindice/util
ConfigurationTest.java
Log:
Add @version to all the files.
Move package declaration after license.
Several files were missing license.
MemValueIndexer had different license text.
Some javadoc fixes.
Revision Changes Path
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/Action.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Action.java 5 Jun 2003 03:59:05 -0000 1.3
+++ Action.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.util.Hashtable;
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/AddContact.java
Index: AddContact.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/AddContact.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddContact.java 5 Jun 2003 03:59:05 -0000 1.3
+++ AddContact.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.IOException;
1.5 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/DBConnection.java
Index: DBConnection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/DBConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBConnection.java 5 Jun 2003 03:59:05 -0000 1.4
+++ DBConnection.java 7 Aug 2003 20:13:19 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.net.URLEncoder;
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/DeleteContact.java
Index: DeleteContact.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/DeleteContact.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteContact.java 5 Jun 2003 03:59:05 -0000 1.3
+++ DeleteContact.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.IOException;
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/EditContact.java
Index: EditContact.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/EditContact.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditContact.java 5 Jun 2003 03:59:05 -0000 1.3
+++ EditContact.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.IOException;
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/Group.java
Index: Group.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/Group.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Group.java 5 Jun 2003 03:59:05 -0000 1.3
+++ Group.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.util.Vector;
1.5 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/ListContacts.java
Index: ListContacts.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/ListContacts.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListContacts.java 5 Jun 2003 03:59:05 -0000 1.4
+++ ListContacts.java 7 Aug 2003 20:13:19 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.IOException;
1.3 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/Person.java
Index: Person.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/Person.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Person.java 5 Jun 2003 03:59:05 -0000 1.2
+++ Person.java 7 Aug 2003 20:13:19 -0000 1.3
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
// Class to hold individual contact data
1.5 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/SearchContacts.java
Index: SearchContacts.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/SearchContacts.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SearchContacts.java 5 Jun 2003 03:59:05 -0000 1.4
+++ SearchContacts.java 7 Aug 2003 20:13:19 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.IOException;
1.4 +1 -1
xml-xindice/java/examples/Addressbook/src/java/addressbook/Task.java
Index: Task.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/java/addressbook/Task.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Task.java 5 Jun 2003 03:59:05 -0000 1.3
+++ Task.java 7 Aug 2003 20:13:19 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.beans.Beans;
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/addContact.jsp
Index: addContact.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/addContact.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addContact.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ addContact.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/editContactForm.jsp
Index: editContactForm.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/editContactForm.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- editContactForm.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ editContactForm.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.3 +1 -1 xml-xindice/java/examples/Addressbook/src/jsp/error.jsp
Index: error.jsp
===================================================================
RCS file: /home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/error.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- error.jsp 21 Jul 2002 02:52:17 -0000 1.2
+++ error.jsp 7 Aug 2003 20:13:19 -0000 1.3
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.3 +1 -1 xml-xindice/java/examples/Addressbook/src/jsp/footer.jsp
Index: footer.jsp
===================================================================
RCS file: /home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/footer.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- footer.jsp 5 Feb 2002 07:30:53 -0000 1.2
+++ footer.jsp 7 Aug 2003 20:13:19 -0000 1.3
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.3 +1 -1 xml-xindice/java/examples/Addressbook/src/jsp/header.jsp
Index: header.jsp
===================================================================
RCS file: /home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/header.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- header.jsp 5 Feb 2002 07:30:53 -0000 1.2
+++ header.jsp 7 Aug 2003 20:13:19 -0000 1.3
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.3 +1 -1 xml-xindice/java/examples/Addressbook/src/jsp/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/index.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.jsp 5 Feb 2002 07:30:53 -0000 1.2
+++ index.jsp 7 Aug 2003 20:13:19 -0000 1.3
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/listContacts.jsp
Index: listContacts.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/listContacts.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listContacts.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ listContacts.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/searchContacts.jsp
Index: searchContacts.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/searchContacts.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- searchContacts.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ searchContacts.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/showAllContactInfo.jsp
Index: showAllContactInfo.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/showAllContactInfo.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showAllContactInfo.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ showAllContactInfo.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/showContact.jsp
Index: showContact.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/showContact.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showContact.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ showContact.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1 xml-xindice/java/examples/Addressbook/src/jsp/showXML.jsp
Index: showXML.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/showXML.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showXML.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ showXML.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/Addressbook/src/jsp/showXMLInfo.jsp
Index: showXMLInfo.jsp
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/Addressbook/src/jsp/showXMLInfo.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- showXMLInfo.jsp 6 Dec 2001 19:33:52 -0000 1.1
+++ showXMLInfo.jsp 7 Aug 2003 20:13:19 -0000 1.2
@@ -55,7 +55,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
%>
1.2 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/AbstractExample.java
Index: AbstractExample.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/AbstractExample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractExample.java 10 Jul 2003 21:36:18 -0000 1.1
+++ AbstractExample.java 7 Aug 2003 20:13:20 -0000 1.2
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.apache.xindice.util.XindiceException;
import org.xmldb.api.DatabaseManager;
1.5 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/AddDocument.java
Index: AddDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/AddDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddDocument.java 10 Jul 2003 21:36:18 -0000 1.4
+++ AddDocument.java 7 Aug 2003 20:13:20 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.File;
1.6 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/CreateCollection.java
Index: CreateCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/CreateCollection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateCollection.java 14 Jul 2003 21:24:43 -0000 1.5
+++ CreateCollection.java 7 Aug 2003 20:13:20 -0000 1.6
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.xml.dom.DOMParser;
1.5 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/DeleteDocument.java
Index: DeleteDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/DeleteDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteDocument.java 10 Jul 2003 21:36:18 -0000 1.4
+++ DeleteDocument.java 7 Aug 2003 20:13:20 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Resource;
1.6 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/Example1.java
Index: Example1.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/Example1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Example1.java 10 Jul 2003 21:36:18 -0000 1.5
+++ Example1.java 7 Aug 2003 20:13:20 -0000 1.6
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Resource;
1.2 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/ListCollections.java
Index: ListCollections.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/ListCollections.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListCollections.java 10 Jul 2003 21:36:18 -0000 1.1
+++ ListCollections.java 7 Aug 2003 20:13:20 -0000 1.2
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.xmldb.api.base.Collection;
1.5 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/RetrieveDocument.java
Index: RetrieveDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/RetrieveDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RetrieveDocument.java 10 Jul 2003 21:36:18 -0000 1.4
+++ RetrieveDocument.java 7 Aug 2003 20:13:20 -0000 1.5
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.XMLDBException;
1.6 +1 -1
xml-xindice/java/examples/guide/src/org/apache/xindice/examples/XUpdate.java
Index: XUpdate.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/examples/guide/src/org/apache/xindice/examples/XUpdate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XUpdate.java 10 Jul 2003 21:36:18 -0000 1.5
+++ XUpdate.java 7 Aug 2003 20:13:20 -0000 1.6
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.XMLDBException;
1.4 +4 -2 xml-xindice/java/src/org/apache/xindice/Stopwatch.java
Index: Stopwatch.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/Stopwatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Stopwatch.java 1 Aug 2003 19:40:16 -0000 1.3
+++ Stopwatch.java 7 Aug 2003 20:13:20 -0000 1.4
@@ -54,14 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+
package org.apache.xindice;
/**
* Stopwatch is a debugging tool for manually profiling code execution.
* This class will probably be removed for a production release.
- * @version CVS $Revision$ - $Date$
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class Stopwatch {
String label = null;
1.7 +6 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/CommonConfigurable.java
Index: CommonConfigurable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/CommonConfigurable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommonConfigurable.java 1 Aug 2003 19:40:16 -0000 1.6
+++ CommonConfigurable.java 7 Aug 2003 20:13:20 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb;
+
import org.xmldb.api.base.Configurable;
import org.xmldb.api.base.XMLDBException;
@@ -66,8 +66,11 @@
/**
* Base class to handle property managment within the API implementation.
+ *
+ * @version CVS $Revision$, $Date$
*/
public abstract class CommonConfigurable implements Configurable {
+
protected Hashtable config = null;
/**
1.19 +6 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/DatabaseImpl.java
Index: DatabaseImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/DatabaseImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DatabaseImpl.java 7 Aug 2003 18:03:20 -0000 1.18
+++ DatabaseImpl.java 7 Aug 2003 20:13:20 -0000 1.19
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,8 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+
+package org.apache.xindice.client.xmldb;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.client.xmldb.managed.ManagedDatabaseImpl;
@@ -77,6 +78,8 @@
* <p />
*
* This implementation simply acts as a proxy for the protocol specific API
implementations.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class DatabaseImpl extends CommonConfigurable implements Database {
1.6 +2 -1
xml-xindice/java/src/org/apache/xindice/client/xmldb/ResourceIteratorImpl.java
Index: ResourceIteratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/ResourceIteratorImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceIteratorImpl.java 1 Aug 2003 19:40:16 -0000 1.5
+++ ResourceIteratorImpl.java 7 Aug 2003 20:13:20 -0000 1.6
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.client.xmldb;
@@ -71,6 +71,7 @@
* An iterator over a collection of resources.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vladimir R. Bossicard</a>
+ * @version CVS $Revision$, $Date$
*/
public class ResourceIteratorImpl implements ResourceIterator {
1.10 +173 -174
xml-xindice/java/src/org/apache/xindice/client/xmldb/ResourceSetImpl.java
Index: ResourceSetImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/ResourceSetImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceSetImpl.java 4 Aug 2003 03:01:57 -0000 1.9
+++ ResourceSetImpl.java 7 Aug 2003 20:13:20 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb;
+
import org.apache.xindice.client.xmldb.resources.XMLResourceImpl;
import org.apache.xindice.xml.NodeSource;
import org.apache.xindice.xml.SymbolTable;
@@ -81,182 +81,181 @@
/**
* <code>ResourceSet</code> contains a set of resources as returned from a
query
* or other operation.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class ResourceSetImpl implements ResourceSet {
- public static final String RESOURCE_SET_NS =
- "http://www.xmldb.org/xapi/ResourceSet";;
- protected List resources = null;
- protected org.xmldb.api.base.Collection collection = null;
-
- private SymbolTable symbols = null;
- private byte[] bytes = null;
-
- public ResourceSetImpl(org.xmldb.api.base.Collection collection,
- Document doc) throws XMLDBException {
- this.collection = collection;
-
- if ( doc != null ) {
- initResources(doc);
- }
- else {
- resources = Collections.synchronizedList(new ArrayList());
- }
- }
-
- public ResourceSetImpl(org.xmldb.api.base.Collection collection,
- SymbolTable symbols, byte[] bytes) throws XMLDBException {
- this.collection = collection;
- this.symbols = symbols;
- this.bytes = bytes;
-
- initResources(new DocumentImpl(bytes, symbols, null));
- }
-
- protected void initResources(Document document) throws XMLDBException {
- NodeList nodes = document.getDocumentElement().getChildNodes();
- this.resources =
- Collections.synchronizedList(new ArrayList(nodes.getLength()));
-
- int i = 0;
- while ( i < nodes.getLength() ) {
- try {
- XMLResource resource;
- Node n = nodes.item(i);
-
- String documentId = null;
-
- if (n instanceof Element)
- {
- documentId = ((Element) n).getAttributeNS(
- NodeSource.SOURCE_NS, "key");
- }
-
- if ( bytes != null ) {
- DocumentImpl doc = new DocumentImpl();
- doc.setSymbols(symbols);
- doc.importNode(n, true);
- doc.appendChild(n);
- byte[] b = DOMCompressor.Compress(doc, symbols);
- resource = new XMLResourceImpl(null, documentId, collection,
- symbols, b);
- }
- else {
- resource = new XMLResourceImpl(null, documentId, collection,
- TextWriter.toString(n));
+
+ public static final String RESOURCE_SET_NS =
+ "http://www.xmldb.org/xapi/ResourceSet";;
+
+ protected List resources = null;
+ protected org.xmldb.api.base.Collection collection = null;
+ private SymbolTable symbols = null;
+ private byte[] bytes = null;
+
+
+ public ResourceSetImpl(org.xmldb.api.base.Collection collection,
+ Document doc) throws XMLDBException {
+ this.collection = collection;
+
+ if (doc != null) {
+ initResources(doc);
+ } else {
+ resources = Collections.synchronizedList(new ArrayList());
+ }
+ }
+
+ public ResourceSetImpl(org.xmldb.api.base.Collection collection,
+ SymbolTable symbols, byte[] bytes) throws
XMLDBException {
+ this.collection = collection;
+ this.symbols = symbols;
+ this.bytes = bytes;
+
+ initResources(new DocumentImpl(bytes, symbols, null));
+ }
+
+ protected void initResources(Document document) throws XMLDBException {
+ NodeList nodes = document.getDocumentElement().getChildNodes();
+ this.resources =
+ Collections.synchronizedList(new
ArrayList(nodes.getLength()));
+
+ int i = 0;
+ while (i < nodes.getLength()) {
+ try {
+ XMLResource resource;
+ Node n = nodes.item(i);
+
+ String documentId = null;
+
+ if (n instanceof Element) {
+ documentId = ((Element) n).getAttributeNS(
+ NodeSource.SOURCE_NS, "key");
+ }
+
+ if (bytes != null) {
+ DocumentImpl doc = new DocumentImpl();
+ doc.setSymbols(symbols);
+ doc.importNode(n, true);
+ doc.appendChild(n);
+ byte[] b = DOMCompressor.Compress(doc, symbols);
+ resource = new XMLResourceImpl(null, documentId,
collection,
+ symbols, b);
+ } else {
+ resource = new XMLResourceImpl(null, documentId,
collection,
+ TextWriter.toString(n));
+ }
+
+ i++;
+ resources.add(resource);
+ } catch (Exception e) {
+ throw new XMLDBException(ErrorCodes.UNKNOWN_ERROR, e);
}
+ }
+ }
- i++;
- resources.add(resource);
- }
- catch (Exception e) {
- throw new XMLDBException(ErrorCodes.UNKNOWN_ERROR, e);
- }
- }
- }
-
- /**
- * Returns an iterator over all <code>Resource</code> instances stored in
- * the set.
- *
- * @return a ResourceIterator over all <code>Resource</code> instances in
the
- * set.
- * @exception XMLDBException
- */
- public ResourceIterator getIterator() throws XMLDBException {
- return new ResourceIteratorImpl(resources);
- }
-
- /**
- * Returns the <code>Resource</code> instance stored at the index
specified
- * by <code>index</code>.
- *
- * @param index the index of the resource to retrieve.
- * @return the <code>Resource</code> instance.
- * @exception XMLDBException
- */
- public Resource getResource(long index) throws XMLDBException {
- return (XMLResource) resources.get((int) index);
- }
-
- /**
- * Returns the number of resources contained in the set.
- *
- * @return the number of <code>Resource</code> instances in the set.
- * @exception XMLDBException
- */
- public long getSize() throws XMLDBException {
- return resources.size();
- }
-
- /**
- * Adds a <code>Resource</code> instance to the set.
- *
- * @exception XMLDBException
- */
- public void addResource(Resource res) throws XMLDBException {
- resources.add(res);
- }
-
- /**
- * Removes all <code>Resource</code> instances from the set.
- *
- * @exception XMLDBException
- */
- public void clear() throws XMLDBException {
- resources.clear();
- }
-
- /**
- * Removes the <code>Resource</code> located at <code>index</code> from
the
- * set.
- *
- * @param index The index of the <code>Resource</code> instance to remove.
- * @exception XMLDBException
- */
- public void removeResource(long index) throws XMLDBException {
- resources.remove((int) index);
- }
-
- /**
- * Returns a <code>Resource</code> containing an XML representation of all
- * resources stored in the set.
- *
- * @return A <code>Resource</code> instance containing an XML
representation
- * of all set members.
- * @exception XMLDBException
- */
- public Resource getMembersAsResource() throws XMLDBException {
- // This impl works but it would be nice if we just got the result set
from
- // the server in this format instead of having to build it. Right now
it's
- // pretty innefficient
- Document doc = new DocumentImpl();
-
- Element set = doc.createElementNS(RESOURCE_SET_NS, "xapi:resourceSet");
- set.setAttributeNS(RESOURCE_SET_NS, "xapi:collectionURI",
- "xmldb:xindice://" + ((XindiceCollection)
collection).getCanonicalName());
- set.setAttribute("xmlns:xapi", RESOURCE_SET_NS);
- doc.appendChild(set);
-
- int i = 0;
- while ( i < resources.size() ) {
- XMLResource res = (XMLResource) resources.get(i);
- Element resource = doc.createElementNS(RESOURCE_SET_NS,
- "xapi:resource");
- resource.setAttributeNS(RESOURCE_SET_NS, "xapi:documentID",
- res.getDocumentId());
-
- resource.appendChild(doc.importNode(
- ((Document) res.getContentAsDOM()).getDocumentElement(), true));
-
- set.appendChild(resource);
+ /**
+ * Returns an iterator over all <code>Resource</code> instances stored in
+ * the set.
+ *
+ * @return a ResourceIterator over all <code>Resource</code> instances
in the
+ * set.
+ * @exception XMLDBException
+ */
+ public ResourceIterator getIterator() throws XMLDBException {
+ return new ResourceIteratorImpl(resources);
+ }
+
+ /**
+ * Returns the <code>Resource</code> instance stored at the index
specified
+ * by <code>index</code>.
+ *
+ * @param index the index of the resource to retrieve.
+ * @return the <code>Resource</code> instance.
+ * @exception XMLDBException
+ */
+ public Resource getResource(long index) throws XMLDBException {
+ return (XMLResource) resources.get((int) index);
+ }
+
+ /**
+ * Returns the number of resources contained in the set.
+ *
+ * @return the number of <code>Resource</code> instances in the set.
+ * @exception XMLDBException
+ */
+ public long getSize() throws XMLDBException {
+ return resources.size();
+ }
+
+ /**
+ * Adds a <code>Resource</code> instance to the set.
+ *
+ * @exception XMLDBException
+ */
+ public void addResource(Resource res) throws XMLDBException {
+ resources.add(res);
+ }
+
+ /**
+ * Removes all <code>Resource</code> instances from the set.
+ *
+ * @exception XMLDBException
+ */
+ public void clear() throws XMLDBException {
+ resources.clear();
+ }
+
+ /**
+ * Removes the <code>Resource</code> located at <code>index</code> from
the
+ * set.
+ *
+ * @param index The index of the <code>Resource</code> instance to
remove.
+ * @exception XMLDBException
+ */
+ public void removeResource(long index) throws XMLDBException {
+ resources.remove((int) index);
+ }
+
+ /**
+ * Returns a <code>Resource</code> containing an XML representation of
all
+ * resources stored in the set.
+ *
+ * @return A <code>Resource</code> instance containing an XML
representation
+ * of all set members.
+ * @exception XMLDBException
+ */
+ public Resource getMembersAsResource() throws XMLDBException {
+ // This impl works but it would be nice if we just got the result
set from
+ // the server in this format instead of having to build it. Right
now it's
+ // pretty innefficient
+ Document doc = new DocumentImpl();
+
+ Element set = doc.createElementNS(RESOURCE_SET_NS,
"xapi:resourceSet");
+ set.setAttributeNS(RESOURCE_SET_NS, "xapi:collectionURI",
+ "xmldb:xindice://" + ((XindiceCollection)
collection).getCanonicalName());
+ set.setAttribute("xmlns:xapi", RESOURCE_SET_NS);
+ doc.appendChild(set);
+
+ int i = 0;
+ while (i < resources.size()) {
+ XMLResource res = (XMLResource) resources.get(i);
+ Element resource = doc.createElementNS(RESOURCE_SET_NS,
+ "xapi:resource");
+ resource.setAttributeNS(RESOURCE_SET_NS, "xapi:documentID",
+ res.getDocumentId());
- i++;
- }
+ resource.appendChild(doc.importNode(
+ ((Document) res.getContentAsDOM()).getDocumentElement(),
true));
- XMLResource result = new XMLResourceImpl(null, null,
- collection, TextWriter.toString(doc));
+ set.appendChild(resource);
- return result;
- }
-}
+ i++;
+ }
+
+ XMLResource result = new XMLResourceImpl(null, null,
+ collection,
TextWriter.toString(doc));
+ return result;
+ }
+}
1.11 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/XindiceCollection.java
Index: XindiceCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/XindiceCollection.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XindiceCollection.java 1 Aug 2003 19:40:16 -0000 1.10
+++ XindiceCollection.java 7 Aug 2003 20:13:20 -0000 1.11
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb;
+
import org.apache.xindice.client.xmldb.resources.XMLResourceImpl;
import
org.apache.xindice.client.xmldb.services.CollectionManagementServiceImpl;
import org.apache.xindice.client.xmldb.services.MetaService;
@@ -87,6 +87,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public abstract class XindiceCollection extends CommonConfigurable
implements Collection {
/* Instantiated named services map */
1.19 +5 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/embed/CollectionImpl.java
Index: CollectionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/embed/CollectionImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CollectionImpl.java 7 Aug 2003 18:03:20 -0000 1.18
+++ CollectionImpl.java 7 Aug 2003 20:13:20 -0000 1.19
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.embed;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,8 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+
+package org.apache.xindice.client.xmldb.embed;
+
import org.apache.xindice.client.xmldb.ResourceSetImpl;
import org.apache.xindice.client.xmldb.XindiceCollection;
import org.apache.xindice.client.xmldb.resources.BinaryResourceImpl;
@@ -92,6 +93,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
+ * @version CVS $Revision$, $Date$
*/
public class CollectionImpl extends XindiceCollection {
1.16 +2 -1
xml-xindice/java/src/org/apache/xindice/client/xmldb/embed/DatabaseImpl.java
Index: DatabaseImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/embed/DatabaseImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DatabaseImpl.java 7 Aug 2003 18:03:20 -0000 1.15
+++ DatabaseImpl.java 7 Aug 2003 20:13:20 -0000 1.16
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.client.xmldb.embed;
@@ -83,6 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vladimir R. Bossicard</a>
+ * @version CVS $Revision$, $Date$
*/
public class DatabaseImpl extends CommonConfigurable implements
org.xmldb.api.base.Database {
1.4 +3 -2
xml-xindice/java/src/org/apache/xindice/client/xmldb/managed/ManagedDatabaseImpl.java
Index: ManagedDatabaseImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/managed/ManagedDatabaseImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManagedDatabaseImpl.java 7 Aug 2003 18:03:21 -0000 1.3
+++ ManagedDatabaseImpl.java 7 Aug 2003 20:13:20 -0000 1.4
@@ -54,8 +54,9 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+
package org.apache.xindice.client.xmldb.managed;
import org.apache.commons.logging.Log;
@@ -84,7 +85,7 @@
* This driver will throw an exception if the database instance hasn't been
registered.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin O'Neill</a>
- * @version CVS $Revision$ - $Date$
+ * @version CVS $Revision$, $Date$
*/
public class ManagedDatabaseImpl extends CommonConfigurable implements
org.xmldb.api.base.Database {
1.3 +4 -1
xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/BinaryResourceImpl.java
Index: BinaryResourceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/BinaryResourceImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BinaryResourceImpl.java 1 Aug 2003 19:40:16 -0000 1.2
+++ BinaryResourceImpl.java 7 Aug 2003 20:13:20 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.client.xmldb.resources;
@@ -66,11 +66,14 @@
/**
* BinaryResourceImpl provides an implementation to handle binary
* resource .
+ *
+ * @version CVS $Revision$, $Date$
*/
public class BinaryResourceImpl implements BinaryResource {
private Object content;
private String id;
+
public BinaryResourceImpl(String id, Object content) {
this.id = id;
1.15 +5 -4
xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java
Index: XMLResourceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLResourceImpl.java 1 Aug 2003 19:40:16 -0000 1.14
+++ XMLResourceImpl.java 7 Aug 2003 20:13:20 -0000 1.15
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.resources;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.resources;
+
import org.apache.xindice.core.FaultCodes;
import org.apache.xindice.xml.SymbolTable;
import org.apache.xindice.xml.TextWriter;
@@ -82,9 +82,10 @@
/**
* XMLResourceImpl provides an implementation to handle XML resources
* and convert easily between Text, DOM or SAX presentations.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XMLResourceImpl implements org.xmldb.api.modules.XMLResource {
-
private static SAXParserFactory saxFactory;
1.7 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/CollectionManagementServiceImpl.java
Index: CollectionManagementServiceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/CollectionManagementServiceImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CollectionManagementServiceImpl.java 1 Aug 2003 19:40:16 -0000
1.6
+++ CollectionManagementServiceImpl.java 7 Aug 2003 20:13:20 -0000
1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.apache.xindice.client.xmldb.CommonConfigurable;
import org.apache.xindice.client.xmldb.XindiceCollection;
import org.apache.xindice.core.FaultCodes;
@@ -75,6 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
+ * @version CVS $Revision$, $Date$
*/
public class CollectionManagementServiceImpl extends CommonConfigurable
implements CollectionManagementService, CollectionManager,
DatabaseInstanceManager {
1.9 +5 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/CollectionManager.java
Index: CollectionManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/CollectionManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CollectionManager.java 1 Aug 2003 19:40:16 -0000 1.8
+++ CollectionManager.java 7 Aug 2003 20:13:20 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.w3c.dom.Document;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.XMLDBException;
@@ -68,6 +68,8 @@
* Administrative access is required for retrieval of the CollectionManager
* interface. User level access is provided through the underlying Collection
* itself.
+ *
+ * @version CVS $Revision$, $Date$
*/
public interface CollectionManager {
/**
1.7 +5 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/DatabaseInstanceManager.java
Index: DatabaseInstanceManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/DatabaseInstanceManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatabaseInstanceManager.java 1 Aug 2003 19:40:16 -0000 1.6
+++ DatabaseInstanceManager.java 7 Aug 2003 20:13:20 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.xmldb.api.base.XMLDBException;
/**
@@ -67,6 +67,8 @@
*
* In order to get a reference to the DatabaseInstanceManager object you
must have
* administrative access to the server.
+ *
+ * @version CVS $Revision$, $Date$
*/
public interface DatabaseInstanceManager {
1.3 +8 -5
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/MetaService.java
Index: MetaService.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/MetaService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MetaService.java 1 Aug 2003 19:40:16 -0000 1.2
+++ MetaService.java 7 Aug 2003 20:13:20 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.apache.xindice.client.xmldb.CommonConfigurable;
import org.apache.xindice.client.xmldb.XindiceCollection;
import org.apache.xindice.core.meta.MetaData;
@@ -71,11 +71,14 @@
* Meta information service.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
+ * @version CVS $Revision$, $Date$
*/
public class MetaService extends CommonConfigurable implements Service {
- /* Collection that this query service should query in */
- Collection collection;
+ /**
+ * Collection that this query service should query in
+ */
+ private Collection collection;
public String getVersion() {
return "1.0";
1.6 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/QueryService.java
Index: QueryService.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/QueryService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QueryService.java 1 Aug 2003 19:40:16 -0000 1.5
+++ QueryService.java 7 Aug 2003 20:13:20 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.apache.xindice.client.xmldb.CommonConfigurable;
import org.apache.xindice.client.xmldb.XindiceCollection;
@@ -77,6 +77,7 @@
* or less identical.
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public abstract class QueryService extends CommonConfigurable implements
Service {
1.7 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/XPathQueryServiceImpl.java
Index: XPathQueryServiceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/XPathQueryServiceImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathQueryServiceImpl.java 1 Aug 2003 19:40:16 -0000 1.6
+++ XPathQueryServiceImpl.java 7 Aug 2003 20:13:20 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.xmldb.api.modules.XPathQueryService;
/**
@@ -66,6 +66,7 @@
* with server
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public class XPathQueryServiceImpl extends QueryService implements
XPathQueryService {
1.10 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/services/XUpdateQueryServiceImpl.java
Index: XUpdateQueryServiceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/services/XUpdateQueryServiceImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XUpdateQueryServiceImpl.java 1 Aug 2003 19:40:16 -0000 1.9
+++ XUpdateQueryServiceImpl.java 7 Aug 2003 20:13:20 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.services;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.services;
+
import org.w3c.dom.Document;
import org.xmldb.api.base.ErrorCodes;
import org.xmldb.api.base.XMLDBException;
@@ -70,6 +70,7 @@
* with server
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public class XUpdateQueryServiceImpl extends QueryService implements
XUpdateQueryService {
1.30 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/CollectionImpl.java
Index: CollectionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/CollectionImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CollectionImpl.java 6 Aug 2003 04:04:28 -0000 1.29
+++ CollectionImpl.java 7 Aug 2003 20:13:20 -0000 1.30
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.xmlrpc;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.xmlrpc;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.client.xmldb.ResourceSetImpl;
@@ -95,6 +95,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
+ * @version CVS $Revision$, $Date$
*/
public class CollectionImpl extends XindiceCollection {
1.14 +4 -3
xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/DatabaseImpl.java
Index: DatabaseImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/DatabaseImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DatabaseImpl.java 7 Aug 2003 18:03:21 -0000 1.13
+++ DatabaseImpl.java 7 Aug 2003 20:13:20 -0000 1.14
@@ -1,5 +1,3 @@
-package org.apache.xindice.client.xmldb.xmlrpc;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.client.xmldb.xmlrpc;
+
import org.apache.xindice.client.xmldb.CommonConfigurable;
import org.apache.commons.logging.Log;
@@ -76,6 +76,7 @@
* could be used to connect to <em>many</em> different databases.
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public class DatabaseImpl extends CommonConfigurable implements Database {
1.27 +5 -3
xml-xindice/java/src/org/apache/xindice/core/Collection.java
Index: Collection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Collection.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Collection.java 7 Aug 2003 18:03:21 -0000 1.26
+++ Collection.java 7 Aug 2003 20:13:21 -0000 1.27
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.data.DocumentSet;
@@ -106,6 +106,8 @@
* Collection represents a collection of Documents maintains links to
* the Filer storage implementation, and the Indexes associated with
* the Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class Collection extends CollectionManager implements Named,
DBObject, Configurable {
1.15 +5 -3
xml-xindice/java/src/org/apache/xindice/core/CollectionManager.java
Index: CollectionManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/CollectionManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CollectionManager.java 7 Aug 2003 18:03:21 -0000 1.14
+++ CollectionManager.java 7 Aug 2003 20:13:21 -0000 1.15
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.Configurable;
@@ -73,6 +73,8 @@
/**
* CollectionManager is the base class for both Database and Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class CollectionManager implements Configurable, Disposable {
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/core/Container.java
Index: Container.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Container.java 1 Aug 2003 19:40:17 -0000 1.4
+++ Container.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.xindice.core.data.Key;
import org.w3c.dom.Document;
/**
* Container is a generic container for Key and Document pairs.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Container {
/**
1.6 +5 -4
xml-xindice/java/src/org/apache/xindice/core/DBException.java
Index: DBException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/DBException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DBException.java 14 Jul 2003 19:07:14 -0000 1.5
+++ DBException.java 7 Aug 2003 20:13:21 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.xindice.util.XindiceException;
/**
* A DBException is thrown by the database if an exception occurs in the
* managing (creating, dropping) database objects such as Collections,
* Indexes, and XMLObjects.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DBException extends XindiceException {
public int faultCode;
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/DBObject.java
Index: DBObject.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/DBObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBObject.java 14 Jul 2003 19:07:14 -0000 1.3
+++ DBObject.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
/**
* DBObject is the interface implemented by all Xindice database objects.
* DBObjects are typically objects that can be managed using XML
@@ -66,9 +66,11 @@
* database. XMLObjects are not considered DBObjects because of the
* steps involved in having to generate them, which is usually
* compilation of source code.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface DBObject {
+
/**
* create creates a new DBObject and any associated resources for the new
* DBObject, such as disk files, etc.
1.7 +61 -0
xml-xindice/java/src/org/apache/xindice/core/DBObserver.java
Index: DBObserver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/DBObserver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DBObserver.java 1 Aug 2003 19:40:17 -0000 1.6
+++ DBObserver.java 7 Aug 2003 20:13:21 -0000 1.7
@@ -1,3 +1,62 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xindice" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999-2001, The dbXML
+ * Group, L.L.C., http://www.dbxmlgroup.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * CVS $Id$
+ */
+
package org.apache.xindice.core;
import org.apache.xindice.core.data.Key;
@@ -10,6 +69,8 @@
/**
* Observer for Xindice DB activities
+ *
+ * @version CVS $Revision$, $Date$
*/
public abstract class DBObserver {
1.25 +5 -3
xml-xindice/java/src/org/apache/xindice/core/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Database.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Database.java 7 Aug 2003 18:03:21 -0000 1.24
+++ Database.java 7 Aug 2003 20:13:21 -0000 1.25
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.meta.TimeRecord;
@@ -80,6 +80,8 @@
/**
* Database is the primary container for the Xindice Database Engine.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class Database extends Collection implements Named {
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/core/DocumentCache.java
Index: DocumentCache.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/DocumentCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DocumentCache.java 1 Aug 2003 19:40:17 -0000 1.6
+++ DocumentCache.java 7 Aug 2003 20:13:21 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.xindice.core.data.Key;
import org.apache.xindice.xml.NodeSource;
import org.apache.xindice.xml.SymbolTable;
@@ -75,8 +75,9 @@
/**
* DocumentCache implements a simple Document caching system for
* Collections.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DocumentCache {
private Map table = new WeakHashMap();
1.13 +5 -2
xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java
Index: FaultCodes.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FaultCodes.java 1 Aug 2003 19:40:17 -0000 1.12
+++ FaultCodes.java 7 Aug 2003 20:13:21 -0000 1.13
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core;
@@ -68,10 +68,13 @@
/**
* FaultCodes defines the Xindice specific fault codes and associated error
* messages.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class FaultCodes {
+
private static final Map faultMessages = new HashMap();
+
public static final int GEN = (int) (0l);
public static final int OBJ = (int) (100l);
public static final int COL = (int) (200l);
1.6 +5 -3
xml-xindice/java/src/org/apache/xindice/core/MetaSystemCollection.java
Index: MetaSystemCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/MetaSystemCollection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MetaSystemCollection.java 7 Aug 2003 18:03:21 -0000 1.5
+++ MetaSystemCollection.java 7 Aug 2003 20:13:21 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.meta.MetaData;
@@ -73,6 +73,8 @@
* MetaSystemCollection represents the Meta System Collection. Beyond
* standard Collection operations, this class will provide facilities
* for Meta data management.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class MetaSystemCollection extends Collection {
1.18 +5 -3
xml-xindice/java/src/org/apache/xindice/core/SystemCollection.java
Index: SystemCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/SystemCollection.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SystemCollection.java 7 Aug 2003 18:03:21 -0000 1.17
+++ SystemCollection.java 7 Aug 2003 20:13:21 -0000 1.18
@@ -1,5 +1,3 @@
-package org.apache.xindice.core;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.Configuration;
@@ -72,6 +72,8 @@
* SystemCollection represents the System Collection. Beyond
* standard Collection operations, this class will provide facilities
* for Schema and SymbolTable management among other things.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class SystemCollection extends Collection {
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/data/DocumentSet.java
Index: DocumentSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/DocumentSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DocumentSet.java 1 Aug 2003 19:40:17 -0000 1.3
+++ DocumentSet.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.apache.xindice.core.Container;
import org.apache.xindice.core.DBException;
@@ -66,9 +66,11 @@
/**
* DocumentSet is an interface for iterating over a set of Documents.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface DocumentSet {
+
/**
* hasMoreDocuments returns whether there are any more Documents
* left in the set.
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/core/data/EmptyDocumentSet.java
Index: EmptyDocumentSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/EmptyDocumentSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmptyDocumentSet.java 1 Aug 2003 19:40:17 -0000 1.3
+++ EmptyDocumentSet.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.apache.xindice.core.Container;
import org.w3c.dom.Document;
/**
* EmptyDocumentSet implements an empty DocumentSet.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class EmptyDocumentSet implements DocumentSet {
public boolean hasMoreDocuments() {
return false;
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/core/data/EmptyNodeSet.java
Index: EmptyNodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/EmptyNodeSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmptyNodeSet.java 1 Aug 2003 19:40:17 -0000 1.2
+++ EmptyNodeSet.java 7 Aug 2003 20:13:21 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.w3c.dom.Node;
/**
* EmptyNodeSet implements an empty NodeSet.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class EmptyNodeSet implements NodeSet {
public boolean hasMoreNodes() {
return false;
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/core/data/EmptyRecordSet.java
Index: EmptyRecordSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/EmptyRecordSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmptyRecordSet.java 1 Aug 2003 19:40:17 -0000 1.3
+++ EmptyRecordSet.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
/**
* EmptyRecordSet implements an empty RecordSet.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class EmptyRecordSet implements RecordSet {
+
public boolean hasMoreRecords() {
return false;
}
1.4 +4 -4
xml-xindice/java/src/org/apache/xindice/core/data/Key.java
Index: Key.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/Key.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Key.java 1 Aug 2003 19:40:17 -0000 1.3
+++ Key.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
/**
* Key extends Value by providing a hash value for the Key.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class Key extends Value {
private int hash = 0;
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/core/data/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/NodeSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeSet.java 1 Aug 2003 19:40:17 -0000 1.2
+++ NodeSet.java 7 Aug 2003 20:13:21 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.w3c.dom.Node;
/**
* NodeSet is an interface for iterating over a set of Nodes. NodeSets
* are generally returned by the QueryEngine.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface NodeSet {
+
/**
* hasMoreNodes returns whether or not there are any Nodes remaining
* in the NodeSet.
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/core/data/Record.java
Index: Record.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/Record.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Record.java 1 Aug 2003 19:40:17 -0000 1.3
+++ Record.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import java.util.Map;
/**
* Record is a container for Key/Value pair. Record also provides
* metadata for a Value stored in the database.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class Record {
public static final String CREATED = "created";
public static final String MODIFIED = "modified";
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/data/RecordSet.java
Index: RecordSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/RecordSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RecordSet.java 1 Aug 2003 19:40:17 -0000 1.3
+++ RecordSet.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.apache.xindice.core.DBException;
/**
* RecordSet is an interface for iterating over a set of Records.
* It is almost always returned by Filers.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface RecordSet {
+
/**
* hasMoreRecords returns whether or not there are any Records
* left in the set.
1.5 +7 -5
xml-xindice/java/src/org/apache/xindice/core/data/Types.java
Index: Types.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/Types.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Types.java 1 Aug 2003 19:40:17 -0000 1.4
+++ Types.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
@@ -70,9 +70,11 @@
* @deprecated This class is only used by [EMAIL PROTECTED] Variant}, a
* deprecated class. If there is a clear need for it, it may come out
* of deprecation, else try to avoid it.
- **/
-
+ *
+ * @version CVS $Revision$, $Date$
+ */
public final class Types {
+
public final static int EMPTY = -1;
public final static int UNKNOWN = -1;
public final static int VOID = 0;
1.6 +6 -8
xml-xindice/java/src/org/apache/xindice/core/data/Value.java
Index: Value.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/Value.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Value.java 1 Aug 2003 19:40:17 -0000 1.5
+++ Value.java 7 Aug 2003 20:13:21 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.apache.xindice.util.XindiceRuntimeException;
import java.io.ByteArrayInputStream;
@@ -71,15 +71,15 @@
* Value is the primary base class for all data storing objects.
* The content window of Value objects are immutable, but the
* underlying byte array is not.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class Value implements Comparable {
+
protected byte[] data = null;
protected int pos = 0;
protected int len = -1;
- private Value() {
- }
public Value(Value value) {
data = value.data;
@@ -99,12 +99,10 @@
}
public Value(String data) {
-
try {
this.data = data.getBytes("utf-8");
this.len = this.data.length;
-
} catch (UnsupportedEncodingException e) {
throw new XindiceRuntimeException("Java doesn't support UTF-8
encoding", e);
1.6 +7 -5
xml-xindice/java/src/org/apache/xindice/core/data/Variant.java
Index: Variant.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/data/Variant.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Variant.java 1 Aug 2003 19:40:17 -0000 1.5
+++ Variant.java 7 Aug 2003 20:13:21 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.data;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.data;
+
import org.apache.xindice.xml.TextWriter;
import org.w3c.dom.Document;
@@ -74,11 +74,13 @@
* @deprecated This class is not used in the code. If there is a
* clear need for it, it may come out of deprecation, else try to
* avoid it.
- **/
-
+ * @version CVS $Revision$, $Date$
+ */
public final class Variant {
+
private Object value = null;
private int type = -1;
+
public Variant() {
}
1.14 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java
Index: BTree.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BTree.java 7 Aug 2003 18:03:21 -0000 1.13
+++ BTree.java 7 Aug 2003 20:13:21 -0000 1.14
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.DBException;
@@ -100,8 +100,9 @@
* This implementation supports the notion of nested roots. This means
* that you can create a btree where the pointers actually point to the
* root of a separate btree being managed in the same file.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class BTree extends Paged {
private static final Log log = LogFactory.getLog(BTree.class);
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeCallback.java
Index: BTreeCallback.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeCallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BTreeCallback.java 1 Aug 2003 19:40:17 -0000 1.3
+++ BTreeCallback.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.data.Value;
/**
* BTreeCallback is a callback interface for BTree queries.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface BTreeCallback {
+
/**
* indexInfo is a callback method for index enumeration.
*
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeCorruptException.java
Index: BTreeCorruptException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeCorruptException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BTreeCorruptException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ BTreeCorruptException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.FaultCodes;
/**
* A BTreecorruptException is thrown by the BTree if the BTree
* appears to be corrupted in some way.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class BTreeCorruptException extends BTreeException {
public BTreeCorruptException() {
super(FaultCodes.IDX_CORRUPTED);
1.5 +4 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeException.java
Index: BTreeException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BTreeException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ BTreeException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
/**
* A BTreeException is thrown by the BTree if an exception occurs
* in the managing of the BTree.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class BTreeException extends FilerException {
public BTreeException(int faultCode) {
super(faultCode);
1.12 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java
Index: BTreeFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BTreeFiler.java 7 Aug 2003 18:03:21 -0000 1.11
+++ BTreeFiler.java 7 Aug 2003 20:13:21 -0000 1.12
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.DBException;
@@ -82,8 +82,9 @@
/**
* BTreeFiler is a Filer implementation based on the BTree class.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class BTreeFiler extends BTree implements Configurable, Filer {
private static final Log log = LogFactory.getLog(BTreeFiler.class);
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeNotFoundException.java
Index: BTreeNotFoundException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeNotFoundException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BTreeNotFoundException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ BTreeNotFoundException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.FaultCodes;
/**
* A BTreeNotFoundException is thrown by the BTree if a Value
* can't be found in the BTree.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class BTreeNotFoundException extends BTreeException {
public BTreeNotFoundException() {
super(FaultCodes.IDX_VALUE_NOT_FOUND);
1.11 +5 -3
xml-xindice/java/src/org/apache/xindice/core/filer/FSFiler.java
Index: FSFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/FSFiler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FSFiler.java 7 Aug 2003 18:03:21 -0000 1.10
+++ FSFiler.java 7 Aug 2003 20:13:21 -0000 1.11
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.DBException;
@@ -83,6 +83,8 @@
/**
* FSFiler allows you to use existing file systems withing Xindice.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class FSFiler extends SimpleConfigurable implements Filer {
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/core/filer/Filer.java
Index: Filer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/Filer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Filer.java 1 Aug 2003 19:40:17 -0000 1.4
+++ Filer.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.DBException;
import org.apache.xindice.core.DBObject;
import org.apache.xindice.core.data.Key;
@@ -75,9 +75,11 @@
* is implemented in order to provide a data source to the Xindice Collection
* class. Filers are developed to perform transparent storage and retrieval
to
* and from heterogenous data sources (such as FTP, HTTP, RDBMS, etc...)
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Filer extends Named, DBObject, Configurable {
+
/**
* setLocation tells the Filer where to store its data.
*
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/FilerException.java
Index: FilerException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/FilerException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilerException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ FilerException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.DBException;
/**
* A FilerException is thrown by a Filer if an exception occurs
* in the managing of the Filer.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class FilerException extends DBException {
public FilerException(int faultCode) {
super(faultCode);
1.14 +4 -3
xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java
Index: HashFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HashFiler.java 7 Aug 2003 18:03:21 -0000 1.13
+++ HashFiler.java 7 Aug 2003 20:13:21 -0000 1.14
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.DBException;
@@ -89,6 +89,7 @@
*
* @deprecated This class has been temporarily (maybe indefinitely)
* deprecated by BTreeFiler.
+ * @version CVS $Revision$, $Date$
*/
public final class HashFiler extends Paged implements Configurable, Filer {
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/core/filer/MemFiler.java
Index: MemFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/MemFiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MemFiler.java 1 Aug 2003 19:40:17 -0000 1.6
+++ MemFiler.java 7 Aug 2003 20:13:21 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.DBException;
import org.apache.xindice.core.FaultCodes;
import org.apache.xindice.core.data.Key;
@@ -77,8 +77,9 @@
* MemFiler is an In-Memory Filer implementation for Xindice. MemFiler can
be
* used for temporary collections and caching. It's basically a layering on
* top of HashMap.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class MemFiler extends SimpleConfigurable implements Filer {
private Map hashTable = null;
private boolean opened = false;
1.15 +6 -4
xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java
Index: Paged.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/Paged.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Paged.java 1 Aug 2003 19:40:17 -0000 1.14
+++ Paged.java 7 Aug 2003 20:13:21 -0000 1.15
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.DBException;
import org.apache.xindice.core.FaultCodes;
import org.apache.xindice.core.data.Key;
@@ -83,9 +83,11 @@
* Paged is a paged file foundation that is used by both the BTree
* class and the HashFiler. It provides flexible paged I/O and
* page caching functionality.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class Paged {
+
// The maximum number of pages that will be held in the dirty cache.
private static final int MAX_DIRTY_SIZE = 128;
1.3 +9 -5
xml-xindice/java/src/org/apache/xindice/core/filer/SizeableMemFiler.java
Index: SizeableMemFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/SizeableMemFiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SizeableMemFiler.java 1 Aug 2003 19:40:17 -0000 1.2
+++ SizeableMemFiler.java 7 Aug 2003 20:13:21 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import org.apache.xindice.core.DBException;
import org.apache.xindice.core.FaultCodes;
import org.apache.xindice.core.data.Key;
@@ -79,13 +79,17 @@
* top of HashMap.
*
* @author Terry Rosenbaum ([EMAIL PROTECTED])
+ * @version CVS $Revision$, $Date$
*/
public final class SizeableMemFiler extends SimpleConfigurable implements
Filer {
+
+ public static final String INITIAL_SIZE_KEY =
"org.apache.xindice.core.filer.SizeableMemFiler.INITIAL_SIZE";
+ public static final int INITIAL_SIZE = 89;
+
private Map hashTable = null;
private boolean opened = false;
private boolean readOnly = false;
- public static final String INITIAL_SIZE_KEY =
"org.apache.xindice.core.filer.SizeableMemFiler.INITIAL_SIZE";
- public static final int INITIAL_SIZE = 89;
+
public SizeableMemFiler() {
String aSizeString = System.getProperty(INITIAL_SIZE_KEY);
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/filer/Streamable.java
Index: Streamable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/Streamable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Streamable.java 1 Aug 2003 19:40:17 -0000 1.3
+++ Streamable.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.filer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.filer;
+
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -66,9 +66,11 @@
/**
* Streamable is an interface implemented by objects used by Filers and
* Indexers in order to serialize objects to and from IO streams.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Streamable {
+
/**
* read reads the object state from the stream.
*
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/CannotCreateException.java
Index: CannotCreateException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/CannotCreateException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CannotCreateException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ CannotCreateException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.FaultCodes;
/**
* A CannotCreateException is thrown if an Indexer cannot
* be properly created in the server context for some reason.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class CannotCreateException extends IndexerException {
+
public CannotCreateException() {
super(FaultCodes.IDX_CANNOT_CREATE);
}
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/DuplicateIndexException.java
Index: DuplicateIndexException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/DuplicateIndexException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DuplicateIndexException.java 1 Aug 2003 19:40:17 -0000 1.4
+++ DuplicateIndexException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.FaultCodes;
/**
* A DuplicateIndexException is thrown if an Indexer create
* attempt duplicates an existing Indexer.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DuplicateIndexException extends IndexerException {
+
public DuplicateIndexException() {
super(FaultCodes.IDX_DUPLICATE_INDEX);
}
1.15 +5 -3
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java
Index: IndexManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IndexManager.java 7 Aug 2003 18:03:21 -0000 1.14
+++ IndexManager.java 7 Aug 2003 20:13:21 -0000 1.15
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -94,6 +94,8 @@
/**
* IndexManager is a class that manages Indexes. Good description, eh?
* I should win a Pulitzer Prize for that one.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class IndexManager extends SimpleConfigurable {
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexMatch.java
Index: IndexMatch.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexMatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexMatch.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexMatch.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,23 +54,28 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.data.Key;
/**
* IndexMatch is used for representing match information. IndexMatches
* are the basic unit of information between Indexers and the IndexManager
* for performing queries and query optimization.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexMatch implements Comparable {
+
private Key key; // The Document Key
private int pos; // Offset into the stream
private int len; // Length of substream
private short elem; // Element ID (for wildcards)
private short attr; // Attribute ID (if any)
+
public IndexMatch() {
key = null;
1.6 +7 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexPattern.java
Index: IndexPattern.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexPattern.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IndexPattern.java 1 Aug 2003 19:40:18 -0000 1.5
+++ IndexPattern.java 7 Aug 2003 20:13:21 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.filer.Streamable;
import org.apache.xindice.xml.NamespaceMap;
import org.apache.xindice.xml.SymbolTable;
@@ -71,9 +71,11 @@
/**
* IndexPattern is the internal representation of a pattern for index
* matching purposes.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexPattern implements Streamable {
+
public static final int PATTERN_NONE = -1;
public static final int PATTERN_WILDCARD = -2;
public static final int PATTERN_NAME = -3;
@@ -88,6 +90,7 @@
private short elemID = PATTERN_NONE;
private String attrName = null;
private short attrID = PATTERN_NONE;
+
public IndexPattern(SymbolTable symbols, String pattern, NamespaceMap
nsMap) {
this.symbols = symbols;
1.4 +8 -5
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexQuery.java
Index: IndexQuery.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQuery.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQuery.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.data.Value;
import java.util.Arrays;
@@ -67,9 +67,11 @@
* IndexQuery represents the most primitive form of index querying.
* Instances of this object should be created by QueryResolvers and
* cached in Query instances.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class IndexQuery {
+
// No Operator
public static final int ANY = 0; // Any And All Matches
@@ -101,7 +103,7 @@
public IndexQuery(IndexPattern pattern) {
this.pattern = pattern;
- op = ANY;
+ this.op = ANY;
}
public IndexQuery(IndexPattern pattern, int op, Value[] vals) {
@@ -256,6 +258,7 @@
: op == NSW;
}
+
return false;
}
1.4 +9 -8
xml-xindice/java/src/org/apache/xindice/core/indexer/Indexer.java
Index: Indexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/Indexer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Indexer.java 1 Aug 2003 19:40:18 -0000 1.3
+++ Indexer.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.DBException;
import org.apache.xindice.core.DBObject;
@@ -75,12 +75,14 @@
* the 'Style' of Indexer and the type of QueryResolver that is being
* used to performt he query. Currently, Xindice only internally
* supports one kind of Indexer: 'XPath'.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Indexer extends Named, DBObject, Configurable {
- static final String STYLE_NODENAME = "Node:Name";
- static final String STYLE_NODEVALUE = "Node:Value";
- static final String STYLE_FULLTEXT = "Node:FullText";
+
+ String STYLE_NODENAME = "Node:Name";
+ String STYLE_NODEVALUE = "Node:Value";
+ String STYLE_FULLTEXT = "Node:FullText";
/**
* setCollection tells the Indexer who its parent is.
@@ -160,4 +162,3 @@
*/
void flush() throws DBException;
}
-
1.5 +3 -3
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexerException.java
Index: IndexerException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexerException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IndexerException.java 30 May 2003 06:21:45 -0000 1.4
+++ IndexerException.java 7 Aug 2003 20:13:21 -0000 1.5
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.indexer;
@@ -64,8 +64,9 @@
/**
* A IndexerException is thrown by an Indexer if an exception occurs
* in the managing of the Indexer.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class IndexerException extends DBException {
public IndexerException(int faultCode) {
@@ -79,5 +80,4 @@
public IndexerException(int faultCode, String message, Throwable cause) {
super(faultCode, message, cause);
}
-
}
1.4 +13 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/MemValueIndexer.java
Index: MemValueIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/MemValueIndexer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemValueIndexer.java 7 Aug 2003 18:03:21 -0000 1.3
+++ MemValueIndexer.java 7 Aug 2003 20:13:21 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -48,8 +46,19 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999-2001, The dbXML
+ * Group, L.L.C., http://www.dbxmlgroup.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.DBException;
@@ -78,12 +87,12 @@
* useful for temporary indexing of persistent Collections.
*
* @author Terry Rosenbaum ([EMAIL PROTECTED])
- * @version 3/18/2003
+ * @version CVS $Revision$, $Date$
*/
public class MemValueIndexer implements Indexer {
/**
- * log used by this indexer
+ * Log used by this indexer
*/
private static final Log log = LogFactory.getLog(MemValueIndexer.class);
1.11 +5 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/NameIndexer.java
Index: NameIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/NameIndexer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NameIndexer.java 7 Aug 2003 18:03:21 -0000 1.10
+++ NameIndexer.java 7 Aug 2003 20:13:21 -0000 1.11
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -80,8 +80,9 @@
* NameIndexer is a basic implementation of the Indexer interface.
* It is used for maintaining element and [EMAIL PROTECTED] unique
* indexes.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NameIndexer extends BTree implements Indexer {
private static final Log log = LogFactory.getLog(NameIndexer.class);
1.10 +5 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/ValueIndexer.java
Index: ValueIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/ValueIndexer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValueIndexer.java 7 Aug 2003 18:03:21 -0000 1.9
+++ ValueIndexer.java 7 Aug 2003 20:13:21 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -82,8 +82,9 @@
* ValueIndexer is a basic implementation of the Indexer interface.
* It is used for maintaining element and [EMAIL PROTECTED] value
* indexes.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ValueIndexer extends BTree implements Indexer {
private static final Log log = LogFactory.getLog(ValueIndexer.class);
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryANY.java
Index: IndexQueryANY.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryANY.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryANY.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryANY.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryANY
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryANY extends IndexQuery {
+
public IndexQueryANY(IndexPattern pattern) {
super(pattern);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryBW.java
Index: IndexQueryBW.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryBW.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryBW.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryBW.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryBW
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryBW extends IndexQuery {
+
public IndexQueryBW(IndexPattern pattern, Value val1, Value val2) {
super(pattern, BW, val1, val2);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryBWX.java
Index: IndexQueryBWX.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryBWX.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryBWX.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryBWX.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryBWX
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryBWX extends IndexQuery {
+
public IndexQueryBWX(IndexPattern pattern, Value val1, Value val2) {
super(pattern, BWX, val1, val2);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryEQ.java
Index: IndexQueryEQ.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryEQ.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryEQ.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryEQ.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryEQ
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryEQ extends IndexQuery {
+
public IndexQueryEQ(IndexPattern pattern, Value val1) {
super(pattern, EQ, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryGEQ.java
Index: IndexQueryGEQ.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryGEQ.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryGEQ.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryGEQ.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryGEQ
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryGEQ extends IndexQuery {
+
public IndexQueryGEQ(IndexPattern pattern, Value val1) {
super(pattern, GEQ, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryGT.java
Index: IndexQueryGT.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryGT.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryGT.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryGT.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryGT
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryGT extends IndexQuery {
+
public IndexQueryGT(IndexPattern pattern, Value val1) {
super(pattern, GT, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryIN.java
Index: IndexQueryIN.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryIN.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryIN.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryIN.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
@@ -67,9 +67,11 @@
/**
* IndexQueryIN
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryIN extends IndexQuery {
+
public IndexQueryIN(IndexPattern pattern, Value[] vals) {
super(pattern, IN, vals);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryLEQ.java
Index: IndexQueryLEQ.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryLEQ.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryLEQ.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryLEQ.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryLEQ
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryLEQ extends IndexQuery {
+
public IndexQueryLEQ(IndexPattern pattern, Value val1) {
super(pattern, LEQ, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryLT.java
Index: IndexQueryLT.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryLT.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryLT.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryLT.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryLT
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryLT extends IndexQuery {
+
public IndexQueryLT(IndexPattern pattern, Value val1) {
super(pattern, LT, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNBW.java
Index: IndexQueryNBW.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNBW.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryNBW.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryNBW.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryNBW
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryNBW extends IndexQuery {
+
public IndexQueryNBW(IndexPattern pattern, Value val1, Value val2) {
super(pattern, NBW, val1, val2);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNBWX.java
Index: IndexQueryNBWX.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNBWX.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryNBWX.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryNBWX.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryNBWX
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryNBWX extends IndexQuery {
+
public IndexQueryNBWX(IndexPattern pattern, Value val1, Value val2) {
super(pattern, NBWX, val1, val2);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNEQ.java
Index: IndexQueryNEQ.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNEQ.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryNEQ.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryNEQ.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryNEQ
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryNEQ extends IndexQuery {
+
public IndexQueryNEQ(IndexPattern pattern, Value val1) {
super(pattern, NEQ, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNIN.java
Index: IndexQueryNIN.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNIN.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryNIN.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryNIN.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
@@ -67,9 +67,11 @@
/**
* IndexQueryNIN
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryNIN extends IndexQuery {
+
public IndexQueryNIN(IndexPattern pattern, Value[] vals) {
super(pattern, NIN, vals);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNSW.java
Index: IndexQueryNSW.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQueryNSW.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQueryNSW.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQueryNSW.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQueryNSW
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQueryNSW extends IndexQuery {
+
public IndexQueryNSW(IndexPattern pattern, Value val1) {
super(pattern, NSW, val1);
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQuerySW.java
Index: IndexQuerySW.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/helpers/IndexQuerySW.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexQuerySW.java 1 Aug 2003 19:40:18 -0000 1.3
+++ IndexQuerySW.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.indexer.helpers;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.indexer.helpers;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.core.indexer.IndexPattern;
import org.apache.xindice.core.indexer.IndexQuery;
/**
* IndexQuerySW
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class IndexQuerySW extends IndexQuery {
+
public IndexQuerySW(IndexPattern pattern, Value val1) {
super(pattern, SW, val1);
}
1.5 +4 -3
xml-xindice/java/src/org/apache/xindice/core/meta/MetaData.java
Index: MetaData.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/MetaData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MetaData.java 7 Aug 2003 18:03:21 -0000 1.4
+++ MetaData.java 7 Aug 2003 20:13:22 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.xml.TextWriter;
@@ -95,6 +95,7 @@
*
* @author ku
* @author Dave Viner <[EMAIL PROTECTED]>
+ * @version CVS $Revision$, $Date$
*/
public class MetaData implements XMLSerializable {
1.4 +5 -3
xml-xindice/java/src/org/apache/xindice/core/meta/TimeRecord.java
Index: TimeRecord.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/TimeRecord.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeRecord.java 1 Aug 2003 19:40:18 -0000 1.3
+++ TimeRecord.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta;
+
import java.util.Date;
/**
* Encapsulates the modified/create times used in MetaData.
*
+ * @version CVS $Revision$, $Date$
*/
public class TimeRecord {
+
long created = 0;
long modified = 0;
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineHeaderBuilder.java
Index: InlineHeaderBuilder.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineHeaderBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InlineHeaderBuilder.java 7 Aug 2003 18:03:21 -0000 1.3
+++ InlineHeaderBuilder.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.data.Value;
@@ -71,6 +71,7 @@
* preceding the data. The second header byte contains the version number
* of the metadata. Remaining header bytes are the version-specific
metadata.
*
+ * <pre>
* Version 0: Null
* no version-specific metdata, two byte total length
* byte 1: 2
@@ -81,8 +82,10 @@
* byte 1: 2
* byte 2: 1
* byte 3: content type (1 => xml, 2 => binary)
+ * </pre>
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class InlineHeaderBuilder {
private static final Log log =
LogFactory.getLog(InlineHeaderBuilder.class);
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaException.java
Index: InlineMetaException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InlineMetaException.java 1 Aug 2003 19:40:18 -0000 1.2
+++ InlineMetaException.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.xindice.core.DBException;
/**
* An InlineMetaException is thrown by inline metadata code if an exception
occurs
* in the managing of the metadata.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class InlineMetaException extends DBException {
+
public InlineMetaException(int faultCode) {
super(faultCode);
}
1.3 +5 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaMap.java
Index: InlineMetaMap.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InlineMetaMap.java 1 Aug 2003 19:40:18 -0000 1.2
+++ InlineMetaMap.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,11 +54,15 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
/**
* The inline meta data is a collection of name-value pairs.
+ *
+ * @version CVS $Revision$, $Date$
*/
public interface InlineMetaMap {
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaReader.java
Index: InlineMetaReader.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InlineMetaReader.java 1 Aug 2003 19:40:18 -0000 1.2
+++ InlineMetaReader.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
/**
* The <code>Value</code> associated with a <code>Record</code>
* can be prefixed by a header containing 'inline' metadata.
* The original motivation for
* this extension is to support binary resources in the same
* filer where the XML documents live.
+ *
+ * @version CVS $Revision$, $Date$
*/
public interface InlineMetaReader {
@@ -84,7 +86,7 @@
* beginning of the header.
* @param length of the header data
* @return Map containing the attributes read from the header
- * @throws DBException if the header data is corrupted or of
+ * @throws InlineMetaException if the header data is corrupted or of
* the wrong length
*/
InlineMetaMap read(byte[] data, int offset, int length) throws
InlineMetaException;
1.5 +4 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaService.java
Index: InlineMetaService.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InlineMetaService.java 7 Aug 2003 18:03:21 -0000 1.4
+++ InlineMetaService.java 7 Aug 2003 20:13:22 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.FaultCodes;
@@ -69,6 +69,7 @@
* object holds an instance of this class. All services the collection
* needs for working with inline metadata are provided by this class.
*
+ * @version CVS $Revision$, $Date$
*/
public class InlineMetaService {
1.3 +5 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaWriter.java
Index: InlineMetaWriter.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/InlineMetaWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InlineMetaWriter.java 1 Aug 2003 19:40:18 -0000 1.2
+++ InlineMetaWriter.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
/**
* The <code>Value</code> associated with a <code>Record</code>
* can be prefixed by a header containing 'inline' metadata.
@@ -66,6 +66,8 @@
* The original motivation for
* this extension is to support binary resources in the same
* filer where the XML documents live.
+ *
+ * @version CVS $Revision$, $Date$
*/
public interface InlineMetaWriter {
1.3 +4 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullReader.java
Index: NullReader.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NullReader.java 1 Aug 2003 19:40:18 -0000 1.2
+++ NullReader.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.xindice.core.FaultCodes;
/**
@@ -66,6 +66,7 @@
* of the metadata-free database with a database using the metadata
* machinery but containing no metadata.
*
+ * @version CVS $Revision$, $Date$
*/
public class NullReader implements InlineMetaReader {
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullWriter.java
Index: NullWriter.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/NullWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NullWriter.java 1 Aug 2003 19:40:18 -0000 1.2
+++ NullWriter.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,13 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
/**
* Write metadata of length zero. Handy for comparing performance
* of the metadata-free database with a database using the metadata
* machinery but containing no metadata.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class NullWriter implements InlineMetaWriter {
@@ -79,5 +81,4 @@
public byte[] getMetadata(InlineMetaMap map) throws InlineMetaException {
return new byte[0];
}
-
}
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeReader.java
Index: ResourceTypeReader.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceTypeReader.java 7 Aug 2003 18:03:21 -0000 1.3
+++ ResourceTypeReader.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.FaultCodes;
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class ResourceTypeReader implements InlineMetaReader {
1.3 +5 -3
xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeWriter.java
Index: ResourceTypeWriter.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/inline/ResourceTypeWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceTypeWriter.java 1 Aug 2003 19:40:18 -0000 1.2
+++ ResourceTypeWriter.java 7 Aug 2003 20:13:22 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.meta.inline;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,13 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.meta.inline;
+
import org.apache.xindice.core.FaultCodes;
/**
* Write metadata identifying the resource type (xml or binary).
+ *
+ * @version CVS $Revision$, $Date$
*/
public class ResourceTypeWriter implements InlineMetaWriter {
1.6 +6 -5
xml-xindice/java/src/org/apache/xindice/core/query/CompilationException.java
Index: CompilationException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/CompilationException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompilationException.java 1 Aug 2003 19:40:19 -0000 1.5
+++ CompilationException.java 7 Aug 2003 20:13:22 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.FaultCodes;
/**
* A CompilationException is thrown by a Query if for some reason,
* it can't compile the query being processed.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class CompilationException extends QueryException {
+
public CompilationException() {
super(FaultCodes.QRY_COMPILATION_ERROR);
}
@@ -78,5 +80,4 @@
public CompilationException(String message, Throwable cause) {
super(FaultCodes.QRY_COMPILATION_ERROR, message, cause);
}
-
}
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/core/query/NodeListSet.java
Index: NodeListSet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/NodeListSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeListSet.java 1 Aug 2003 19:40:19 -0000 1.3
+++ NodeListSet.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.data.NodeSet;
import org.apache.xindice.xml.dom.DBNode;
@@ -67,11 +67,14 @@
/**
* NodeListSet is a simple NodeList wrapper
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NodeListSet implements NodeSet {
+
public NodeList list;
public int idx = 0;
+
public NodeListSet(NodeList list) {
this.list = list;
1.6 +6 -5
xml-xindice/java/src/org/apache/xindice/core/query/ProcessingException.java
Index: ProcessingException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/ProcessingException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessingException.java 1 Aug 2003 19:40:19 -0000 1.5
+++ ProcessingException.java 7 Aug 2003 20:13:22 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.FaultCodes;
/**
* A ProcessingException is thrown by a Query if for some reason,
* it fails to actually process the query request.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ProcessingException extends QueryException {
+
public ProcessingException() {
super(FaultCodes.QRY_PROCESSING_ERROR);
}
@@ -78,5 +80,4 @@
public ProcessingException(String message, Throwable cause) {
super(FaultCodes.QRY_COMPILATION_ERROR, message, cause);
}
-
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/query/Query.java
Index: Query.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/Query.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Query.java 1 Aug 2003 19:40:19 -0000 1.3
+++ Query.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.Key;
import org.apache.xindice.core.data.NodeSet;
@@ -66,9 +66,11 @@
/**
* Query represents a compiled (parsed and primed) query.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Query {
+
/**
* getQueryStyle returns the QueryStyle (ex: XPath) for this Query
* instance.
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/core/query/QueryEngine.java
Index: QueryEngine.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/QueryEngine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QueryEngine.java 7 Aug 2003 18:03:21 -0000 1.6
+++ QueryEngine.java 7 Aug 2003 20:13:22 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -85,8 +85,9 @@
* query operations against the Xindice repository. The QueryEngine
* basically just manages a set of QueryResolvers that actually perform
* the work.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class QueryEngine extends SimpleConfigurable {
private static final Log log = LogFactory.getLog(QueryEngine.class);
1.8 +6 -5
xml-xindice/java/src/org/apache/xindice/core/query/QueryException.java
Index: QueryException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/QueryException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- QueryException.java 1 Aug 2003 19:40:19 -0000 1.7
+++ QueryException.java 7 Aug 2003 20:13:22 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.DBException;
/**
* A QueryException is thrown by a Query if an exception occurs
* in the processing of the Query.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class QueryException extends DBException {
+
public QueryException(int faultCode) {
super(faultCode);
}
@@ -78,5 +80,4 @@
public QueryException(int faultCode, String message, Throwable cause) {
super(faultCode, message, cause);
}
-
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/core/query/QueryResolver.java
Index: QueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/QueryResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QueryResolver.java 1 Aug 2003 19:40:19 -0000 1.3
+++ QueryResolver.java 7 Aug 2003 20:13:22 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.Key;
import org.apache.xindice.core.data.NodeSet;
@@ -69,9 +69,11 @@
* QueryResolver is an interface that has to be implemented to actually
* perfrom query resolution. Xindice provides an XPathQueryResolver to
* handle XPath queries against sets of Documents in a Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface QueryResolver extends Configurable {
+
/**
* setQueryEngine hands a reference for the QueryEngine to the
* Resolver.
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/core/query/StyleNotFoundException.java
Index: StyleNotFoundException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/StyleNotFoundException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StyleNotFoundException.java 1 Aug 2003 19:40:19 -0000 1.4
+++ StyleNotFoundException.java 7 Aug 2003 20:13:22 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import org.apache.xindice.core.FaultCodes;
/**
* A StyleNotFoundException is thrown by a Query if the QueryEngine
* can't resolve a specified style name.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class StyleNotFoundException extends QueryException {
+
public StyleNotFoundException() {
super(FaultCodes.QRY_STYLE_NOT_FOUND);
}
1.17 +5 -5
xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java
Index: XPathQueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XPathQueryResolver.java 7 Aug 2003 18:03:21 -0000 1.16
+++ XPathQueryResolver.java 7 Aug 2003 20:13:22 -0000 1.17
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.query;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.query;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -118,8 +118,9 @@
/**
* XPathQueryResolver
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class XPathQueryResolver extends SimpleConfigurable implements
QueryResolver {
private static final Log log =
LogFactory.getLog(XPathQueryResolver.class);
@@ -187,7 +188,6 @@
/**
* XPathQuery
*/
-
private class XPathQuery implements Query {
public Collection context;
public IndexManager idxMgr;
1.13 +5 -4
xml-xindice/java/src/org/apache/xindice/core/request/URIMapper.java
Index: URIMapper.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/request/URIMapper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- URIMapper.java 7 Aug 2003 18:03:22 -0000 1.12
+++ URIMapper.java 7 Aug 2003 20:13:23 -0000 1.13
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.request;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.request;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -85,8 +85,9 @@
* URIs can identify any of several different object types, each of which
* exposes a different (or slightly different) interface to the outside
* world.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class URIMapper extends URLConnection implements Poolable {
private static final Log log = LogFactory.getLog(URIMapper.class);
1.5 +6 -9
xml-xindice/java/src/org/apache/xindice/core/request/XindiceStreamHandler.java
Index: XindiceStreamHandler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/request/XindiceStreamHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XindiceStreamHandler.java 1 Aug 2003 19:40:19 -0000 1.4
+++ XindiceStreamHandler.java 7 Aug 2003 20:13:23 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.request;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,28 +54,27 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.request;
+
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
/**
- *
* XindiceStreamHandler handler that knows how to handle Xindice URL
instances
*
+ * @version CVS $Revision$, $Date$
*/
-
public class XindiceStreamHandler extends URLStreamHandler {
/**
- * Returns a URLConnection object that represents a connection to the
remote object referred to by the URL.
- *
+ * Returns a URLConnection object that represents a connection to the
+ * remote object referred to by the URL.
*/
protected URLConnection openConnection(URL u) {
return new URIMapper(u);
}
-
-
}
1.4 +12 -16
xml-xindice/java/src/org/apache/xindice/core/request/XindiceStreamHandlerFactory.java
Index: XindiceStreamHandlerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/request/XindiceStreamHandlerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XindiceStreamHandlerFactory.java 1 Aug 2003 19:40:19 -0000 1.3
+++ XindiceStreamHandlerFactory.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.request;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,28 +54,28 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.request;
+
import java.net.URL;
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
-
/**
-
- This interface defines a factory for URL stream protocol handlers.
- It is used by the URL class to create a URLStreamHandler for a specific
protocol.
-
+ * This interface defines a factory for URL stream protocol handlers.
+ * It is used by the URL class to create a URLStreamHandler for a specific
protocol.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
-
public class XindiceStreamHandlerFactory implements URLStreamHandlerFactory {
+
static {
URL.setURLStreamHandlerFactory(new XindiceStreamHandlerFactory());
}
- String OurProtocol = "xindice";
+ private static final String PROTOCOL = "xindice";
/**
* Creates an instance of an URLStreamHandler
@@ -85,14 +83,12 @@
public URLStreamHandler createURLStreamHandler(String protocol) {
// If dealing with a Xindice object, return our stream handler
- if (protocol.equalsIgnoreCase(OurProtocol)) {
+ if (protocol.equalsIgnoreCase(PROTOCOL)) {
return new XindiceStreamHandler();
}
// Else return null to use default stream handler for protocol
- else
+ else {
return null;
+ }
}
-
-
}
-
1.7 +5 -3
xml-xindice/java/src/org/apache/xindice/core/xupdate/XObjectImpl.java
Index: XObjectImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XObjectImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XObjectImpl.java 1 Aug 2003 19:40:19 -0000 1.6
+++ XObjectImpl.java 7 Aug 2003 20:13:23 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.xupdate;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.xupdate;
+
import org.apache.xpath.objects.XObject;
import org.w3c.dom.DocumentFragment;
@@ -66,6 +66,8 @@
/**
* Wrapper for Xalan XObject
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class XObjectImpl implements
org.xmldb.common.xml.queries.XObject {
1.6 +7 -3
xml-xindice/java/src/org/apache/xindice/core/xupdate/XPathQueryFactoryImpl.java
Index: XPathQueryFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XPathQueryFactoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathQueryFactoryImpl.java 1 Aug 2003 19:40:19 -0000 1.5
+++ XPathQueryFactoryImpl.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.xupdate;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,13 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.xupdate;
+
import org.xmldb.common.xml.queries.XPathQuery;
import org.xmldb.common.xml.queries.XPathQueryConfigurationException;
import org.xmldb.common.xml.queries.XPathQueryFactory;
+/**
+ *
+ * @version CVS $Revision$, $Date$
+ */
public final class XPathQueryFactoryImpl extends XPathQueryFactory {
public XPathQuery newXPathQuery() throws
XPathQueryConfigurationException {
1.7 +5 -3
xml-xindice/java/src/org/apache/xindice/core/xupdate/XPathQueryImpl.java
Index: XPathQueryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XPathQueryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathQueryImpl.java 1 Aug 2003 19:40:19 -0000 1.6
+++ XPathQueryImpl.java 7 Aug 2003 20:13:23 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.xupdate;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.xupdate;
+
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xpath.XPath;
@@ -72,6 +72,8 @@
/**
* XPath Query Impl to handle Xalan 2 XPath constructs.
+ *
+ * @version CVS $Revision$, $Date$
*/
public final class XPathQueryImpl implements XPathQuery {
private String qstring;
1.9 +6 -3
xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java
Index: XUpdateImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XUpdateImpl.java 1 Aug 2003 19:40:19 -0000 1.8
+++ XUpdateImpl.java 7 Aug 2003 20:13:23 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.xupdate;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.xupdate;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.NodeSet;
import org.apache.xindice.xml.NamespaceMap;
@@ -82,8 +82,11 @@
*
* For more detail about XUpdate look at the
* <a href="http://www.xmldb.org/xupdate/xupdate-wd.html";>XUpdate Working
Draft</a>.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XUpdateImpl extends XUpdateQueryImpl {
+
protected int nodesModified = 0;
protected NamespaceMap nsMap;
1.11 +8 -4
xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateQueryResolver.java
Index: XUpdateQueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateQueryResolver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XUpdateQueryResolver.java 7 Aug 2003 18:03:22 -0000 1.10
+++ XUpdateQueryResolver.java 7 Aug 2003 20:13:23 -0000 1.11
@@ -1,5 +1,3 @@
-package org.apache.xindice.core.xupdate;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.core.xupdate;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
@@ -85,13 +85,16 @@
/**
* XUpdateQueryResolver
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XUpdateQueryResolver extends SimpleConfigurable implements
QueryResolver {
- private static Log log = LogFactory.getLog(XUpdateQueryResolver.class);
+ private static final Log log =
LogFactory.getLog(XUpdateQueryResolver.class);
private static final String XUPDATE_XPATH_PROP =
"org.xmldb.common.xml.queries.XPathQueryFactory";
private static final String XUPDATE_XPATH_IMPL =
"org.apache.xindice.core.xupdate.XPathQueryFactoryImpl";
+
static {
System.setProperty(XUPDATE_XPATH_PROP, XUPDATE_XPATH_IMPL);
}
@@ -99,6 +102,7 @@
public static final String STYLE_XUPDATE = "XUpdate";
private QueryEngine engine;
+
public void setConfig(Configuration config) throws XindiceException {
super.setConfig(config);
1.4 +2 -3
xml-xindice/java/src/org/apache/xindice/server/ManagedServer.java
Index: ManagedServer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/ManagedServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManagedServer.java 7 Aug 2003 18:03:22 -0000 1.3
+++ ManagedServer.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.server;
@@ -79,8 +79,7 @@
* fires up all will be good.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin O'Neill</a>
- *
- * @version $Revision$ - $Date$
+ * @version CVS $Revision$, $Date$
*/
public class ManagedServer {
1.5 +61 -1
xml-xindice/java/src/org/apache/xindice/server/UglyBrowser.java
Index: UglyBrowser.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/UglyBrowser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UglyBrowser.java 6 Aug 2003 19:12:10 -0000 1.4
+++ UglyBrowser.java 7 Aug 2003 20:13:23 -0000 1.5
@@ -1,3 +1,62 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xindice" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999-2001, The dbXML
+ * Group, L.L.C., http://www.dbxmlgroup.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * CVS $Id$
+ */
+
package org.apache.xindice.server;
import org.apache.xindice.core.Collection;
@@ -18,6 +77,7 @@
* Moved out of XindiceServlet for separation of display and server
bootstrapping.
*
* @author kross
+ * @version CVS $Revision$, $Date$
*/
public class UglyBrowser {
1.13 +5 -3
xml-xindice/java/src/org/apache/xindice/server/Xindice.java
Index: Xindice.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/Xindice.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Xindice.java 1 Aug 2003 01:40:09 -0000 1.12
+++ Xindice.java 7 Aug 2003 20:13:23 -0000 1.13
@@ -1,5 +1,3 @@
-package org.apache.xindice.server;
-
/*
* The Apache Software License, Version 1.1
*
@@ -55,12 +53,16 @@
* Group, L.L.C., http://www.dbxmlgroup.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * CVS $Id$
*/
+package org.apache.xindice.server;
+
/**
* Defines the Xindice version-related constants.
*
- * @version CVS: $Id$
+ * @version CVS $Revision$, $Date$
*/
public interface Xindice {
1.20 +4 -3
xml-xindice/java/src/org/apache/xindice/server/XindiceServlet.java
Index: XindiceServlet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/XindiceServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XindiceServlet.java 7 Aug 2003 18:03:22 -0000 1.19
+++ XindiceServlet.java 7 Aug 2003 20:13:23 -0000 1.20
@@ -1,5 +1,3 @@
-package org.apache.xindice.server;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Database;
@@ -89,6 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vladimir R. Bossicard</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Gianugo Rabellino</a>
+ * @version CVS $Revision$, $Date$
*/
public class XindiceServlet extends HttpServlet {
1.10 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/RPCDefaultMessage.java
Index: RPCDefaultMessage.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/RPCDefaultMessage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RPCDefaultMessage.java 1 Aug 2003 19:40:19 -0000 1.9
+++ RPCDefaultMessage.java 7 Aug 2003 20:13:23 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.Database;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
+ * @version CVS $Revision$, $Date$
*/
public abstract class RPCDefaultMessage implements RPCMessage {
1.4 +5 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/RPCMessage.java
Index: RPCMessage.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/RPCMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RPCMessage.java 1 Aug 2003 19:40:19 -0000 1.3
+++ RPCMessage.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc;
+
import java.util.Hashtable;
/**
*
+ * @version CVS $Revision$, $Date$
*/
public interface RPCMessage {
+
public Hashtable execute(Hashtable message) throws Exception;
}
1.6 +4 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/RPCMessageInterface.java
Index: RPCMessageInterface.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/RPCMessageInterface.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RPCMessageInterface.java 1 Aug 2003 19:40:19 -0000 1.5
+++ RPCMessageInterface.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,13 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc;
+
import java.util.Hashtable;
/**
*
+ * @version CVS $Revision$, $Date$
*/
public final class RPCMessageInterface {
@@ -73,5 +74,4 @@
RPCMessage handler = (RPCMessage)
Class.forName("org.apache.xindice.server.rpc.messages." +
message.get(MESSAGE_PARAM)).newInstance();
return handler.execute(message);
}
-
}
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateCollection.java
Index: CreateCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateCollection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CreateCollection.java 1 Aug 2003 19:40:20 -0000 1.4
+++ CreateCollection.java 7 Aug 2003 20:13:23 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.CollectionManager;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.util.Configuration;
@@ -72,6 +72,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class CreateCollection extends RPCDefaultMessage {
@@ -113,7 +114,7 @@
colman.createCollection((String) message.get(NAME), config);
Hashtable result = new Hashtable();
- result.put(RESULT, (String) message.get(NAME));
+ result.put(RESULT, message.get(NAME));
return result;
}
}
1.6 +5 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateIndexer.java
Index: CreateIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateIndexer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateIndexer.java 1 Aug 2003 19:40:20 -0000 1.5
+++ CreateIndexer.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.util.Configuration;
@@ -72,6 +72,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class CreateIndexer extends RPCDefaultMessage {
@@ -116,7 +117,7 @@
col.createIndexer(config);
Hashtable result = new Hashtable();
- result.put(RESULT, (String) message.get(NAME));
+ result.put(RESULT, message.get(NAME));
return result;
}
}
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateNewOID.java
Index: CreateNewOID.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/CreateNewOID.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CreateNewOID.java 1 Aug 2003 19:40:20 -0000 1.3
+++ CreateNewOID.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class CreateNewOID extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetApiVersion.java
Index: GetApiVersion.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetApiVersion.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetApiVersion.java 1 Aug 2003 19:40:20 -0000 1.3
+++ GetApiVersion.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import java.util.Hashtable;
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class GetApiVersion extends RPCDefaultMessage {
1.8 +5 -6
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionConfiguration.java
Index: GetCollectionConfiguration.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionConfiguration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GetCollectionConfiguration.java 1 Aug 2003 19:40:20 -0000 1.7
+++ GetCollectionConfiguration.java 7 Aug 2003 20:13:23 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class GetCollectionConfiguration extends RPCDefaultMessage {
@@ -77,12 +78,10 @@
Hashtable result = new Hashtable();
try {
-
/* getCollection() throws an exception if collection doesnt
exist */
- Collection col = getCollection((String) message.get(COLLECTION));
+ getCollection((String) message.get(COLLECTION));
result.put(RESULT, "yes");
} catch (Exception e) {
-
result.put(RESULT, "no");
}
1.5 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionCount.java
Index: GetCollectionCount.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionCount.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GetCollectionCount.java 1 Aug 2003 19:40:20 -0000 1.4
+++ GetCollectionCount.java 7 Aug 2003 20:13:23 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -68,6 +68,7 @@
* XML-RPC message to list number of child collections in a collection
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public class GetCollectionCount extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionMeta.java
Index: GetCollectionMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetCollectionMeta.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetCollectionMeta.java 1 Aug 2003 19:40:20 -0000 1.3
+++ GetCollectionMeta.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.meta.MetaData;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -73,6 +73,7 @@
* XML-RPC message to fetch the meta data associated with a document
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Viner</a>
+ * @version CVS $Revision$, $Date$
*/
public class GetCollectionMeta extends RPCDefaultMessage {
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocument.java
Index: GetDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetDocument.java 1 Aug 2003 19:40:20 -0000 1.3
+++ GetDocument.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.util.SymbolSerializer;
@@ -70,6 +70,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class GetDocument extends RPCDefaultMessage {
@@ -86,7 +87,7 @@
Collection col = getCollection((String) message.get(COLLECTION));
- Document doc = col.getDocument((String) message.get(NAME));
+ Document doc = col.getDocument(message.get(NAME));
if (doc == null) {
throw new Exception(API_NAME + ": Document not found " +
(String) message.get(NAME));
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentCount.java
Index: GetDocumentCount.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentCount.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetDocumentCount.java 1 Aug 2003 19:40:20 -0000 1.3
+++ GetDocumentCount.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class GetDocumentCount extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentMeta.java
Index: GetDocumentMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentMeta.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetDocumentMeta.java 1 Aug 2003 19:40:20 -0000 1.3
+++ GetDocumentMeta.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.meta.MetaData;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -73,6 +73,7 @@
* XML-RPC message to fetch the meta data associated with a document
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Viner</a>
+ * @version CVS $Revision$, $Date$
*/
public class GetDocumentMeta extends RPCDefaultMessage {
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetIndexerConfiguration.java
Index: GetIndexerConfiguration.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetIndexerConfiguration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GetIndexerConfiguration.java 1 Aug 2003 19:40:20 -0000 1.6
+++ GetIndexerConfiguration.java 7 Aug 2003 20:13:23 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.indexer.Indexer;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -69,6 +69,8 @@
* Check if an indexer in a particular collection exists...
*
* Warning: this message is not used at all by the current XML-RPC client...
+ *
+ * @version CVS $Revision$, $Date$
*/
public class GetIndexerConfiguration extends RPCDefaultMessage {
@@ -82,7 +84,6 @@
// TODO: figure out what goes here. done.
try {
-
Collection col = getCollection((String) message.get(COLLECTION));
Indexer idx = col.getIndexer((String) message.get(NAME));
1.3 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetServerVersion.java
Index: GetServerVersion.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetServerVersion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GetServerVersion.java 1 Aug 2003 19:40:20 -0000 1.2
+++ GetServerVersion.java 7 Aug 2003 20:13:23 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.server.Xindice;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class GetServerVersion extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/InsertDocument.java
Index: InsertDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/InsertDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InsertDocument.java 1 Aug 2003 19:40:20 -0000 1.3
+++ InsertDocument.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.xml.dom.DOMParser;
@@ -69,6 +69,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class InsertDocument extends RPCDefaultMessage {
public Hashtable execute(Hashtable message) throws Exception {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListCollections.java
Index: ListCollections.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListCollections.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListCollections.java 1 Aug 2003 19:40:20 -0000 1.3
+++ ListCollections.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -67,6 +67,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class ListCollections extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListDocuments.java
Index: ListDocuments.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListDocuments.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListDocuments.java 1 Aug 2003 19:40:20 -0000 1.3
+++ ListDocuments.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -67,6 +67,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class ListDocuments extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListIndexers.java
Index: ListIndexers.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/ListIndexers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListIndexers.java 1 Aug 2003 19:40:20 -0000 1.3
+++ ListIndexers.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -67,6 +67,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class ListIndexers extends RPCDefaultMessage {
1.5 +12 -9
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Query.java
Index: Query.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Query.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Query.java 1 Aug 2003 19:40:20 -0000 1.4
+++ Query.java 7 Aug 2003 20:13:23 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.NodeSet;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -76,8 +76,9 @@
/**
* Executes a query against a document or collection
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class Query extends RPCDefaultMessage {
public Hashtable execute(Hashtable message) throws Exception {
@@ -98,12 +99,14 @@
NodeSet ns = null;
if (message.containsKey(NAME)) {
-
- ns = col.queryDocument((String) message.get(TYPE), (String)
message.get(QUERY), mapNamespaces((Hashtable) message.get(NAMESPACES)),
(String) message.get(NAME));
-
+ ns = col.queryDocument((String) message.get(TYPE),
+ (String) message.get(QUERY),
+ mapNamespaces((Hashtable)
message.get(NAMESPACES)),
+ message.get(NAME));
} else {
-
- ns = col.queryCollection((String) message.get(TYPE), (String)
message.get(QUERY), mapNamespaces((Hashtable) message.get(NAMESPACES)));
+ ns = col.queryCollection((String) message.get(TYPE),
+ (String) message.get(QUERY),
+ mapNamespaces((Hashtable)
message.get(NAMESPACES)));
}
Hashtable result = new Hashtable();
1.6 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveCollection.java
Index: RemoveCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveCollection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoveCollection.java 4 Aug 2003 03:01:57 -0000 1.5
+++ RemoveCollection.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class RemoveCollection extends RPCDefaultMessage {
// TODO: should have a simple way to validate params. done.
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveDocument.java
Index: RemoveDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoveDocument.java 1 Aug 2003 19:40:20 -0000 1.3
+++ RemoveDocument.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class RemoveDocument extends RPCDefaultMessage {
1.4 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveIndexer.java
Index: RemoveIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/RemoveIndexer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoveIndexer.java 1 Aug 2003 19:40:20 -0000 1.3
+++ RemoveIndexer.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
@@ -66,6 +66,7 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class RemoveIndexer extends RPCDefaultMessage {
1.4 +3 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetCollectionMeta.java
Index: SetCollectionMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetCollectionMeta.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetCollectionMeta.java 1 Aug 2003 19:40:20 -0000 1.3
+++ SetCollectionMeta.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,10 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.meta.MetaData;
@@ -75,6 +74,7 @@
* XML-RPC message to set the meta data associated with a collection
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Viner</a>
+ * @version CVS $Revision$, $Date$
*/
public class SetCollectionMeta extends RPCDefaultMessage {
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocument.java
Index: SetDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetDocument.java 1 Aug 2003 19:40:20 -0000 1.3
+++ SetDocument.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.xml.dom.DOMParser;
@@ -69,10 +69,11 @@
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class SetDocument extends RPCDefaultMessage {
- public Hashtable execute(Hashtable message) throws Exception {
+ public Hashtable execute(Hashtable message) throws Exception {
if (!message.containsKey(COLLECTION)) {
throw new Exception(MISSING_COLLECTION_PARAM);
}
1.4 +3 -4
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocumentMeta.java
Index: SetDocumentMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocumentMeta.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetDocumentMeta.java 1 Aug 2003 19:40:20 -0000 1.3
+++ SetDocumentMeta.java 7 Aug 2003 20:13:23 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,10 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.meta.MetaData;
@@ -75,9 +74,9 @@
* XML-RPC message to set the meta data associated with a document
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Viner</a>
+ * @version CVS $Revision$, $Date$
*/
public class SetDocumentMeta extends RPCDefaultMessage {
-
/**
* Set the MetaData object for the requested document.
1.6 +5 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Shutdown.java
Index: Shutdown.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Shutdown.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Shutdown.java 1 Aug 2003 19:40:20 -0000 1.5
+++ Shutdown.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import java.util.Hashtable;
/**
* This message probably isn't necessary anymore.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class Shutdown extends RPCDefaultMessage {
1.6 +4 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/UpdateIndexer.java
Index: UpdateIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/UpdateIndexer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpdateIndexer.java 1 Aug 2003 19:40:20 -0000 1.5
+++ UpdateIndexer.java 7 Aug 2003 20:13:23 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.server.rpc.messages;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.server.rpc.messages;
+
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import java.util.Hashtable;
/**
*
+ * @version CVS $Revision$, $Date$
*/
public class UpdateIndexer extends RPCDefaultMessage {
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/tools/ArgTokenizer.java
Index: ArgTokenizer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/ArgTokenizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArgTokenizer.java 1 Aug 2003 19:40:20 -0000 1.3
+++ ArgTokenizer.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,19 +54,24 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools;
+
import java.util.StringTokenizer;
/**
* ArgTokenizer performs the difficult task of parsing
* command-line arguments from various sources.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ArgTokenizer {
+
private int idx = 0;
private String[] args;
+
public ArgTokenizer(String[] args) {
this.args = args;
1.7 +5 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeploymentTask.java 1 Aug 2003 19:40:20 -0000 1.6
+++ DeploymentTask.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.xindice.server.Xindice;
@@ -67,8 +67,10 @@
* Handles basic deployment of Xindice services using ant.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kimbro Staken</a>
+ * @version CVS $Revision$, $Date$
*/
public class DeploymentTask extends Task {
+
private String collection = "test/ocs";
private String db = "Database";
private String home = "";
1.22 +5 -4
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLTools.java 7 Aug 2003 18:03:22 -0000 1.21
+++ XMLTools.java 7 Aug 2003 20:13:24 -0000 1.22
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -82,10 +82,11 @@
import org.xmldb.api.base.Database;
import org.xmldb.api.base.XMLDBException;
-
/**
* XMLAdmin is designed to take command line arguments and give
* user Xindice management flexibility within the current Database.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XMLTools {
1.8 +6 -5
xml-xindice/java/src/org/apache/xindice/tools/command/AddCollection.java
Index: AddCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/AddCollection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AddCollection.java 1 Aug 2003 19:40:20 -0000 1.7
+++ AddCollection.java 7 Aug 2003 20:13:24 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.tools.XMLTools;
import org.apache.xindice.xml.dom.DocumentImpl;
@@ -73,8 +73,9 @@
/**
* AddCollection.java is designed to let the user create
* new Collections and Nested Collections within the Database.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class AddCollection extends Command {
/**
@@ -85,9 +86,9 @@
* @exception Exception Description of Exception
*/
public boolean execute(Hashtable table) throws Exception {
+
Collection col = null;
Collection tempcol = null;
-
try {
// Verify that that collection passed in is not null
1.9 +6 -5
xml-xindice/java/src/org/apache/xindice/tools/command/AddDocument.java
Index: AddDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/AddDocument.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddDocument.java 1 Aug 2003 19:40:20 -0000 1.8
+++ AddDocument.java 7 Aug 2003 20:13:24 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xml.sax.InputSource;
@@ -77,9 +77,11 @@
* AddDocument.java is designed to let the user add Single Documents
* and/or Multiple Documents to an existing Collection or Nested Collection
* within the current Database.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class AddDocument extends Command {
+
/**
* TODO: Description of the Method
*
@@ -90,7 +92,6 @@
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
if (table.get(XMLTools.COLLECTION) == null) {
System.out.println("ERROR : Collection and switch required");
return false;
1.7 +6 -5
xml-xindice/java/src/org/apache/xindice/tools/command/AddIndexer.java
Index: AddIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/AddIndexer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AddIndexer.java 1 Aug 2003 19:40:20 -0000 1.6
+++ AddIndexer.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.tools.XMLTools;
import org.apache.xindice.xml.TextWriter;
@@ -74,13 +74,14 @@
/**
* AddIndexer.java is designed to let the user create an Indexer
* and insert it into a Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class AddIndexer extends Command {
+
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
try {
if (table.get(XMLTools.COLLECTION) != null) {
1.9 +5 -6
xml-xindice/java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java
Index: AddMultipleDocuments.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddMultipleDocuments.java 1 Aug 2003 19:40:20 -0000 1.8
+++ AddMultipleDocuments.java 7 Aug 2003 20:13:24 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -69,21 +69,20 @@
import java.io.FilenameFilter;
import java.util.Hashtable;
-
/**
* AddMultipleDocuments.java is designed to let the user add several
Documents
* to an existing Collection at one time.
*
* Documents are added with an ID the same as the file name.
* This command assumes that the collection being added to already exists!
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class AddMultipleDocuments extends Command {
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
try {
// Verify that user has supplied necessary arguments
1.8 +5 -4
xml-xindice/java/src/org/apache/xindice/tools/command/Command.java
Index: Command.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/Command.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Command.java 7 Aug 2003 18:03:22 -0000 1.7
+++ Command.java 7 Aug 2003 20:13:24 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import java.util.Hashtable;
/**
* Command is the standard interface command line arguments
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class Command {
// Collection manager path to instantiate
1.7 +7 -8
xml-xindice/java/src/org/apache/xindice/tools/command/DeleteCollection.java
Index: DeleteCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/DeleteCollection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeleteCollection.java 1 Aug 2003 19:40:20 -0000 1.6
+++ DeleteCollection.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.tools.XMLTools;
@@ -67,19 +67,18 @@
import java.util.Hashtable;
-
/**
* DeleteCollection.java is designed to let the user delete or drop
* a named Collection or Nested Collection from the Database or Parent
* Collection respectively.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DeleteCollection extends Command {
- public boolean execute(Hashtable table)
- throws Exception {
- Collection col = null;
+ public boolean execute(Hashtable table) throws Exception {
+ Collection col = null;
try {
// Verify that the collection passed in is not null
if (table.get(XMLTools.COLLECTION) != null &&
table.get(XMLTools.NAME_OF) != null) {
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/tools/command/DeleteDocument.java
Index: DeleteDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/DeleteDocument.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeleteDocument.java 1 Aug 2003 19:40:20 -0000 1.6
+++ DeleteDocument.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -71,8 +71,9 @@
* DeleteDocument.java is designed to let the user delete or drop
* a Document, referred by the Key, from a specific Collection or Nested
* Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DeleteDocument extends Command {
public boolean execute(Hashtable table) throws Exception {
1.7 +6 -6
xml-xindice/java/src/org/apache/xindice/tools/command/DeleteIndexer.java
Index: DeleteIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/DeleteIndexer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeleteIndexer.java 1 Aug 2003 19:40:20 -0000 1.6
+++ DeleteIndexer.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.tools.XMLTools;
@@ -67,18 +67,18 @@
import java.util.Hashtable;
-
/**
* DeleteIndexer.java is designed to let the user delete or drop
* an Indexer from a named Collection or a nested Collection within
* the Database.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DeleteIndexer extends Command {
+
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
try {
if (table.get(XMLTools.COLLECTION) != null) {
// Get a Collection reference to the collection
1.8 +6 -4
xml-xindice/java/src/org/apache/xindice/tools/command/ExportTree.java
Index: ExportTree.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/ExportTree.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExportTree.java 1 Aug 2003 19:40:20 -0000 1.7
+++ ExportTree.java 7 Aug 2003 20:13:24 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -74,9 +74,11 @@
/**
* ExportTree.java is designed to take a Collection tree and create a
Directory
* tree from it. Export tree requires a collection name and a file path to
create the tree
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class ExportTree extends Command {
+
/**
* TODO: Description of the Method
*
1.10 +7 -4
xml-xindice/java/src/org/apache/xindice/tools/command/ImportTree.java
Index: ImportTree.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/ImportTree.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ImportTree.java 1 Aug 2003 19:40:20 -0000 1.9
+++ ImportTree.java 7 Aug 2003 20:13:24 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -74,13 +74,16 @@
* and then stored into the newly created Collection with their filename as
a document key
*
* NOTE: If the collection passed in with the -c option already exists it
will be overwritten!
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class ImportTree extends Command {
+
Command addDocument = null;
Command addCollection = null;
public boolean execute(Hashtable table) throws Exception {
+
Collection col = null;
try {
// Setup the creation commands we'll use to add documents and
create
1.7 +7 -6
xml-xindice/java/src/org/apache/xindice/tools/command/ListCollectionDocuments.java
Index: ListCollectionDocuments.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/ListCollectionDocuments.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListCollectionDocuments.java 1 Aug 2003 19:40:20 -0000 1.6
+++ ListCollectionDocuments.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -66,19 +66,20 @@
import java.util.Hashtable;
-
/**
* ListCollectionDocumets.java is designed to let the user list all
documents in a specific collection.
+ *
* NOTE: Document names are returned in no specific order
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class ListCollectionDocuments extends Command {
+
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
String colstring = null;
String[] documentarray = null;
-
try {
if (table.get(XMLTools.COLLECTION) != null) {
1.10 +6 -5
xml-xindice/java/src/org/apache/xindice/tools/command/ListCollections.java
Index: ListCollections.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/ListCollections.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ListCollections.java 7 Aug 2003 18:03:22 -0000 1.9
+++ ListCollections.java 7 Aug 2003 20:13:24 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
@@ -71,9 +71,11 @@
/**
* ListCollections.java is designed to let the user list all Collections from
* a parent Collection or a nested Collection.
+ *
* NOTE: Collection names are not returned in any specific order
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class ListCollections extends Command {
private static final Log log = LogFactory.getLog(ListCollections.class);
@@ -83,7 +85,6 @@
String[] colarray = null;
String colstring = null;
Collection col = null;
-
try {
if (table.get(XMLTools.COLLECTION) == null) {
1.7 +6 -7
xml-xindice/java/src/org/apache/xindice/tools/command/ListIndexers.java
Index: ListIndexers.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/ListIndexers.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListIndexers.java 1 Aug 2003 19:40:20 -0000 1.6
+++ ListIndexers.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.CollectionManager;
import org.apache.xindice.tools.XMLTools;
@@ -70,14 +70,15 @@
/**
* ListIndexers.java is designed to let the user recall a list
* of Indexers from a specific Collection.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class ListIndexers extends Command {
+
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
String colstring = null;
-
try {
// Check to see if a collection was passed in, if not set to root
@@ -115,7 +116,5 @@
}
return true;
-
}
-
}
1.9 +6 -5
xml-xindice/java/src/org/apache/xindice/tools/command/RetrieveDocument.java
Index: RetrieveDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/RetrieveDocument.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RetrieveDocument.java 1 Aug 2003 19:40:20 -0000 1.8
+++ RetrieveDocument.java 7 Aug 2003 20:13:24 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.xmldb.api.DatabaseManager;
@@ -73,13 +73,14 @@
/**
* RetrieveDocument.java is designed to let the user recall or
* retrieve a Document from a specific Collection and save it to a new
location.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class RetrieveDocument extends Command {
+
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
try {
if (table.get(XMLTools.COLLECTION) != null) {
1.7 +5 -5
xml-xindice/java/src/org/apache/xindice/tools/command/Shutdown.java
Index: Shutdown.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/Shutdown.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Shutdown.java 1 Aug 2003 19:40:20 -0000 1.6
+++ Shutdown.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.client.xmldb.services.DatabaseInstanceManager;
import org.apache.xindice.tools.XMLTools;
@@ -70,15 +70,15 @@
/**
* AddCollection.java is designed to let the user create
* new Collections and Nested Collections within the Database.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class Shutdown extends Command {
//public boolean execute(Hashtable table, Database db)
public boolean execute(Hashtable table) throws Exception {
Collection col = null;
-
if (table.get(XMLTools.COLLECTION) == null) {
System.out.println("ERROR : Collection context required ");
return false;
1.8 +2 -0
xml-xindice/java/src/org/apache/xindice/tools/command/StringSerializer.java
Index: StringSerializer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/StringSerializer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StringSerializer.java 1 Aug 2003 19:40:20 -0000 1.7
+++ StringSerializer.java 7 Aug 2003 20:13:24 -0000 1.8
@@ -54,6 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
+ * CVS $Id$
*/
package org.apache.xindice.tools.command;
@@ -72,6 +73,7 @@
* <code>toString()</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Bates</a>
+ * @version CVS $Revision$, $Date$
*/
public class StringSerializer implements ContentHandler, LexicalHandler {
1.10 +6 -4
xml-xindice/java/src/org/apache/xindice/tools/command/XPathQuery.java
Index: XPathQuery.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/XPathQuery.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XPathQuery.java 7 Aug 2003 18:03:22 -0000 1.9
+++ XPathQuery.java 7 Aug 2003 20:13:24 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.xindice.tools.XMLTools;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -77,13 +77,15 @@
/**
* SingleDocumentQuery is designed to enable the user/admin to XPathQuery
* a Collection for a Single Document.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class XPathQuery extends Command {
private static final Log log = LogFactory.getLog(XPathQuery.class);
public boolean execute(Hashtable table) throws Exception {
+
Collection col = null;
try {
if ((String) table.get(XMLTools.COLLECTION) == null) {
1.3 +5 -5
xml-xindice/java/src/org/apache/xindice/tools/command/XUpdate.java
Index: XUpdate.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/XUpdate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XUpdate.java 7 Aug 2003 18:03:22 -0000 1.2
+++ XUpdate.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.tools.command;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.tools.command;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.tools.XMLTools;
@@ -73,20 +73,20 @@
import java.io.InputStreamReader;
import java.util.Hashtable;
-
/**
* XUpdate runs an XUpdate query stored in a file against the specified
collection or
* document.
*
* @author Kimbro Staken <[EMAIL PROTECTED]>
+ * @version CVS $Revision$, $Date$
*/
public class XUpdate extends Command {
private static final Log log = LogFactory.getLog(XUpdate.class);
public boolean execute(Hashtable table) throws Exception {
- Collection col = null;
+ Collection col = null;
try {
if ((String) table.get(XMLTools.COLLECTION) == null) {
1.4 +3 -2
xml-xindice/java/src/org/apache/xindice/util/ByteArrayInput.java
Index: ByteArrayInput.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ByteArrayInput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ByteArrayInput.java 1 Aug 2003 19:40:21 -0000 1.3
+++ ByteArrayInput.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import java.io.ByteArrayInputStream;
@@ -66,8 +66,9 @@
/**
* ByteArrayInput is a wrapper around ByteArrayInputStream that allows one
* access to the underlying array and position pointer.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ByteArrayInput extends ByteArrayInputStream {
public ByteArrayInput(byte[] buf) {
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/util/ByteBuffer.java
Index: ByteBuffer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ByteBuffer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ByteBuffer.java 1 Aug 2003 19:40:21 -0000 1.4
+++ ByteBuffer.java 7 Aug 2003 20:13:24 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -79,8 +79,9 @@
* streaming in the content of the ByteBuffer. Because none of the
* methods in ByteBuffer are synchronized, it is the user's job to
* properly synchronize calls to any of the methods of this class.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ByteBuffer extends OutputStream implements Serializable {
static final long serialVersionUID = -3900903004630456844L;
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/util/Configurable.java
Index: Configurable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/Configurable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Configurable.java 14 Jul 2003 19:07:14 -0000 1.3
+++ Configurable.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* Configurable is a simple interface used to pass configuration information
* to an object. The implementing object is ultimately responsible for
@@ -72,9 +72,10 @@
* any set of configuration commands against an object.
*
* @see org.apache.xindice.util.Configuration
+ * @version CVS $Revision$, $Date$
*/
-
public interface Configurable {
+
/**
* setConfig sets the configuration information for the Configurable
* object instance.
1.11 +4 -4
xml-xindice/java/src/org/apache/xindice/util/Configuration.java
Index: Configuration.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/Configuration.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Configuration.java 7 Aug 2003 18:03:22 -0000 1.10
+++ Configuration.java 7 Aug 2003 20:13:24 -0000 1.11
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -79,8 +79,8 @@
* fashion.
*
* @see org.apache.xindice.util.Configurable
+ * @version CVS $Revision$, $Date$
*/
-
public final class Configuration {
private static final Log log = LogFactory.getLog(Configuration.class);
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/util/ConfigurationCallback.java
Index: ConfigurationCallback.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ConfigurationCallback.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationCallback.java 1 Aug 2003 19:40:21 -0000 1.2
+++ ConfigurationCallback.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* ConfigurationCallback is a callback interface that can be implemented
* in performing a set process on a Configuration.
*
* @see org.apache.xindice.util.Configuration
+ * @version CVS $Revision$, $Date$
*/
-
public interface ConfigurationCallback {
+
void process(Configuration cfg) throws XindiceException;
}
1.4 +60 -0
xml-xindice/java/src/org/apache/xindice/util/ConfigurationException.java
Index: ConfigurationException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ConfigurationException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurationException.java 1 Aug 2003 19:40:21 -0000 1.3
+++ ConfigurationException.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,7 +1,67 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xindice" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999-2001, The dbXML
+ * Group, L.L.C., http://www.dbxmlgroup.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * CVS $Id$
+ */
+
package org.apache.xindice.util;
/**
* @author kross
+ * @version CVS $Revision$, $Date$
*/
public class ConfigurationException extends XindiceRuntimeException {
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/util/DateUtilities.java
Index: DateUtilities.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/DateUtilities.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateUtilities.java 1 Aug 2003 19:40:21 -0000 1.3
+++ DateUtilities.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -68,8 +68,9 @@
/**
* DateUtilities provides a set of commonly used Date processing
* routines.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DateUtilities {
private static final SimpleDateFormat SDF = new SimpleDateFormat("EEE,
dd MMM yyyy kk:mm:ss 'GMT'", new DateFormatSymbols(Locale.US));
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/util/DirectoryClassLoader.java
Index: DirectoryClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/DirectoryClassLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectoryClassLoader.java 1 Aug 2003 19:40:21 -0000 1.3
+++ DirectoryClassLoader.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.Collections;
@@ -69,12 +69,15 @@
* DirectoryClassLoader reads classes relative to the
* constructor-provided base directory. This class is typically used for
loading
* classes from a directory that isn't on the CLASSPATH.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DirectoryClassLoader extends ClassLoader {
+
private File directory = null;
private Map cache = Collections.synchronizedMap(new HashMap());
private Map dates = Collections.synchronizedMap(new HashMap());
+
public DirectoryClassLoader(String directory) {
this.directory = new File(directory);
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/util/Disposable.java
Index: Disposable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/Disposable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Disposable.java 1 Aug 2003 19:40:21 -0000 1.2
+++ Disposable.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* Disposable is an interface that is implemented by Xindice
* Scripts, Services and ScriptComponents in order to
@@ -70,9 +70,11 @@
* places. Because of this, their dispose method may be called more
* than once. Care should be taken to insure that multiple calls to
* dipose will not corrupt the system in any way.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Disposable {
+
/**
* dispose disposes of the object instance.
*/
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/util/FileCache.java
Index: FileCache.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/FileCache.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileCache.java 1 Aug 2003 19:40:21 -0000 1.3
+++ FileCache.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.Map;
@@ -66,8 +66,9 @@
/**
* FileCache caches the content of files in memory.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class FileCache {
private Map cache = new WeakHashMap(); // of FileCacheInfo
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/util/LockManager.java
Index: LockManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/LockManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockManager.java 1 Aug 2003 19:40:21 -0000 1.3
+++ LockManager.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.util.HashMap;
import java.util.Map;
@@ -66,11 +66,14 @@
* LockManager manages resource locks. A resource is any shared object that
* can be represented as a long. The LockManager should be constructed using
* the maximum number of concurrent clients a specific resource might have.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class LockManager {
+
private int maxLocks = 0;
private Map locks = new HashMap(); // Long to LockInfo
+
public LockManager(int maxLocks) {
this.maxLocks = maxLocks;
1.6 +7 -3 xml-xindice/java/src/org/apache/xindice/util/MD5.java
Index: MD5.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/util/MD5.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MD5.java 1 Aug 2003 19:40:21 -0000 1.5
+++ MD5.java 7 Aug 2003 20:13:24 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,12 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+/**
+ *
+ * @version CVS $Revision$, $Date$
+ */
public class MD5 {
private static String[] hex = {"0", "1", "2", "3", "4", "5", "6", "7",
"8", "9", "a", "b", "c", "d", "e", "f"};
1.3 +6 -4 xml-xindice/java/src/org/apache/xindice/util/Named.java
Index: Named.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/util/Named.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Named.java 1 Aug 2003 19:40:21 -0000 1.2
+++ Named.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* Named identifies an object as having a contextually important Name.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Named {
+
/**
* getName retrieves the contextually important name of the object
*
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/util/ObjectPool.java
Index: ObjectPool.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ObjectPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectPool.java 1 Aug 2003 19:40:21 -0000 1.2
+++ ObjectPool.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* ObjectPool is an abstract Object Pool implementation. In order to
* create a working ObjectPool, one must extend ObjectPool and implement
* the createObject method.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class ObjectPool {
private ObjectQueue pool = new ObjectQueue();
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/util/ObjectQueue.java
Index: ObjectQueue.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ObjectQueue.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectQueue.java 1 Aug 2003 19:40:21 -0000 1.3
+++ ObjectQueue.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.Serializable;
/**
@@ -66,8 +66,9 @@
* for FIFO queuing. The benefit of ObjectQueue over Sun's Queue
* implementation is that it is not an extension of ArrayList and doesn't
* suffer from ArrayList's resizing performance limitations.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ObjectQueue implements Serializable {
static final long serialVersionUID = 2573729619402197579L;
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/util/ObjectStack.java
Index: ObjectStack.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ObjectStack.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectStack.java 1 Aug 2003 19:40:21 -0000 1.3
+++ ObjectStack.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.Serializable;
/**
* ObjectQueue is a simple linked list implemention that can be used
* for LIFO stacking
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ObjectStack implements Serializable {
static final long serialVersionUID = -7896992305408562521L;
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/util/Poolable.java
Index: Poolable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/Poolable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Poolable.java 1 Aug 2003 19:40:21 -0000 1.2
+++ Poolable.java 7 Aug 2003 20:13:24 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,20 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* Poolable is an interface that must be implemented by Objects that are
* capable of being managed in a pooled fashion by Xindice.
*
* @see org.apache.xindice.util.ObjectPool
+ * @version CVS $Revision$, $Date$
*/
-
public interface Poolable {
+
/**
* setPool passes a reference to the originating ObjectPool for this
* Object. This will allow the Poolable Object to call back to the
1.5 +4 -4
xml-xindice/java/src/org/apache/xindice/util/ReadOnlyException.java
Index: ReadOnlyException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/ReadOnlyException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReadOnlyException.java 1 Aug 2003 19:40:21 -0000 1.4
+++ ReadOnlyException.java 7 Aug 2003 20:13:24 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
/**
* A ReadOnlyException is thrown when an Object's property cannot be
* modified.
*
* @see org.apache.xindice.util.Configuration
+ * @version CVS $Revision$, $Date$
*/
-
public class ReadOnlyException extends XindiceException {
public ReadOnlyException() {
1.4 +4 -4
xml-xindice/java/src/org/apache/xindice/util/SimpleConfigurable.java
Index: SimpleConfigurable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/SimpleConfigurable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleConfigurable.java 1 Aug 2003 19:40:21 -0000 1.3
+++ SimpleConfigurable.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
/**
* SimpleConfigurable
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class SimpleConfigurable implements Configurable {
protected Configuration config = null;
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/util/StringUtilities.java
Index: StringUtilities.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/StringUtilities.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringUtilities.java 1 Aug 2003 19:40:21 -0000 1.4
+++ StringUtilities.java 7 Aug 2003 20:13:24 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.util.StringTokenizer;
/**
* StringUtilities provides a set of commonly used String parsing and
* processing routines.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class StringUtilities {
+
private StringUtilities() {
}
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/util/SymbolDeserializer.java
Index: SymbolDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/SymbolDeserializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SymbolDeserializer.java 1 Aug 2003 19:40:21 -0000 1.6
+++ SymbolDeserializer.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import org.apache.xindice.xml.SymbolTable;
import org.apache.xindice.xml.SymbolTableSymbols;
import org.apache.xindice.xml.dom.DocumentImpl;
@@ -70,8 +70,9 @@
/**
* SymbolDeserializer is a utility class for managing SymbolTables in
* the client context of Wire Compression.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class SymbolDeserializer {
private static final SymbolTableSymbols hcSyms =
SymbolTableSymbols.getInstance();
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/util/SymbolSerializer.java
Index: SymbolSerializer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/SymbolSerializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SymbolSerializer.java 7 Aug 2003 18:03:22 -0000 1.6
+++ SymbolSerializer.java 7 Aug 2003 20:13:24 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.xml.SymbolTable;
@@ -75,8 +75,9 @@
/**
* SymbolSerializer is a utility class for managing SymbolTables in
* the server context of Wire Compression.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class SymbolSerializer {
private static final Log log = LogFactory.getLog(SymbolSerializer.class);
1.8 +5 -3
xml-xindice/java/src/org/apache/xindice/util/XindiceException.java
Index: XindiceException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/XindiceException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XindiceException.java 1 Aug 2003 19:40:21 -0000 1.7
+++ XindiceException.java 7 Aug 2003 20:13:24 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.PrintStream;
import java.io.PrintWriter;
/**
* A XindiceException is the base class for all Xindice related
* Exceptions.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XindiceException extends Exception {
protected Throwable cause;
1.4 +5 -3
xml-xindice/java/src/org/apache/xindice/util/XindiceRuntimeException.java
Index: XindiceRuntimeException.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/XindiceRuntimeException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XindiceRuntimeException.java 1 Aug 2003 19:40:21 -0000 1.3
+++ XindiceRuntimeException.java 7 Aug 2003 20:13:24 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.util;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.util;
+
import java.io.PrintStream;
import java.io.PrintWriter;
/**
* A XindiceRuntimeException is the base class for all Xindice related
RuntimeExceptions.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class XindiceRuntimeException extends RuntimeException {
protected Throwable cause;
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/NamespaceMap.java
Index: NamespaceMap.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/NamespaceMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamespaceMap.java 1 Aug 2003 19:40:21 -0000 1.4
+++ NamespaceMap.java 7 Aug 2003 20:13:25 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.apache.xindice.xml.dom.DocumentImpl;
import org.w3c.dom.Document;
@@ -72,8 +72,9 @@
/**
* NamespaceMap is just a HashMap extension that provides some useful
* Namespace related functionality.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NamespaceMap extends HashMap {
private Element elem = null;
1.4 +7 -4
xml-xindice/java/src/org/apache/xindice/xml/NodeSource.java
Index: NodeSource.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/NodeSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeSource.java 1 Aug 2003 19:40:21 -0000 1.3
+++ NodeSource.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.Key;
/**
* NodeSource encapsulates the source of a Document, including
* its Collection reference and its Key.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NodeSource {
+
public static final String SOURCE_NS =
"http://xml.apache.org/xindice/Query";;
public static final String SOURCE_COL = "col";
public static final String SOURCE_KEY = "key";
@@ -76,6 +78,7 @@
private Collection collection = null;
private Key key = null;
+
public NodeSource(Collection collection, Key key) {
this.collection = collection;
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/Signatures.java
Index: Signatures.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/Signatures.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Signatures.java 1 Aug 2003 19:40:21 -0000 1.2
+++ Signatures.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,14 +54,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
/**
* Signatures defines identifying values for the types that the Xindice DOM
* recognizes.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface Signatures {
static final int Unknown = -1;
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/SymbolTable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SymbolTable.java 1 Aug 2003 19:40:21 -0000 1.4
+++ SymbolTable.java 7 Aug 2003 20:13:25 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -72,8 +72,9 @@
/**
* SymbolTable is a class that allows the Xindice Compression system to
* resolve symbol IDs in compression/decompression passes.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class SymbolTable implements XMLSerializable {
static final String SYMBOLS = "symbols";
static final String SYMBOL = "symbol";
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/SymbolTableSymbols.java
Index: SymbolTableSymbols.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/SymbolTableSymbols.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SymbolTableSymbols.java 1 Aug 2003 19:40:21 -0000 1.3
+++ SymbolTableSymbols.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.apache.xindice.xml.dom.DOMParser;
import org.w3c.dom.Element;
@@ -66,8 +66,9 @@
/**
* SymbolTableSymbols is class that represents the hard-coded definition
* of a compressed symbol table.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class SymbolTableSymbols extends SymbolTable {
private static String XMLDef =
"<symbols>"
1.10 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/TextWriter.java
Index: TextWriter.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/TextWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TextWriter.java 7 Aug 2003 18:03:22 -0000 1.9
+++ TextWriter.java 7 Aug 2003 20:13:25 -0000 1.10
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -80,8 +80,9 @@
/**
* TextWriter takes a Document, DocumentFragment, or Element and
* streams it as text to an output source (or a String)
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class TextWriter {
private static final Log log = LogFactory.getLog(TextWriter.class);
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/XMLCompressedInput.java
Index: XMLCompressedInput.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/XMLCompressedInput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLCompressedInput.java 1 Aug 2003 19:40:21 -0000 1.3
+++ XMLCompressedInput.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.w3c.dom.Node;
import java.io.DataInputStream;
@@ -68,8 +68,9 @@
/**
* XMLCompressedInput is an InputStream extension that provides functions for
* reading type from a Xindice Compressed XML Stream.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class XMLCompressedInput extends DataInputStream {
private byte signature = 0;
private SymbolTable st = null;
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/XMLCompressedOutput.java
Index: XMLCompressedOutput.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/XMLCompressedOutput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLCompressedOutput.java 1 Aug 2003 19:40:21 -0000 1.3
+++ XMLCompressedOutput.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -66,8 +66,9 @@
/**
* XMLCompressedInput is an OutputStream extension that provides functions
for
* writing types to a Xindice Compressed XML Stream.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class XMLCompressedOutput extends DataOutputStream {
protected SymbolTable st = null;
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/XMLSerializable.java
Index: XMLSerializable.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/XMLSerializable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLSerializable.java 1 Aug 2003 19:40:21 -0000 1.3
+++ XMLSerializable.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,9 +69,10 @@
* retrieved and stored as XML.
*
* @see org.apache.xindice.xml.SymbolTable
+ * @version CVS $Revision$, $Date$
*/
-
public interface XMLSerializable {
+
/**
* streamToXML streams an object to XML.
*
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/AttrImpl.java
Index: AttrImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/AttrImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttrImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ AttrImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -66,9 +66,11 @@
/**
* AttrImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class AttrImpl extends ContainerNodeImpl implements Attr {
+
private boolean specified = true;
private short symbolID = -1;
1.3 +6 -5
xml-xindice/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java
Index: CDATASectionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CDATASectionImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ CDATASectionImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.CDATASection;
import org.w3c.dom.Node;
/**
* CDATASectionImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class CDATASectionImpl extends TextImpl implements CDATASection
{
+
public CDATASectionImpl() {
}
@@ -90,4 +92,3 @@
return "#cdata-section";
}
}
-
1.8 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/CharacterDataImpl.java
Index: CharacterDataImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CharacterDataImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CharacterDataImpl.java 7 Aug 2003 18:03:22 -0000 1.7
+++ CharacterDataImpl.java 7 Aug 2003 20:13:25 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.ByteArrayInput;
@@ -70,8 +70,9 @@
/**
* CharacterDataImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class CharacterDataImpl extends NodeImpl implements
CharacterData {
private static final Log log =
LogFactory.getLog(CharacterDataImpl.class);
1.3 +6 -5
xml-xindice/java/src/org/apache/xindice/xml/dom/CommentImpl.java
Index: CommentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CommentImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommentImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ CommentImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Comment;
import org.w3c.dom.Node;
/**
* CommentImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class CommentImpl extends CharacterDataImpl implements Comment {
+
public CommentImpl() {
}
@@ -90,4 +92,3 @@
return "#comment";
}
}
-
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/CompressedDocument.java
Index: CompressedDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CompressedDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompressedDocument.java 1 Aug 2003 19:40:21 -0000 1.3
+++ CompressedDocument.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.xindice.xml.SymbolTable;
import org.w3c.dom.DOMException;
@@ -67,9 +67,11 @@
/**
* CompressedDocument exposes the Document's SymbolTable.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface CompressedDocument extends CompressedNode, Document {
+
/**
* getSymbols returns the Symbol table for this Document. A new
* Document may not have a Symbol table as Symbol tables only come
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/CompressedNode.java
Index: CompressedNode.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CompressedNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompressedNode.java 1 Aug 2003 19:40:21 -0000 1.2
+++ CompressedNode.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
@@ -66,9 +66,11 @@
* CompressedNode represents a Xindice Compressed Node. The compression
* system operates independently of the database and only requires a
* SymbolTable instance to perform compression/decompression.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface CompressedNode extends Node {
+
/**
* isDirty returns whether or not the current Node (or any of its
* children) have been modified since being loaded.
1.9 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java
Index: ContainerNodeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContainerNodeImpl.java 7 Aug 2003 18:03:22 -0000 1.8
+++ ContainerNodeImpl.java 7 Aug 2003 20:13:25 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.ByteArrayInput;
@@ -82,8 +82,9 @@
/**
* ContainerNodeImpl performs most of the child-rearing behavior of the
* Element and Document implementations.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class ContainerNodeImpl extends NodeImpl {
private static final Log log =
LogFactory.getLog(ContainerNodeImpl.class);
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DBDocument.java
Index: DBDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DBDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBDocument.java 1 Aug 2003 19:40:21 -0000 1.4
+++ DBDocument.java 7 Aug 2003 20:13:25 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,15 +54,18 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Document;
/**
* DBDocument represents a Xindice Collection-originating Document.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface DBDocument extends DBNode, Document {
static final String CACHE_CONTROL = "xindice-cache";
static final String CACHE = "cache";
1.4 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DBNode.java
Index: DBNode.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DBNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBNode.java 1 Aug 2003 19:40:21 -0000 1.3
+++ DBNode.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.xindice.xml.NodeSource;
import org.w3c.dom.DOMException;
@@ -68,8 +68,9 @@
* DBNode represents a Xindice Collection-originating Node. DBNodes will
* provide Node sourcing and Transaction capabilities for Nodes that have
* been aggregated into external Documents.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface DBNode extends Node {
/**
* getSource returns a source for this Node.
1.6 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DOMCompressor.java
Index: DOMCompressor.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DOMCompressor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMCompressor.java 1 Aug 2003 19:40:21 -0000 1.5
+++ DOMCompressor.java 7 Aug 2003 20:13:25 -0000 1.6
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.xindice.util.XindiceException;
import org.apache.xindice.xml.Signatures;
import org.apache.xindice.xml.SymbolTable;
@@ -77,8 +77,9 @@
/**
* DOMCompressor is an OutputStream extension that provides functions for
* writing DOM types to a Xindice Compressed XML Stream.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DOMCompressor extends XMLCompressedOutput {
public DOMCompressor(OutputStream os, SymbolTable st) {
1.4 +6 -5
xml-xindice/java/src/org/apache/xindice/xml/dom/DOMImplementationImpl.java
Index: DOMImplementationImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DOMImplementationImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMImplementationImpl.java 1 Aug 2003 19:40:21 -0000 1.3
+++ DOMImplementationImpl.java 7 Aug 2003 20:13:25 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -67,8 +67,9 @@
/**
* DOMImplementationImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DOMImplementationImpl implements DOMImplementation {
private static final String[][] FEATURES = {
{"XML", "1.0"},
@@ -78,7 +79,7 @@
{"Xindice-Comp", "1.0"} // CompressedNode and CompressedDocument
};
- private static DOMImplementation domImpl = new DOMImplementationImpl();
+ private static final DOMImplementation domImpl = new
DOMImplementationImpl();
private DOMImplementationImpl() {
}
1.8 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DOMParser.java
Index: DOMParser.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DOMParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMParser.java 1 Aug 2003 19:40:21 -0000 1.7
+++ DOMParser.java 7 Aug 2003 20:13:25 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.xindice.core.data.Value;
import org.apache.xindice.util.ObjectStack;
import org.apache.xindice.util.XindiceException;
@@ -88,8 +88,9 @@
/**
* DOMParser is the Xindice compressed DOM parser.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DOMParser extends DefaultHandler implements DeclHandler,
LexicalHandler {
private SAXParser sp;
private ErrorHandler errors = null;
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java
Index: DocumentFragmentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentFragmentImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ DocumentFragmentImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
/**
* DocumentFragmentImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DocumentFragmentImpl extends ContainerNodeImpl implements
DocumentFragment {
+
public DocumentFragmentImpl() {
}
1.9 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
Index: DocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DocumentImpl.java 7 Aug 2003 18:03:22 -0000 1.8
+++ DocumentImpl.java 7 Aug 2003 20:13:25 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.XindiceException;
@@ -92,8 +92,9 @@
/**
* DocumentImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DocumentImpl extends ContainerNodeImpl implements
CompressedDocument, DBDocument, DocumentTraversal {
private static final Log log = LogFactory.getLog(DocumentImpl.class);
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentTypeImpl.java
Index: DocumentTypeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentTypeImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentTypeImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ DocumentTypeImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DocumentType;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
/**
* DocumentTypeImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class DocumentTypeImpl extends NodeImpl implements DocumentType
{
+
public DocumentTypeImpl() {
super(null, true);
}
1.12 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ElementImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElementImpl.java 7 Aug 2003 18:03:22 -0000 1.11
+++ ElementImpl.java 7 Aug 2003 20:13:25 -0000 1.12
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.data.Key;
@@ -77,8 +77,9 @@
/**
* ElementImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ElementImpl extends ContainerNodeImpl implements Element {
private static final Log log = LogFactory.getLog(ElementImpl.class);
1.3 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/EntityImpl.java
Index: EntityImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/EntityImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntityImpl.java 1 Aug 2003 19:40:21 -0000 1.2
+++ EntityImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,16 +54,19 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Entity;
import org.w3c.dom.Node;
/**
* EntityImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class EntityImpl extends NodeImpl implements Entity {
private String encoding = null;
private String version = null;
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java
Index: EntityReferenceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EntityReferenceImpl.java 7 Aug 2003 18:03:22 -0000 1.6
+++ EntityReferenceImpl.java 7 Aug 2003 20:13:25 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.ByteArrayInput;
@@ -71,8 +71,9 @@
/**
* EntityReferenceImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class EntityReferenceImpl extends NodeImpl implements
EntityReference {
private static final Log log =
LogFactory.getLog(EntityReferenceImpl.class);
1.5 +5 -5
xml-xindice/java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java
Index: NamedNodeMapImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamedNodeMapImpl.java 1 Aug 2003 19:40:22 -0000 1.4
+++ NamedNodeMapImpl.java 7 Aug 2003 20:13:25 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -68,15 +68,15 @@
/**
* NamedNodeMapImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NamedNodeMapImpl extends NodeListImpl implements
NamedNodeMap {
private HashMap map = new HashMap();
public NamedNodeMapImpl(NodeImpl owner) {
super(owner);
}
-
/**
* Retrieves a node specified by name.
1.8 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/NodeImpl.java
Index: NodeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/NodeImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NodeImpl.java 1 Aug 2003 19:40:22 -0000 1.7
+++ NodeImpl.java 7 Aug 2003 20:13:25 -0000 1.8
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.xindice.xml.NodeSource;
import org.w3c.dom.Attr;
@@ -73,9 +73,11 @@
/**
* NodeImpl implements the foundation of the Xindice compressed DOM.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public abstract class NodeImpl implements CompressedNode, DBNode {
+
public static final String XMLNS_PREFIX = "xmlns";
public static final String OBJECT_NS =
"http://xml.apache.org/xindice/XMLObject";;
1.5 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/NodeListImpl.java
Index: NodeListImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/NodeListImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeListImpl.java 1 Aug 2003 19:40:22 -0000 1.4
+++ NodeListImpl.java 7 Aug 2003 20:13:25 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -66,9 +66,11 @@
/**
* NodeListImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class NodeListImpl extends ArrayList implements NodeList {
+
protected NodeImpl owner = null;
public NodeListImpl(NodeImpl owner) {
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/NotationImpl.java
Index: NotationImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/NotationImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NotationImpl.java 1 Aug 2003 19:40:22 -0000 1.2
+++ NotationImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,17 +54,21 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.Node;
import org.w3c.dom.Notation;
/**
* NotationImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class NotationImpl extends NodeImpl implements Notation {
+
public NotationImpl() {
}
1.9 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java
Index: ProcessingInstructionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProcessingInstructionImpl.java 7 Aug 2003 18:03:22 -0000 1.8
+++ ProcessingInstructionImpl.java 7 Aug 2003 20:13:25 -0000 1.9
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.ByteArrayInput;
@@ -71,8 +71,9 @@
/**
* ProcessingInstructionImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class ProcessingInstructionImpl extends NodeImpl implements
ProcessingInstruction {
private static final Log log =
LogFactory.getLog(ProcessingInstructionImpl.class);
1.3 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/TextImpl.java
Index: TextImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/TextImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextImpl.java 1 Aug 2003 19:40:22 -0000 1.2
+++ TextImpl.java 7 Aug 2003 20:13:25 -0000 1.3
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,18 +54,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
/**
* TextImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class TextImpl extends CharacterDataImpl implements Text {
+
public TextImpl() {
}
1.4 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/traversal/TreeWalkerImpl.java
Index: TreeWalkerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/traversal/TreeWalkerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TreeWalkerImpl.java 1 Aug 2003 19:40:22 -0000 1.3
+++ TreeWalkerImpl.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.dom.traversal;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.dom.traversal;
+
import org.apache.xindice.xml.dom.NodeImpl;
import org.w3c.dom.DOMException;
@@ -69,8 +69,9 @@
/**
* TreeWalkerImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class TreeWalkerImpl implements TreeWalker, NodeIterator {
protected boolean valid = true;
protected Node root = null;
@@ -78,6 +79,7 @@
protected int whatToShow = NodeFilter.SHOW_ALL;
protected NodeFilter filter = null;
protected boolean expand = false;
+
public TreeWalkerImpl(Node root, int whatToShow, NodeFilter filter,
boolean entityReferenceExpansion) throws DOMException {
this.root = null;
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderFactoryImpl.java
Index: DocumentBuilderFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderFactoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DocumentBuilderFactoryImpl.java 1 Aug 2003 19:40:22 -0000 1.4
+++ DocumentBuilderFactoryImpl.java 7 Aug 2003 20:13:26 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.jaxp;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.jaxp;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -67,8 +67,9 @@
/**
* DocumentBuilderFactoryImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
private Map attrs = new HashMap();
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderImpl.java
Index: DocumentBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DocumentBuilderImpl.java 7 Aug 2003 18:03:22 -0000 1.6
+++ DocumentBuilderImpl.java 7 Aug 2003 20:13:26 -0000 1.7
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.jaxp;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.jaxp;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.xml.dom.DOMImplementationImpl;
@@ -78,8 +78,9 @@
/**
* DocumentBuilderImpl
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public class DocumentBuilderImpl extends DocumentBuilder {
private static final Log log =
LogFactory.getLog(DocumentBuilderImpl.class);
1.5 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/sax/CompressionHandler.java
Index: CompressionHandler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/CompressionHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompressionHandler.java 1 Aug 2003 19:40:22 -0000 1.4
+++ CompressionHandler.java 7 Aug 2003 20:13:26 -0000 1.5
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.sax;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.sax;
+
import org.apache.xindice.xml.SymbolTable;
/**
@@ -66,8 +66,9 @@
* positional information about Xindice compressed Documents. All
* of these methods will be called immediate before any SAX start
* methods.
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public interface CompressionHandler {
static final String HANDLER = "CompressionHandler/1.0";
1.22 +5 -4
xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java
Index: SAXEventGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SAXEventGenerator.java 7 Aug 2003 18:03:22 -0000 1.21
+++ SAXEventGenerator.java 7 Aug 2003 20:13:26 -0000 1.22
@@ -1,5 +1,3 @@
-package org.apache.xindice.xml.sax;
-
/*
* The Apache Software License, Version 1.1
*
@@ -56,9 +54,11 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
+package org.apache.xindice.xml.sax;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xindice.util.ByteArrayInput;
@@ -87,8 +87,9 @@
/**
* SAXEventGenerator
+ *
+ * @version CVS $Revision$, $Date$
*/
-
public final class SAXEventGenerator implements XMLReader {
private static final Log log =
LogFactory.getLog(SAXEventGenerator.class);
1.4 +13 -11
xml-xindice/java/src/org/apache/xindice/xml/sax/SetContentHandler.java
Index: SetContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/SetContentHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetContentHandler.java 1 Aug 2003 19:40:22 -0000 1.3
+++ SetContentHandler.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -1,13 +1,3 @@
-package org.apache.xindice.xml.sax;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xmldb.api.modules.XMLResource;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
/*
* The Apache Software License, Version 1.1
*
@@ -70,12 +60,24 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id
+ * CVS $Id$
*/
+package org.apache.xindice.xml.sax;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xmldb.api.modules.XMLResource;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
/**
* Simple ContentHandler that just converts the SAX event stream into a text
* representation of the document and stores it in the associated resource.
+ *
+ * @version CVS $Revision$, $Date$
*/
public class SetContentHandler extends DefaultHandler {
1.5 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/IntegrationEmbedTests.java
Index: IntegrationEmbedTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/IntegrationEmbedTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IntegrationEmbedTests.java 30 May 2003 22:39:16 -0000 1.4
+++ IntegrationEmbedTests.java 7 Aug 2003 20:13:26 -0000 1.5
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice;
@@ -70,7 +70,7 @@
import junitx.extensions.TestSetup;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class IntegrationEmbedTests {
1.2 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/IntegrationManagedTests.java
Index: IntegrationManagedTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/IntegrationManagedTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegrationManagedTests.java 9 Jul 2003 16:35:12 -0000 1.1
+++ IntegrationManagedTests.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice;
@@ -73,7 +73,7 @@
* Runs the Integration test suite using the managed driver.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin O'Neill</a>
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
*/
public class IntegrationManagedTests {
1.7 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/IntegrationXmlRpcTests.java
Index: IntegrationXmlRpcTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/IntegrationXmlRpcTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IntegrationXmlRpcTests.java 4 Aug 2003 03:01:57 -0000 1.6
+++ IntegrationXmlRpcTests.java 7 Aug 2003 20:13:26 -0000 1.7
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice;
@@ -79,7 +79,7 @@
* <code>test.xmlrpc.service-location</code>,
* which is expected to be a string of the form <code>/path.../</code>.
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
* @author Gary Shea <[EMAIL PROTECTED]>
*/
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/StressTests.java
Index: StressTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/StressTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StressTests.java 3 Jun 2003 02:18:58 -0000 1.3
+++ StressTests.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice;
@@ -70,7 +70,7 @@
import org.apache.xindice.stress.filer.StressFilerTestSetup;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class StressTests {
1.15 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java
Index: UnitTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- UnitTests.java 7 Aug 2003 03:00:12 -0000 1.14
+++ UnitTests.java 7 Aug 2003 20:13:26 -0000 1.15
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice;
@@ -84,7 +84,7 @@
import org.apache.xindice.util.ConfigurationTest;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
* @author Kimbro Staken <[EMAIL PROTECTED]>
*/
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/DatabaseImplTest.java
Index: DatabaseImplTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/DatabaseImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatabaseImplTest.java 9 Jul 2003 16:35:11 -0000 1.3
+++ DatabaseImplTest.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.client.xmldb;
@@ -62,7 +62,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class DatabaseImplTest
1.2 +1 -1
xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/ResourceIteratorImplTest.java
Index: ResourceIteratorImplTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/ResourceIteratorImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceIteratorImplTest.java 19 Nov 2002 09:17:58 -0000 1.1
+++ ResourceIteratorImplTest.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -8,7 +8,7 @@
import java.util.*;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class ResourceIteratorImplTest
1.2 +1 -1
xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/resources/BinaryResourceTest.java
Index: BinaryResourceTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/client/xmldb/resources/BinaryResourceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BinaryResourceTest.java 3 Jun 2003 02:18:58 -0000 1.1
+++ BinaryResourceTest.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.client.xmldb.resources;
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/data/KeyTest.java
Index: KeyTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/data/KeyTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyTest.java 28 Oct 2002 08:39:20 -0000 1.2
+++ KeyTest.java 7 Aug 2003 20:13:26 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.data;
@@ -62,7 +62,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class KeyTest
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/data/ValueTest.java
Index: ValueTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/data/ValueTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueTest.java 28 Oct 2002 08:39:20 -0000 1.2
+++ ValueTest.java 7 Aug 2003 20:13:26 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.data;
@@ -62,7 +62,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class ValueTest
1.7 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java
Index: FilerTestCase.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FilerTestCase.java 15 Jul 2003 15:21:17 -0000 1.6
+++ FilerTestCase.java 7 Aug 2003 20:13:26 -0000 1.7
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.filer;
@@ -69,7 +69,7 @@
import java.util.Vector;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Kimbro Staken <[EMAIL PROTECTED]>
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestSetup.java
Index: FilerTestSetup.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestSetup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FilerTestSetup.java 15 Jul 2003 15:21:17 -0000 1.3
+++ FilerTestSetup.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.filer;
@@ -68,7 +68,7 @@
import org.apache.xindice.xml.dom.DOMParser;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class FilerTestSetup extends TestSetup {
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/meta/MetaTest.java
Index: MetaTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/meta/MetaTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MetaTest.java 3 Jun 2003 02:18:56 -0000 1.2
+++ MetaTest.java 7 Aug 2003 20:13:26 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.core.meta;
@@ -66,7 +66,7 @@
import org.w3c.dom.*;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Dave Viner <[EMAIL PROTECTED]>
*/
public class MetaTest extends TestCase {
1.2 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/InlineHeaderBuilderTest.java
Index: InlineHeaderBuilderTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/InlineHeaderBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InlineHeaderBuilderTest.java 13 Jun 2003 14:12:03 -0000 1.1
+++ InlineHeaderBuilderTest.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import org.apache.xindice.core.data.Value;
@@ -65,7 +65,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Gary Shea <[EMAIL PROTECTED]>
*/
public class InlineHeaderBuilderTest
1.2 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/InlineMetaTests.java
Index: InlineMetaTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/InlineMetaTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InlineMetaTests.java 13 Jun 2003 14:12:03 -0000 1.1
+++ InlineMetaTests.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -56,14 +56,14 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
import junit.framework.Test;
import junit.framework.TestSuite;
/**
- * @version $Revision$
+ * @version CVS $Revision$
* @author Gary Shea <[EMAIL PROTECTED]>
*/
public class InlineMetaTests {
1.2 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/ResourceTypeReaderTest.java
Index: ResourceTypeReaderTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/meta/inline/ResourceTypeReaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceTypeReaderTest.java 13 Jun 2003 14:12:03 -0000 1.1
+++ ResourceTypeReaderTest.java 7 Aug 2003 20:13:26 -0000 1.2
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
@@ -67,7 +67,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Gary Shea <[EMAIL PROTECTED]>
*/
public class ResourceTypeReaderTest
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/IntegrationTests.java
Index: IntegrationTests.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/IntegrationTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntegrationTests.java 4 Aug 2003 03:01:57 -0000 1.2
+++ IntegrationTests.java 7 Aug 2003 20:13:26 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration;
@@ -68,7 +68,7 @@
import junit.framework.TestSuite;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class IntegrationTests {
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/AbstractXmlDbClientTest.java
Index: AbstractXmlDbClientTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/AbstractXmlDbClientTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractXmlDbClientTest.java 14 Jul 2003 21:26:11 -0000 1.3
+++ AbstractXmlDbClientTest.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client;
@@ -62,7 +62,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public abstract class AbstractXmlDbClientTest extends TestCase {
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XmlDbClient.java 10 Jul 2003 14:43:51 -0000 1.6
+++ XmlDbClient.java 7 Aug 2003 20:13:26 -0000 1.7
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client;
@@ -69,7 +69,7 @@
import org.xmldb.api.modules.XMLResource;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class XmlDbClient {
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClientSetup.java
Index: XmlDbClientSetup.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClientSetup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlDbClientSetup.java 28 Nov 2002 08:12:26 -0000 1.3
+++ XmlDbClientSetup.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client;
@@ -65,7 +65,7 @@
import junitx.extensions.TestSetup;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class XmlDbClientSetup
1.8 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/CollectionTest.java
Index: CollectionTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/CollectionTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CollectionTest.java 4 Aug 2003 03:01:57 -0000 1.7
+++ CollectionTest.java 7 Aug 2003 20:13:26 -0000 1.8
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client.basic;
@@ -70,7 +70,7 @@
import java.util.Vector;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class CollectionTest extends AbstractXmlDbClientTest {
1.7 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/DocumentTest.java
Index: DocumentTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/DocumentTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DocumentTest.java 5 Aug 2003 23:17:00 -0000 1.6
+++ DocumentTest.java 7 Aug 2003 20:13:26 -0000 1.7
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client.basic;
@@ -78,7 +78,7 @@
import org.xmldb.api.base.XMLDBException;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class DocumentTest
1.4 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java
Index: IndexTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IndexTest.java 28 Oct 2002 08:39:20 -0000 1.3
+++ IndexTest.java 7 Aug 2003 20:13:26 -0000 1.4
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client.basic;
@@ -68,7 +68,7 @@
import java.util.Vector;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class IndexTest
1.8 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/XPathQueryTest.java
Index: XPathQueryTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/XPathQueryTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathQueryTest.java 6 Aug 2003 05:49:50 -0000 1.7
+++ XPathQueryTest.java 7 Aug 2003 20:13:27 -0000 1.8
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client.services;
@@ -75,7 +75,7 @@
import java.util.List;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin O'Neill</a>
*/
1.5 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/XUpdateQueryTest.java
Index: XUpdateQueryTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/XUpdateQueryTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XUpdateQueryTest.java 10 Apr 2003 18:33:41 -0000 1.4
+++ XUpdateQueryTest.java 7 Aug 2003 20:13:27 -0000 1.5
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.integration.client.services;
@@ -65,7 +65,7 @@
import org.xmldb.api.base.Collection;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class XUpdateQueryTest
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/stress/filer/StressFilerTestSetup.java
Index: StressFilerTestSetup.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/stress/filer/StressFilerTestSetup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StressFilerTestSetup.java 28 Oct 2002 08:39:20 -0000 1.2
+++ StressFilerTestSetup.java 7 Aug 2003 20:13:27 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.stress.filer;
@@ -68,7 +68,7 @@
import com.clarkware.junitperf.LoadTest;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class StressFilerTestSetup
1.5 +1 -1
xml-xindice/java/tests/src/org/apache/xindice/tools/XMLToolsTest.java
Index: XMLToolsTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/tools/XMLToolsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLToolsTest.java 19 Nov 2002 09:17:58 -0000 1.4
+++ XMLToolsTest.java 7 Aug 2003 20:13:27 -0000 1.5
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class XMLToolsTest
1.3 +2 -2
xml-xindice/java/tests/src/org/apache/xindice/util/ConfigurationTest.java
Index: ConfigurationTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/util/ConfigurationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurationTest.java 6 Apr 2003 05:41:54 -0000 1.2
+++ ConfigurationTest.java 7 Aug 2003 20:13:27 -0000 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id$
+ * CVS $Id$
*/
package org.apache.xindice.util;
@@ -67,7 +67,7 @@
import org.w3c.dom.Document;
/**
- * @version $Revision$, $Date$
+ * @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
public class ConfigurationTest
