exist-commits — Receive notifications about CVS commits.

[Exist-commits] eXist-1.0/src/org/exist/dom DocumentImpl.java,1.50,1.51

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4115/src/org/exist/dom

Modified Files:
	DocumentImpl.java 
Log Message:
* Fixed locking error: a collection object could be unloaded from the cache by one thread, while another thread had still been writing a document 
being a member of the collection. A moment later, a third thread reloaded the collection and started to write to the same document. However, as 
the collection had been recreated, there were two instances of the same document in memory. The third thread did thus not respect the lock held 
by the first thread and started to write without waiting. As a consequence, various page errors were thrown.

* When updating a document, the old document metadata had not been correctly removed. Usually, this had no consequences as the collection class 
only used the last record it found. In some cases however, this may have led to errors.

Index: DocumentImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/DocumentImpl.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** DocumentImpl.java	19 Jul 2004 13:06:25 -0000	1.50
--- DocumentImpl.java	28 Jul 2004 18:54:57 -0000	1.51
***************
*** 259,267 ****
  					+ treeLevelStartPoints[i];
  			if(treeLevelStartPoints[i + 1] > 0x6fffffffffffffffL ||
! 				treeLevelStartPoints[i + 1] < 0)
! 				throw new EXistException("the document is too complex/irregularily structured " +
					"to be mapped into eXist's numbering scheme");
  		}
  	}
  
  	public final int compareTo(Object other) {
  		final long otherId = ((DocumentImpl)other).docId;
--- 259,281 ----
  					+ treeLevelStartPoints[i];
  			if(treeLevelStartPoints[i + 1] > 0x6fffffffffffffffL ||
! 				treeLevelStartPoints[i + 1] < 0) {
! 				throw new EXistException("The document is too complex/irregularily structured " +
					"to be mapped into eXist's numbering scheme. Number of children per level of the " +
! 					"tree: " + printTreeLevelOrder());
! 			}
  		}
  	}
  
+ 	public String printTreeLevelOrder() {
+ 		StringBuffer buf = new StringBuffer();
+ 		buf.append("[ ");
+ 		for(int i = 0; i < maxDepth; i++) {
+ 			if(i > 0)
+ 				buf.append(", ");
+ 			buf.append(treeLevelOrder[i]);
+ 		}
+ 		buf.append(" ]");
+ 		return buf.toString();
+ 	}
+ 	
  	public final int compareTo(Object other) {
  		final long otherId = ((DocumentImpl)other).docId;
***************
*** 721,725 ****
  			    pageCount = istream.readInt();
  		} catch (IOException e) {
! 			LOG.warn("io error while reading document data for document " + fileName, e);
  		}
  	}
--- 735,740 ----
  			    pageCount = istream.readInt();
  		} catch (IOException e) {
! 			LOG.warn("IO error while reading document data for document " + fileName, e);
! 			LOG.warn("Document address is " + StorageAddress.toString(getAddress()));
  		}
  	}

[Exist-commits] eXist-1.0/src/org/exist/storage/store DOMFile.java,1.41,1.42

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/store
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22975/src/org/exist/storage/store

Modified Files:
	DOMFile.java 
Log Message:
ArrayIndexOutOfBounds exception when loading node value from overflow page.

Index: DOMFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/DOMFile.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** DOMFile.java	19 Jul 2004 13:06:25 -0000	1.41
--- DOMFile.java	28 Jul 2004 17:40:05 -0000	1.42
***************
*** 722,726 ****
              query(query, cb);
          } catch (TerminatedException e) {
!             // Should never happen hear
              LOG.warn("Method terminated");
          }
--- 722,726 ----
              query(query, cb);
          } catch (TerminatedException e) {
!             // Should never happen here
              LOG.warn("Method terminated");
          }
***************
*** 1192,1200 ****
      
      public void removeAll(long p) {
! //    	StringBuffer debug = new StringBuffer();
! //    	debug.append("Removed pages: ");
          long pnum = StorageAddress.pageFromPointer(p);
          while(-1 < pnum) {
! //        	debug.append(' ').append(pnum);
              DOMPage page = getCurrentPage(pnum);
              pnum = page.getPageHeader().getNextDataPage();
--- 1192,1200 ----
      
      public void removeAll(long p) {
!     	StringBuffer debug = new StringBuffer();
!     	debug.append("Removed pages: ");
          long pnum = StorageAddress.pageFromPointer(p);
          while(-1 < pnum) {
!         	debug.append(' ').append(pnum);
              DOMPage page = getCurrentPage(pnum);
              pnum = page.getPageHeader().getNextDataPage();
***************
*** 1213,1217 ****
              }
          }
! //        LOG.debug(debug.toString());
      }
      
--- 1213,1217 ----
              }
          }
!         LOG.debug(debug.toString());
      }
      
***************
*** 1227,1230 ****
--- 1227,1231 ----
              pnum = page.getPageHeader().getNextDataPage();
          }
+         buf.append("; Document metadata at " +StorageAddress.toString(doc.getAddress()));
          return buf.toString();
      }
***************
*** 1382,1386 ****
  	        	foundNext = true;
      	} while(!foundNext);
!         short len = ByteConversion.byteToShort(rec.page.data, rec.offset);
          rec.offset += 2;
          if(ItemId.isRelocated(rec.tid))
--- 1383,1387 ----
  	        	foundNext = true;
      	} while(!foundNext);
!         int len = ByteConversion.byteToShort(rec.page.data, rec.offset);
          rec.offset += 2;
          if(ItemId.isRelocated(rec.tid))
***************
*** 1392,1396 ****
                      rec.offset);
              data = getOverflowValue(op);
!             len = (short) data.length;
              readOffset = 0;
              rec.offset += 8;
--- 1393,1397 ----
                      rec.offset);
              data = getOverflowValue(op);
!             len = data.length;
              readOffset = 0;
              rec.offset += 8;
***************
*** 1399,1413 ****
          switch (type) {
          case Node.ELEMENT_NODE:
!             final int children = ByteConversion.byteToInt(data, readOffset + 1);
!             final byte attrSizeType = (byte) ((data[readOffset] & 0x0C) >> 0x2);
!             final short attributes = (short) Signatures.read(attrSizeType,
!                     data, readOffset + 5);
!             rec.offset += len + 2;
!             for (int i = 0; i < children; i++) {
!                 getNodeValue(os, rec, false);
!                 //if (children - attributes > 1)
!                 //	os.write((byte) 0x20);
!             }
!             return;
          case Node.TEXT_NODE:
              os.write(data, readOffset + 1, len - 1);
--- 1400,1414 ----
          switch (type) {
          case Node.ELEMENT_NODE:
!         	final int children = ByteConversion.byteToInt(data, readOffset + 1);
! 	        final byte attrSizeType = (byte) ((data[readOffset] & 0x0C) >> 0x2);
! 	        final short attributes = (short) Signatures.read(attrSizeType,
! 	        		data, readOffset + 5);
! 	        rec.offset += len + 2;
! 	        for (int i = 0; i < children; i++) {
! 	        	getNodeValue(os, rec, false);
! 	        	if (children - attributes > 1)
! 	        		os.write((byte) 0x20);
! 	        }
! 	        return;
          case Node.TEXT_NODE:
              os.write(data, readOffset + 1, len - 1);
***************
*** 1430,1434 ****
              break;
          }
!         rec.offset += len + 2;
      }
  
--- 1431,1436 ----
              break;
          }
!         if(len != OVERFLOW)
!         	rec.offset += len + 2;
      }
  

[Exist-commits] eXist-1.0/src/org/exist/storage/serializers Serializer.java,1.26,1.27

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31942/src/org/exist/storage/serializers

Modified Files:
	Serializer.java 
Log Message:
Fixed: relative stylesheet paths containing .. were not resolved.

Index: Serializer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers/Serializer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Serializer.java	27 Jul 2004 16:38:01 -0000	1.26
--- Serializer.java	28 Jul 2004 08:28:04 -0000	1.27
***************
*** 698,705 ****
  				// if stylesheet is relative, add path to the
  				// current collection
! 				URI base = URI.create(doc.getCollection().getName() + "/");
! 				URI uri = URI.create(stylesheet);
! 				stylesheet = base.resolve(uri).toString();
! 
  				// load stylesheet from eXist
  				DocumentImpl xsl = null;
--- 698,707 ----
  				// if stylesheet is relative, add path to the
  				// current collection
! 				if(doc != null) {
! 					URI base = URI.create(doc.getCollection().getName() + "/");
! 					URI uri = URI.create(stylesheet);
! 					stylesheet = base.resolve(uri).toString();
! 				}
! 				
  				// load stylesheet from eXist
  				DocumentImpl xsl = null;

[Exist-commits] eXist-1.0/src/org/exist/storage/serializers Serializer.java,1.25,1.26

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31309/src/org/exist/storage/serializers

Modified Files:
	Serializer.java 
Log Message:
Fixed: relative stylesheet paths containing .. were not resolved.

Index: Serializer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers/Serializer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Serializer.java	2 Jul 2004 16:53:54 -0000	1.25
--- Serializer.java	27 Jul 2004 16:38:01 -0000	1.26
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.IOException;
  import java.io.StringWriter;
+ import java.net.URI;
  import java.util.Enumeration;
  import java.util.Hashtable;
***************
*** 697,742 ****
  				// if stylesheet is relative, add path to the
  				// current collection
! 				if (stylesheet.indexOf('/') < 0 && doc != null)
! 					stylesheet = doc.getCollection().getName() + '/' + stylesheet;
  
! 			// load stylesheet from eXist
! 			DocumentImpl xsl = null;
! 			try {
! 				xsl = (DocumentImpl) broker.getDocument(stylesheet);
! 			} catch (PermissionDeniedException e) {
! 				LOG.debug("permission denied to read stylesheet");
! 			}
! 			if (xsl == null) {
! 				LOG.debug("stylesheet not found");
! 				return;
! 			}
! 			if(!xsl.getPermissions().validate(broker.getUser(), Permission.READ)) {
! 			    LOG.debug("Permission denied to read stylesheet doc.");
! 			    return;
! 			}
  				
! 			if (xsl.getCollection() != null) {
! 				factory.setURIResolver(
! 					new InternalURIResolver(xsl.getCollection().getName()));
! 			}
! 
! 			// save handlers
! 			ContentHandler oldHandler = contentHandler;
! 			LexicalHandler oldLexical = lexicalHandler;
! 
! 			// compile stylesheet
! 			TemplatesHandler handler = factory.newTemplatesHandler();
! 			contentHandler = handler;
! 			try {
! 				this.toSAX(xsl);
! 			} catch (SAXException e) {
! 				LOG.warn("SAXException while creating template", e);
! 			}
! 			templates = handler.getTemplates();
! 
! 			// restore handlers
! 			contentHandler = oldHandler;
! 			lexicalHandler = oldLexical;
! 			factory.setURIResolver(null);
              }
  			LOG.debug(
--- 698,744 ----
  				// if stylesheet is relative, add path to the
  				// current collection
! 				URI base = URI.create(doc.getCollection().getName() + "/");
! 				URI uri = URI.create(stylesheet);
! 				stylesheet = base.resolve(uri).toString();
  
! 				// load stylesheet from eXist
! 				DocumentImpl xsl = null;
! 				try {
! 					xsl = (DocumentImpl) broker.getDocument(stylesheet);
! 				} catch (PermissionDeniedException e) {
! 					LOG.debug("permission denied to read stylesheet");
! 				}
! 				if (xsl == null) {
! 					LOG.debug("stylesheet not found");
! 					return;
! 				}
! 				if(!xsl.getPermissions().validate(broker.getUser(), Permission.READ)) {
! 					LOG.debug("Permission denied to read stylesheet doc.");
! 					return;
! 				}
  				
! 				if (xsl.getCollection() != null) {
! 					factory.setURIResolver(
! 							new InternalURIResolver(xsl.getCollection().getName()));
! 				}
! 				
! 				// save handlers
! 				ContentHandler oldHandler = contentHandler;
! 				LexicalHandler oldLexical = lexicalHandler;
! 				
! 				// compile stylesheet
! 				TemplatesHandler handler = factory.newTemplatesHandler();
! 				contentHandler = handler;
! 				try {
! 					this.toSAX(xsl);
! 				} catch (SAXException e) {
! 					LOG.warn("SAXException while creating template", e);
! 				}
! 				templates = handler.getTemplates();
! 				
! 				// restore handlers
! 				contentHandler = oldHandler;
! 				lexicalHandler = oldLexical;
! 				factory.setURIResolver(null);
              }
  			LOG.debug(
***************
*** 862,866 ****
  	 *
  	 *@author     Wolfgang Meier <me...@if...>
- 	 *@created    20. April 2002
  	 */
  	private class InternalURIResolver implements URIResolver {
--- 864,867 ----
***************
*** 868,888 ****
  		private String collectionId = null;
  
- 		/**
- 		 *  Constructor for the InternalURIResolver object
- 		 *
- 		 *@param  collection  Description of the Parameter
- 		 */
  		public InternalURIResolver(String collection) {
  			collectionId = collection;
  		}
  
- 		/**
- 		 *  Description of the Method
- 		 *
- 		 *@param  href                      Description of the Parameter
- 		 *@param  base                      Description of the Parameter
- 		 *@return                           Description of the Return Value
- 		 *@exception  TransformerException  Description of the Exception
- 		 */
  		public Source resolve(String href, String base) throws TransformerException {
  			LOG.debug("resolving stylesheet ref " + href);
--- 869,876 ----
***************
*** 890,896 ****
  				// href is an URL pointing to an external resource
  				return null;
! 			if ((!href.startsWith("/")) && collectionId != null)
! 				href =
! 					(collectionId.equals("/") ? '/' + href : collectionId + '/' + href);
  			Serializer serializer = broker.newSerializer();
  			return new SAXSource(serializer, new InputSource(href));
--- 878,884 ----
  				// href is an URL pointing to an external resource
  				return null;
! 			URI baseURI = URI.create(collectionId + '/');
! 			URI uri = URI.create(href);
! 			href = baseURI.resolve(uri).toString();
  			Serializer serializer = broker.newSerializer();
  			return new SAXSource(serializer, new InputSource(href));

[Exist-commits] eXist-1.0/webapp configuration.xml,1.11,1.12

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4330/webapp

Modified Files:
	configuration.xml 
Log Message:


Index: configuration.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/configuration.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configuration.xml	27 Jul 2004 12:46:40 -0000	1.11
--- configuration.xml	27 Jul 2004 14:24:01 -0000	1.12
***************
*** 342,345 ****
--- 342,352 ----
  						</listitem>
  					</varlistentry>
+ 				      <varlistentry>
+ 						<term>preserve-whitespace-mixed-content</term>
+ 						<listitem>
+ 							<para>Preserve whitespace for mixed content. Default option is <option>no</option>.
+                                                 The option are <option>yes</option> and <option>no</option></para>
+ 						</listitem>
+ 					</varlistentry>
  				</variablelist>
  			</section>

[Exist-commits] eXist-1.0/src/org/exist/util Configuration.java,1.22,1.23

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29088/src/org/exist/util

Modified Files:
	Configuration.java 
Log Message:


Index: Configuration.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/Configuration.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Configuration.java	26 Jul 2004 10:47:56 -0000	1.22
--- Configuration.java	27 Jul 2004 13:42:49 -0000	1.23
***************
*** 119,123 ****
  				String tokenizer = p.getAttribute("tokenizer");
  				String validation = p.getAttribute("validation");
! 				String suppressWSmixed = p.getAttribute("suppress-whitespace-mixed-content");
  				
  				if (parseNum != null)
--- 119,123 ----
  				String tokenizer = p.getAttribute("tokenizer");
  				String validation = p.getAttribute("validation");
! 				String suppressWSmixed = p.getAttribute("preserve-whitespace-mixed-content");
  				
  				if (parseNum != null)
***************
*** 154,158 ****
  					if (suppressWSmixed != null)
  					config.put(
! 						"indexer.suppress-whitespace-mixed-content",
  						Boolean.valueOf(suppressWSmixed.equals("yes")));
  				
--- 154,158 ----
  					if (suppressWSmixed != null)
  					config.put(
! 						"indexer.preserve-whitespace-mixed-content",
  						Boolean.valueOf(suppressWSmixed.equals("yes")));
  				

[Exist-commits] eXist-1.0/src/org/exist Indexer.java,1.12,1.13

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29088/src/org/exist

Modified Files:
	Indexer.java 
Log Message:


Index: Indexer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/Indexer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Indexer.java	26 Jul 2004 10:47:56 -0000	1.12
--- Indexer.java	27 Jul 2004 13:42:48 -0000	1.13
***************
*** 139,143 ****
  		
  		Boolean temp;
! 		if ((temp = (Boolean) config.getProperty("indexer.suppress-whitespace-mixed-content"))
  			!= null)
  			suppressWSmixed = temp.booleanValue();
--- 139,143 ----
  		
  		Boolean temp;
! 		if ((temp = (Boolean) config.getProperty("indexer.preserve-whitespace-mixed-content"))
  			!= null)
  			suppressWSmixed = temp.booleanValue();

[Exist-commits] eXist-1.0 conf.xml,1.58,1.59

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29088

Modified Files:
	conf.xml 
Log Message:


Index: conf.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/conf.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** conf.xml	26 Jul 2004 10:47:56 -0000	1.58
--- conf.xml	27 Jul 2004 13:42:47 -0000	1.59
***************
*** 132,136 ****
      <indexer stemming="no" caseSensitive="no" suppress-whitespace="both" 
  	index-depth="1" tokenizer="org.exist.storage.analysis.SimpleTokenizer"
! 	track-term-freq="yes" validation="no" suppress-whitespace-mixed-content="no">
          
  		<!-- where's the file containing a list of stopwords to be ignored
--- 132,136 ----
      <indexer stemming="no" caseSensitive="no" suppress-whitespace="both" 
  	index-depth="1" tokenizer="org.exist.storage.analysis.SimpleTokenizer"
! 	track-term-freq="yes" validation="no" preserve-whitespace-mixed-content="no">
          
  		<!-- where's the file containing a list of stopwords to be ignored

[Exist-commits] eXist-1.0/webapp configuration.xml,1.10,1.11

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18803/webapp

Modified Files:
	configuration.xml 
Log Message:
Fix sitemap link

Index: configuration.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/configuration.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configuration.xml	27 Jul 2004 12:38:34 -0000	1.10
--- configuration.xml	27 Jul 2004 12:46:40 -0000	1.11
***************
*** 505,509 ****
  ]]></screen>
  			</example>
! 			<para>The <ulink url="../sitemap.xmap">sitemap</ulink> delivered 
  				with eXist contains some more complex examples.</para>
  		</section>
--- 505,509 ----
  ]]></screen>
  			</example>
! 			<para>The <ulink url="sitemap.xmap">sitemap</ulink> delivered 
  				with eXist contains some more complex examples.</para>
  		</section>

[Exist-commits] eXist-1.0/webapp ant-tasks.xml,1.2,1.3 configuration.xml,1.9,1.10 credits.xml,1.1,1.2 deployment.xml,1.6,1.7 header.xml,1.2,1.3 howtos.xml,1.6,1.7 performance.xml,1.7,1.8 quickstart.xml,1.14,1.15 security.xml,1.4,1.5 xinclude.xml,1.3,1.4 xquery.xml,1.6,1.7

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17623/webapp

Modified Files:
	ant-tasks.xml configuration.xml credits.xml deployment.xml 
	header.xml howtos.xml performance.xml quickstart.xml 
	security.xml xinclude.xml xquery.xml 
Log Message:
Change eXist definition from "Open Source XML Database" to "Open Source Native XML Database"

Index: credits.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/credits.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** credits.xml	27 Jul 2004 11:58:56 -0000	1.1
--- credits.xml	27 Jul 2004 12:38:34 -0000	1.2
***************
*** 6,10 ****
      <bookinfo>
          <graphic fileref="logo.jpg"/>
! 		<title>Open Source XML Database</title>
          <author> 
            <firstname>Wolfgang M.</firstname>
--- 6,10 ----
      <bookinfo>
          <graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
          <author> 
            <firstname>Wolfgang M.</firstname>

Index: ant-tasks.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/ant-tasks.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ant-tasks.xml	16 Feb 2004 10:28:30 -0000	1.2
--- ant-tasks.xml	27 Jul 2004 12:38:33 -0000	1.3
***************
*** 5,9 ****
          <graphic fileref="logo.jpg"/>
  
!         <title>Open Source XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>
--- 5,9 ----
          <graphic fileref="logo.jpg"/>
  
!         <title>Open Source Native XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>

Index: howtos.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/howtos.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** howtos.xml	26 Feb 2004 14:44:02 -0000	1.6
--- howtos.xml	27 Jul 2004 12:38:34 -0000	1.7
***************
*** 4,8 ****
    <bookinfo>
      <graphic fileref="logo.jpg"/>
!     <title>Open Source XML Database</title>
      <author> 
        <firstname>Wolfgang M.</firstname>
--- 4,8 ----
    <bookinfo>
      <graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
      <author> 
        <firstname>Wolfgang M.</firstname>

Index: xquery.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xquery.xml	5 Jul 2004 13:12:03 -0000	1.6
--- xquery.xml	27 Jul 2004 12:38:34 -0000	1.7
***************
*** 5,9 ****
          <graphic fileref="logo.jpg"/>
  
!         <title>Open Source XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>
--- 5,9 ----
          <graphic fileref="logo.jpg"/>
  
!         <title>Open Source Native XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>

Index: performance.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/performance.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** performance.xml	2 Feb 2004 15:30:30 -0000	1.7
--- performance.xml	27 Jul 2004 12:38:34 -0000	1.8
***************
*** 4,8 ****
      <bookinfo>
          <graphic fileref="logo.jpg"/>
! 		<title>Open Source XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>
--- 4,8 ----
      <bookinfo>
          <graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>

Index: xinclude.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xinclude.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xinclude.xml	23 Jul 2004 14:24:23 -0000	1.3
--- xinclude.xml	27 Jul 2004 12:38:34 -0000	1.4
***************
*** 3,7 ****
      <bookinfo>
          <graphic fileref="/exist/logo.jpg"/>
!         <title>Open Source XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>
--- 3,7 ----
      <bookinfo>
          <graphic fileref="/exist/logo.jpg"/>
!         <title>Open Source Native XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>

Index: configuration.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/configuration.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configuration.xml	29 Jan 2004 15:06:43 -0000	1.9
--- configuration.xml	27 Jul 2004 12:38:34 -0000	1.10
***************
*** 3,7 ****
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
! 		<title>Open Source XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>
--- 3,7 ----
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>

Index: security.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/security.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** security.xml	8 Aug 2003 14:39:16 -0000	1.4
--- security.xml	27 Jul 2004 12:38:34 -0000	1.5
***************
*** 4,8 ****
      <bookinfo>
          <graphic fileref="logo.jpg"/>
!         <title>Open Source XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>
--- 4,8 ----
      <bookinfo>
          <graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
          <author>
              <firstname>Wolfgang M.</firstname>

Index: quickstart.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/quickstart.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** quickstart.xml	2 Feb 2004 15:30:29 -0000	1.14
--- quickstart.xml	27 Jul 2004 12:38:34 -0000	1.15
***************
*** 3,7 ****
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
! 		<title>Open Source XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>
--- 3,7 ----
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>

Index: header.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/header.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** header.xml	8 Aug 2003 14:39:16 -0000	1.2
--- header.xml	27 Jul 2004 12:38:34 -0000	1.3
***************
*** 3,7 ****
  <header>
      <logo src="logo.jpg"/>
!     <title>Open Source XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>
--- 3,7 ----
  <header>
      <logo src="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>

Index: deployment.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/deployment.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** deployment.xml	29 Jan 2004 15:06:43 -0000	1.6
--- deployment.xml	27 Jul 2004 12:38:34 -0000	1.7
***************
*** 6,10 ****
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
! 		<title>Open Source XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>
--- 6,10 ----
  	<bookinfo>
  		<graphic fileref="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  		<author>
  			<firstname>Wolfgang M.</firstname>

[Exist-commits] eXist-1.0/webapp/xquery header.xml,1.1,1.2 xquery.xq,1.6,1.7

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17623/webapp/xquery

Modified Files:
	header.xml xquery.xq 
Log Message:
Change eXist definition from "Open Source XML Database" to "Open Source Native XML Database"

Index: xquery.xq
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/xquery.xq,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xquery.xq	22 Jul 2004 19:00:48 -0000	1.6
--- xquery.xq	27 Jul 2004 12:38:34 -0000	1.7
***************
*** 1,132 ****
! xquery version "1.0";
! 
! (: Test module import :)
! import module namespace utils="http://exist-db.org/xquery/collection-utils"
! at "collections.xqm";
! 
! (: Namespace for the local functions in this script :)
! declare namespace f="http://exist-db.org/xquery/local-functions";
! 
! (: Namespace for the request module (automatically loaded) :)
! declare namespace request="http://exist-db.org/xquery/request";
! 
! (:  Retrieves the names of the current collection
!     and all child-collections and returns them as a list of <option>
!     elements
! :)
! declare function f:retrieve-collections()
! as element()+
! { 
!     for $c in 
!         utils:list-collection-names(
!             "xmldb:exist:///db", "guest", "guest"
!         )
!     return
!         <option>{$c}</option>
! };
! 
! (:  Read query examples into the select box 
!     - see examples.xml in directory samples/ :)
! declare function f:get-examples() as element()
! {
!     let $queries := /example-queries/query
!     return
!         if (empty($queries)) then
!             <p><small>No examples found. Please store document samples/examples.xml
!             into the database to get some examples.</small></p>
!         else
!             <form>
!                 <select onchange="forms['xquery'].query.value=this.value">
!                     {for $q in $queries return
!                         <option value="{$q/code}">{$q/description}</option>
!                     }
!                 </select>
!             </form>
! };
! 
! (:  Retrieve previous queries from the query history. We
!     store the history as an XQuery sequence in the session
!     object.
! :)
! declare function f:get-query-history() as element()*
! {
!     let $history := request:get-session-attribute("history")
!     for $query in $history return
!         <option value="{$query}">{substring($query, 1, 70)}</option>
! };
! 
! <document xmlns:xi="http://www.w3.org/2001/XInclude">
!    	
!     <header>
!         <logo src="logo.jpg"/>
!         <title>Open Source XML Database</title>
! 	    <author email="wol...@ex...">Wolfgang M. Meier</author>
!         <style href="styles/xquery.css"/>
!     </header>    
! 
!     <!-- include sidebar -->
!     <xi:include href="sidebar.xml"/>
!   
!     <body>
! 
!         <section title="Give it a try!">
! 
!         <p>Using the form below, arbitrary XQuery expressions can be send to the
!         server. Results are shown in raw XML.</p>
! 
!         <p>This application is itself implemented as an XQuery script. For
!         getting started, you may select one of the example queries in the
!         select box below:</p>
! 
!         {f:get-examples()}
! 
!         <p></p>
! 
!         <form action="process.xq" method="post" name="xquery">
!             <table class="query" border="0" bgcolor="#EEEEEE" 
!                 cellpadding="5" cellspacing="0">
!                 <tr>
!                     <th colspan="2">XQuery Search Form</th>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">Context:</span><br/>
!                         <!-- put all collection paths into a select element -->
!                         <select name="collection" size="1">
!                         { f:retrieve-collections() }
!                         </select>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">XQuery:</span><br/>
!                         <textarea name="query" cols="70" rows="15"/>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">Query History:</span><br/>
!                         <select name="history" size="1"
!                             onchange="this.form.query.value=this.value">
!                             <option></option>
!                             { f:get-query-history() }
!                         </select>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td align="left"><input type="submit"/></td>
!                     <td align="right">
!                         <span class="label">Hits per page:</span><br/>
!                         <select name="howmany" size="1">
!                             <option>10</option>
!                             <option>20</option>
!                             <option>50</option>
!                         </select>
!                     </td>
!                 </tr>
!             </table>
!         </form>
! 
!         </section>
!     </body>
! </document>
--- 1,132 ----
! xquery version "1.0";
! 
! (: Test module import :)
! import module namespace utils="http://exist-db.org/xquery/collection-utils"
! at "collections.xqm";
! 
! (: Namespace for the local functions in this script :)
! declare namespace f="http://exist-db.org/xquery/local-functions";
! 
! (: Namespace for the request module (automatically loaded) :)
! declare namespace request="http://exist-db.org/xquery/request";
! 
! (:  Retrieves the names of the current collection
!     and all child-collections and returns them as a list of <option>
!     elements
! :)
! declare function f:retrieve-collections()
! as element()+
! { 
!     for $c in 
!         utils:list-collection-names(
!             "xmldb:exist:///db", "guest", "guest"
!         )
!     return
!         <option>{$c}</option>
! };
! 
! (:  Read query examples into the select box 
!     - see examples.xml in directory samples/ :)
! declare function f:get-examples() as element()
! {
!     let $queries := /example-queries/query
!     return
!         if (empty($queries)) then
!             <p><small>No examples found. Please store document samples/examples.xml
!             into the database to get some examples.</small></p>
!         else
!             <form>
!                 <select onchange="forms['xquery'].query.value=this.value">
!                     {for $q in $queries return
!                         <option value="{$q/code}">{$q/description}</option>
!                     }
!                 </select>
!             </form>
! };
! 
! (:  Retrieve previous queries from the query history. We
!     store the history as an XQuery sequence in the session
!     object.
! :)
! declare function f:get-query-history() as element()*
! {
!     let $history := request:get-session-attribute("history")
!     for $query in $history return
!         <option value="{$query}">{substring($query, 1, 70)}</option>
! };
! 
! <document xmlns:xi="http://www.w3.org/2001/XInclude">
!    	
!     <header>
!         <logo src="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
! 	    <author email="wol...@ex...">Wolfgang M. Meier</author>
!         <style href="styles/xquery.css"/>
!     </header>    
! 
!     <!-- include sidebar -->
!     <xi:include href="sidebar.xml"/>
!   
!     <body>
! 
!         <section title="Give it a try!">
! 
!         <p>Using the form below, arbitrary XQuery expressions can be send to the
!         server. Results are shown in raw XML.</p>
! 
!         <p>This application is itself implemented as an XQuery script. For
!         getting started, you may select one of the example queries in the
!         select box below:</p>
! 
!         {f:get-examples()}
! 
!         <p></p>
! 
!         <form action="process.xq" method="post" name="xquery">
!             <table class="query" border="0" bgcolor="#EEEEEE" 
!                 cellpadding="5" cellspacing="0">
!                 <tr>
!                     <th colspan="2">XQuery Search Form</th>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">Context:</span><br/>
!                         <!-- put all collection paths into a select element -->
!                         <select name="collection" size="1">
!                         { f:retrieve-collections() }
!                         </select>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">XQuery:</span><br/>
!                         <textarea name="query" cols="70" rows="15"/>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td colspan="2">
!                         <span class="label">Query History:</span><br/>
!                         <select name="history" size="1"
!                             onchange="this.form.query.value=this.value">
!                             <option></option>
!                             { f:get-query-history() }
!                         </select>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td align="left"><input type="submit"/></td>
!                     <td align="right">
!                         <span class="label">Hits per page:</span><br/>
!                         <select name="howmany" size="1">
!                             <option>10</option>
!                             <option>20</option>
!                             <option>50</option>
!                         </select>
!                     </td>
!                 </tr>
!             </table>
!         </form>
! 
!         </section>
!     </body>
! </document>

Index: header.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/header.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.xml	21 Nov 2003 15:57:13 -0000	1.1
--- header.xml	27 Jul 2004 12:38:34 -0000	1.2
***************
*** 3,7 ****
  <header>
      <logo src="logo.jpg"/>
!     <title>Open Source XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>
--- 3,7 ----
  <header>
      <logo src="logo.jpg"/>
!         <title>Open Source Native XML Database</title>
  	<author email="wol...@ex...">Wolfgang M. Meier</author>
  </header>

[Exist-commits] eXist-1.0/webapp/library sidebar.xml,1.10,1.11

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/library
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13154/webapp/library

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/library/sidebar.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sidebar.xml	25 May 2004 09:26:09 -0000	1.10
--- sidebar.xml	27 Jul 2004 12:15:01 -0000	1.11
***************
*** 4,7 ****
--- 4,12 ----
      <group href="http://wiki.exist-db.org" name="News"/>
  	<group name="Donations" href="../donations.xml"/>
+     <group name="About Us">
+         <item>
+             <link href="../credits.xml">Credits</link>
+         </item>
+     </group>
      <group name="Documentation">
          <item id="features">

[Exist-commits] eXist-1.0/webapp/xquery sidebar.xml,1.9,1.10

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13154/webapp/xquery

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/sidebar.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sidebar.xml	23 Jul 2004 14:29:30 -0000	1.9
--- sidebar.xml	27 Jul 2004 12:15:02 -0000	1.10
***************
*** 7,11 ****
  		<link href="../examples.xml">Demo</link>
      </toolbar>
!     <group name="Documentation">
          <item id="features">
  			<link href="../facts.xml">Feature Sheet</link>
--- 7,16 ----
  		<link href="../examples.xml">Demo</link>
      </toolbar>
!     <group name="About Us">
!         <item>
!             <link href="../credits.xml">Credits</link>
!         </item>
!     </group>    
! <group name="Documentation">
          <item id="features">
  			<link href="../facts.xml">Feature Sheet</link>

[Exist-commits] eXist-1.0/webapp/simple sidebar.xml,1.9,1.10

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13154/webapp/simple

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/simple/sidebar.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sidebar.xml	25 May 2004 09:25:44 -0000	1.9
--- sidebar.xml	27 Jul 2004 12:15:01 -0000	1.10
***************
*** 4,8 ****
      <group href="http://wiki.exist-db.org" name="News"/>
  	<group name="Donations" href="../donations.xml"/>
!     <group name="Documentation">
          <item id="features">
              <link href="../facts.xml">Feature Sheet</link>
--- 4,13 ----
      <group href="http://wiki.exist-db.org" name="News"/>
  	<group name="Donations" href="../donations.xml"/>
!     <group name="About Us">
!         <item>
!             <link href="../credits.xml">Credits</link>
!         </item>
!     </group>   
!  <group name="Documentation">
          <item id="features">
              <link href="../facts.xml">Feature Sheet</link>

[Exist-commits] eXist-1.0/webapp/examples sidebar.xml,1.4,1.5

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13154/webapp/examples

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/examples/sidebar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sidebar.xml	6 Jan 2004 14:10:17 -0000	1.4
--- sidebar.xml	27 Jul 2004 12:15:01 -0000	1.5
***************
*** 3,6 ****
--- 3,11 ----
      <group href="../index.xml" name="Home"/>
  	<group name="Donations" href="../donations.xml"/>
+     <group name="About Us">
+         <item>
+             <link href="../credits.xml">Credits</link>
+         </item>
+     </group>
      <group name="Documentation">
          <item id="features">

[Exist-commits] eXist-1.0/webapp/acronyms sidebar.xml,1.5,1.6

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/acronyms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13154/webapp/acronyms

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/acronyms/sidebar.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sidebar.xml	21 May 2004 08:40:57 -0000	1.5
--- sidebar.xml	27 Jul 2004 12:15:00 -0000	1.6
***************
*** 4,7 ****
--- 4,12 ----
      <group href="http://wiki.exist-db.org" name="News"/>
  	<group name="Donations" href="../donations.xml"/>
+     <group name="About Us">
+         <item>
+             <link href="../credits.xml">Credits</link>
+         </item>
+     </group>
      <group name="Documentation">
          <item id="features">

[Exist-commits] eXist-1.0/webapp credits.xml,NONE,1.1

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9653/webapp

Added Files:
	credits.xml 
Log Message:
Credits

--- NEW FILE: credits.xml ---
<?xml version="1.0"?>
<!--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd">-->

<book xmlns:ci="http://apache.org/cocoon/include/1.0">
    
    <bookinfo>
        <graphic fileref="logo.jpg"/>
		<title>Open Source XML Database</title>
        <author> 
          <firstname>Wolfgang M.</firstname>
          <surname>Meier</surname>
          <affiliation>
            <address format="linespecific">
				<email>wol...@ex...</email>
            </address>
          </affiliation>
        </author>
    </bookinfo>

    <ci:include src="sidebar.xml"/>
      
    <chapter>
		<title>Credits</title>
        
        <section>
            <title>Credits</title>
            
			<para>eXist version 1.0, Copyright (C) 2004 Wolfgang Meier</para>
<para>eXist comes with ABSOLUTELY NO WARRANTY.</para>
<para>This is free software, and you are welcome to redistribute it under certain conditions; for details read the license file.</para>
		</section>

    </chapter>
</book>
        

[Exist-commits] eXist-1.0/webapp sidebar.xml,1.23,1.24

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9614/webapp

Modified Files:
	sidebar.xml 
Log Message:
Credits

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/sidebar.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** sidebar.xml	23 Jul 2004 14:24:23 -0000	1.23
--- sidebar.xml	27 Jul 2004 11:58:39 -0000	1.24
***************
*** 7,10 ****
--- 7,16 ----
          <link href="examples.xml">Demo</link>
      </toolbar>
+ 
+     <group name="About Us">
+         <item>
+             <link href="credits.xml">Credits</link>
+         </item>
+     </group>
      <group name="Documentation">
          <item id="features">

[Exist-commits] eXist-1.0/src/org/exist/client QueryDialog.java,1.11,1.12

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13186/src/org/exist/client

Modified Files:
	QueryDialog.java 
Log Message:
Icons cut, copy and paste for xquery dialog

Index: QueryDialog.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/client/QueryDialog.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** QueryDialog.java	29 Mar 2004 14:15:13 -0000	1.11
--- QueryDialog.java	26 Jul 2004 14:13:10 -0000	1.12
***************
*** 116,119 ****
--- 116,150 ----
  		toolbar.add(button);
  		
+ 			toolbar.addSeparator();
+ 		url = getClass().getResource("icons/Copy24.gif");
+ 		button = new JButton(new ImageIcon(url));
+ 		button.setToolTipText("Copy selection.");
+ 		button.addActionListener(new ActionListener() {
+ 			public void actionPerformed(ActionEvent e) {
+ 				query.copy();
+ 			}
+ 		});
+ 		toolbar.add(button);
+ 		url = getClass().getResource("icons/Cut24.gif");
+ 		button = new JButton(new ImageIcon(url));
+ 		button.setToolTipText("Cut selection.");
+ 		button.addActionListener(new ActionListener() {
+ 			public void actionPerformed(ActionEvent e) {
+ 				query.cut();
+ 			}
+ 		});
+ 		toolbar.add(button);
+ 		url = getClass().getResource("icons/Paste24.gif");
+ 		button = new JButton(new ImageIcon(url));
+ 		button.setToolTipText("Paste selection.");
+ 		button.addActionListener(new ActionListener() {
+ 			public void actionPerformed(ActionEvent e) {
+ 			   query.paste();
+ 			}
+ 		});
+ 		toolbar.add(button);
+ 		
+ 		
+ 		
  		JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
  		split.setResizeWeight(0.5);

[Exist-commits] eXist-1.0/src/org/exist/client ClientFrame.java,1.21,1.22

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8569/src/org/exist/client

Modified Files:
	ClientFrame.java 
Log Message:
About for interactive client

Index: ClientFrame.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/client/ClientFrame.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ClientFrame.java	5 Jul 2004 20:02:48 -0000	1.21
--- ClientFrame.java	26 Jul 2004 13:50:25 -0000	1.22
***************
*** 392,395 ****
--- 392,396 ----
  		fileMenu.add(item);
  
+ 		fileMenu.addSeparator();
  		item = new JMenuItem("Quit", KeyEvent.VK_Q);
  		item.setAccelerator(KeyStroke.getKeyStroke("control Q"));
***************
*** 551,554 ****
--- 552,568 ----
  		});
  		optionsMenu.add(item);
+ 		
+ 		JMenu HelpMenu = new JMenu("Help");
+ 		HelpMenu.setMnemonic(KeyEvent.VK_H);
+ 		menubar.add(HelpMenu);
+ 		
+ 		item = new JMenuItem("About", KeyEvent.VK_A);		
+ 		item.addActionListener(new ActionListener() {
+ 			public void actionPerformed(ActionEvent e) {
+ 				AboutAction();
+ 			}
+ 		});
+ 		HelpMenu.add(item);
+ 		
  		return menubar;
  	}
***************
*** 1136,1139 ****
--- 1150,1163 ----
  	}
  
+ 	private void AboutAction() {
+ 		JOptionPane.showMessageDialog(this, "eXist version 1.0, Copyright (C) 2004 Wolfgang Meier\n"
+ 		        + "eXist comes with ABSOLUTELY NO WARRANTY.\n"
+ 		        + "This is free software, and you are welcome to\n"
+ 				+ "redistribute it under certain conditions;\n"
+ 				+ "for details read the license file."
+ 		);
+         return;
+ 	}
+ 	
  	class TableMouseListener extends MouseAdapter {
  

[Exist-commits] eXist-1.0/src/org/exist/util Configuration.java,1.21,1.22

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11920/src/org/exist/util

Modified Files:
	Configuration.java 
Log Message:
Preserve whitespace inside a mixed content node

Index: Configuration.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/Configuration.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Configuration.java	19 Jul 2004 13:06:26 -0000	1.21
--- Configuration.java	26 Jul 2004 10:47:56 -0000	1.22
***************
*** 119,123 ****
  				String tokenizer = p.getAttribute("tokenizer");
  				String validation = p.getAttribute("validation");
! 
  				if (parseNum != null)
  					config.put(
--- 119,124 ----
  				String tokenizer = p.getAttribute("tokenizer");
  				String validation = p.getAttribute("validation");
! 				String suppressWSmixed = p.getAttribute("suppress-whitespace-mixed-content");
! 				
  				if (parseNum != null)
  					config.put(
***************
*** 151,154 ****
--- 152,160 ----
  					}
  
+ 					if (suppressWSmixed != null)
+ 					config.put(
+ 						"indexer.suppress-whitespace-mixed-content",
+ 						Boolean.valueOf(suppressWSmixed.equals("yes")));
+ 				
  				// index settings
  				NodeList index = p.getElementsByTagName("index");

[Exist-commits] eXist-1.0/src/org/exist Indexer.java,1.11,1.12

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11920/src/org/exist

Modified Files:
	Indexer.java 
Log Message:
Preserve whitespace inside a mixed content node

Index: Indexer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/Indexer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Indexer.java	23 Jun 2004 12:46:34 -0000	1.11
--- Indexer.java	26 Jul 2004 10:47:56 -0000	1.12
***************
*** 91,94 ****
--- 91,95 ----
  	protected String ignorePrefix = null;
  	protected ProgressIndicator progress;
+ 	protected boolean suppressWSmixed =false;
  
  	// reusable fields
***************
*** 136,139 ****
--- 137,145 ----
  				normalize = 0;
  		}
+ 		
+ 		Boolean temp;
+ 		if ((temp = (Boolean) config.getProperty("indexer.suppress-whitespace-mixed-content"))
+ 			!= null)
+ 			suppressWSmixed = temp.booleanValue();
  	}
  
***************
*** 419,430 ****
  			if (charBuf != null) {
  				if(charBuf.isWhitespaceOnly()) {
! //					if(charBuf.length() > 0 && last.getChildCount() > 0) {
! //						text.setData(charBuf);
! //						text.setOwnerDocument(document);
! //						last.appendChildInternal(text);
! //						if (!validate)
! //							broker.store(text, currentPath);
! //						text.clear();
! //					}
  				} else if(charBuf.length() > 0) {
  					// mixed element content: don't normalize the text node, just check
--- 425,439 ----
  			if (charBuf != null) {
  				if(charBuf.isWhitespaceOnly()) {
! 					if (suppressWSmixed) {
! 						if(charBuf.length() > 0 && last.getChildCount() > 0) {
! 						text.setData(charBuf);
! 						text.setOwnerDocument(document);
! 						last.appendChildInternal(text);
! 						if (!validate)
! 							broker.store(text, currentPath);
! 						text.clear();
! 					   }
! 					}
! 					
  				} else if(charBuf.length() > 0) {
  					// mixed element content: don't normalize the text node, just check

[Exist-commits] eXist-1.0 conf.xml,1.57,1.58

[Giulio V. <gva...@us...>]

Update of /cvsroot/exist/eXist-1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11920

Modified Files:
	conf.xml 
Log Message:
Preserve whitespace inside a mixed content node

Index: conf.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/conf.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** conf.xml	19 Jul 2004 13:07:56 -0000	1.57
--- conf.xml	26 Jul 2004 10:47:56 -0000	1.58
***************
*** 127,134 ****
              retrieving query results or for some types of XPath subexpressions, like
              equality comparisons.
      -->
      <indexer stemming="no" caseSensitive="no" suppress-whitespace="both" 
  	index-depth="1" tokenizer="org.exist.storage.analysis.SimpleTokenizer"
! 	track-term-freq="yes" validation="no">
          
  		<!-- where's the file containing a list of stopwords to be ignored
--- 127,136 ----
              retrieving query results or for some types of XPath subexpressions, like
              equality comparisons.
+         - suppress-whitespace-mixed-content
+             preserve the white space inside a mixed content node
      -->
      <indexer stemming="no" caseSensitive="no" suppress-whitespace="both" 
  	index-depth="1" tokenizer="org.exist.storage.analysis.SimpleTokenizer"
! 	track-term-freq="yes" validation="no" suppress-whitespace-mixed-content="no">
          
  		<!-- where's the file containing a list of stopwords to be ignored

[Exist-commits] eXist-1.0/samples/xinclude xinclude.xml,1.2,1.3

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/samples/xinclude
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27389/samples/xinclude

Modified Files:
	xinclude.xml 
Log Message:
Updated Cocoon to 2.1.5.1

Index: xinclude.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/samples/xinclude/xinclude.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xinclude.xml	4 Sep 2003 10:37:26 -0000	1.2
--- xinclude.xml	23 Jul 2004 18:29:23 -0000	1.3
***************
*** 3,7 ****
      <bookinfo>
          <graphic fileref="/exist/logo.jpg"/>
!         <style href="/exist/default.css"/>
          <title>Open Source XML Database</title>
          <author>
--- 3,7 ----
      <bookinfo>
          <graphic fileref="/exist/logo.jpg"/>
!         <style href="/exist/styles/default-style.css"/>
          <title>Open Source XML Database</title>
          <author>

[Exist-commits] eXist-1.0/lib/endorsed jakarta-bcel-20040329.jar,NONE,1.1 jakarta-regexp-1.3.jar,NONE,1.1

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/lib/endorsed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25403/lib/endorsed

Added Files:
	jakarta-bcel-20040329.jar jakarta-regexp-1.3.jar 
Log Message:
Updated Cocoon to 2.1.5.1

--- NEW FILE: jakarta-bcel-20040329.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jakarta-regexp-1.3.jar ---
(This appears to be a binary file; contents omitted.)