exist-commits — Receive notifications about CVS commits.

[Exist-commits] eXist-1.0/webapp/simple/resources - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/simple/resources added to the repository

[Exist-commits] eXist-1.0/webapp/library/resources - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/library/resources added to the repository

[Exist-commits] eXist-1.0/webapp/library/styles - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/library/styles added to the repository

[Exist-commits] eXist-1.0/webapp/acronyms/styles - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/acronyms/styles added to the repository

[Exist-commits] eXist-1.0/webapp/acronyms/resources - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/acronyms/resources added to the repository

[Exist-commits] eXist-1.0/src/org/exist/util/hashtable SequencedLongHashMap.java,1.2,1.3

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

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

Modified Files:
	SequencedLongHashMap.java 
Log Message:
Removed exception inserted for testing.

Index: SequencedLongHashMap.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/hashtable/SequencedLongHashMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SequencedLongHashMap.java	15 Aug 2004 20:29:10 -0000	1.2
--- SequencedLongHashMap.java	15 Aug 2004 20:53:28 -0000	1.3
***************
*** 78,98 ****
  			duplicate = (Entry)old;
  		} catch (HashtableOverflowException e) {
! 			throw new RuntimeException(e);
! //			long[] copyKeys = keys;
! //			Object[] copyValues = values;
! //			// enlarge the table with a prime value
! //			tabSize = (int) nextPrime(tabSize + tabSize / 2);
! //			keys = new long[tabSize];
! //			values = new Object[tabSize];
! //			items = 0;
! //
! //			try {
! //				for (int k = 0; k < copyValues.length; k++) {
! //					if (copyValues[k] != null && copyValues[k] != REMOVED)
! //						insert(copyKeys[k], copyValues[k]);
! //				}
! //				duplicate = (Entry)insert(key, entry);
! //			} catch (HashtableOverflowException e1) {
! //			}
  		}
  		if(duplicate != null)
--- 78,97 ----
  			duplicate = (Entry)old;
  		} catch (HashtableOverflowException e) {
! 			long[] copyKeys = keys;
! 			Object[] copyValues = values;
! 			// enlarge the table with a prime value
! 			tabSize = (int) nextPrime(tabSize + tabSize / 2);
! 			keys = new long[tabSize];
! 			values = new Object[tabSize];
! 			items = 0;
! 
! 			try {
! 				for (int k = 0; k < copyValues.length; k++) {
! 					if (copyValues[k] != null && copyValues[k] != REMOVED)
! 						insert(copyKeys[k], copyValues[k]);
! 				}
! 				duplicate = (Entry)insert(key, entry);
! 			} catch (HashtableOverflowException e1) {
! 			}
  		}
  		if(duplicate != null)

[Exist-commits] eXist-1.0/src/org/exist/storage/store BFile.java,1.32,1.33 DOMFile.java,1.49,1.50 ItemId.java,1.4,1.5

[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-serv18976/src/org/exist/storage/store

Modified Files:
	BFile.java DOMFile.java ItemId.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: DOMFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/DOMFile.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** DOMFile.java	12 Aug 2004 19:43:00 -0000	1.49
--- DOMFile.java	15 Aug 2004 20:29:10 -0000	1.50
***************
*** 47,52 ****
  import org.exist.storage.cache.Cache;
  import org.exist.storage.cache.Cacheable;
- import org.exist.storage.cache.ClockCache;
- import org.exist.storage.cache.LRDCache;
  import org.exist.storage.cache.LRUCache;
  import org.exist.util.ByteConversion;
--- 47,50 ----
***************
*** 108,115 ****
      public final static short OVERFLOW = 0;
  
!     public final static long DATA_SYNC_PERIOD = 1000;
      
      private final Cache dataCache;
! 
      private DOMFileHeader fileHeader;
  
--- 106,113 ----
      public final static short OVERFLOW = 0;
  
!     public final static long DATA_SYNC_PERIOD = 4200;
      
      private final Cache dataCache;
!     
      private DOMFileHeader fileHeader;
  
***************
*** 129,133 ****
          fileHeader.setPageCount(0);
          fileHeader.setTotalCount(0);
!         dataCache = new LRDCache(dataBuffers);
          dataCache.setFileName("dom.dbx");
          
--- 127,131 ----
          fileHeader.setPageCount(0);
          fileHeader.setTotalCount(0);
!         dataCache = new LRUCache(dataBuffers);
          dataCache.setFileName("dom.dbx");
          
***************
*** 852,867 ****
      }
  
-     public void sync() throws DBException {
-         super.flush();
-         dataCache.flush();
- //        pages.remove(owner);
-         closeDocument();
-         try {
-             if (fileHeader.isDirty()) fileHeader.write();
-         } catch (IOException ioe) {
-             LOG.warn("sync failed", ioe);
-         }
-     }
- 
      public void printStatistics() {
          super.printStatistics();
--- 850,853 ----
***************
*** 1691,1713 ****
          	short vlen;
          	RecordPos rec = null;
              for (int pos = 0; pos < dlen;) {
                  currentId = ByteConversion.byteToShort(data, pos);
!                 if (ItemId.isLink(currentId)) {
!                     if (ItemId.matches(currentId, targetId)) {
                      	rec = new RecordPos(pos + 2, this, currentId);
                      	rec.isLink = true;
-                     	break;
                      } else {
!                         pos += 10;
                      }
!                 } else if (ItemId.matches(currentId, targetId)) {
!                     rec = new RecordPos(pos + 2, this, currentId);
!                     break;
                  } else {
                      vlen = ByteConversion.byteToShort(data, pos + 2);
!                     if (ItemId.isRelocated(currentId)) {
!                         pos += vlen == OVERFLOW ? 20 : vlen + 12;
!                     } else
!                         pos += vlen == OVERFLOW ? 12 : vlen + 4;
                  }
              }
--- 1677,1703 ----
          	short vlen;
          	RecordPos rec = null;
+         	byte flags;
              for (int pos = 0; pos < dlen;) {
                  currentId = ByteConversion.byteToShort(data, pos);
!                 flags = ItemId.getFlags(currentId);
!                 if (ItemId.matches(currentId, targetId)) {
!                 	if ((flags & ItemId.LINK_FLAG) != 0) {
                      	rec = new RecordPos(pos + 2, this, currentId);
                      	rec.isLink = true;
                      } else {
!                     	rec = new RecordPos(pos + 2, this, currentId);
                      }
!                 	break;
!                 } else if ((flags & ItemId.LINK_FLAG) != 0){
!                 	pos += 10;
                  } else {
                      vlen = ByteConversion.byteToShort(data, pos + 2);
!                     if ((flags & ItemId.RELOCATED_FLAG) != 0) {
!                     	pos += vlen + 12;
!                     } else {
!                     	pos += vlen + 4;
!                     }
!                     if(vlen == OVERFLOW)
!                     	pos += 8;
                  }
              }

Index: BFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/BFile.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** BFile.java	12 Aug 2004 18:54:21 -0000	1.32
--- BFile.java	15 Aug 2004 20:29:10 -0000	1.33
***************
*** 40,44 ****
  import org.exist.storage.cache.Cache;
  import org.exist.storage.cache.Cacheable;
! import org.exist.storage.cache.LRDCache;
  import org.exist.storage.io.VariableByteArrayInput;
  import org.exist.storage.io.VariableByteInput;
--- 40,44 ----
  import org.exist.storage.cache.Cache;
  import org.exist.storage.cache.Cacheable;
! import org.exist.storage.cache.LRUCache;
  import org.exist.storage.io.VariableByteArrayInput;
  import org.exist.storage.io.VariableByteInput;
***************
*** 99,103 ****
  
      protected Cache dataCache = null;
! 
      protected Lock lock = null;
  
--- 99,103 ----
  
      protected Cache dataCache = null;
!     
      protected Lock lock = null;
  
***************
*** 107,111 ****
          super(pool, file, btreeBuffers);
          fileHeader = (BFileHeader) getFileHeader();
!         dataCache = new LRDCache(dataBuffers);
          dataCache.setFileName(getFile().getName());
          minFree = PAGE_MIN_FREE;
--- 107,111 ----
          super(pool, file, btreeBuffers);
          fileHeader = (BFileHeader) getFileHeader();
!         dataCache = new LRUCache(dataBuffers);
          dataCache.setFileName(getFile().getName());
          minFree = PAGE_MIN_FREE;
***************
*** 119,123 ****
  	                    dataCache.flush();
  	                } catch (LockException e) {
! 	                    LOG.warn("Failed to acquire lock on dom.dbx");
  	                } finally {
  	                    lock.release();
--- 119,123 ----
  	                    dataCache.flush();
  	                } catch (LockException e) {
! 	                    LOG.warn("Failed to acquire lock on " + getFile().getName());
  	                } finally {
  	                    lock.release();
***************
*** 206,210 ****
                      System.arraycopy(data, offset + 4, newData, 0, l);
                      value.copyTo(newData, l);
!                     p = update(p, page, key, new FixedByteArray(newData));
                  }
                  return p;
--- 206,210 ----
                      System.arraycopy(data, offset + 4, newData, 0, l);
                      value.copyTo(newData, l);
!                     p = update(p, page, key, new FixedByteArray(newData, 0, newData.length));
                  }
                  return p;
***************
*** 742,746 ****
          // save data
          value.copyTo(data, len);
-         //System.arraycopy(value, 0, data, len, vlen);
          len += vlen;
          page.getPageHeader().setDataLength(len);
--- 742,745 ----

Index: ItemId.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/ItemId.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ItemId.java	11 Aug 2004 12:47:01 -0000	1.4
--- ItemId.java	15 Aug 2004 20:29:10 -0000	1.5
***************
*** 37,40 ****
--- 37,47 ----
  	public static final short LINK_OR_RELOCATED_MASK = (short) 0xC000;
  	
+ 	public static final byte LINK_FLAG = (byte) 0x1;
+ 	public static final byte RELOCATED_FLAG = (byte) 0x2;
+ 	
+ 	public final static byte getFlags(short id) {
+ 		return (byte)((id & LINK_OR_RELOCATED_MASK) >>> 14);
+ 	}
+ 	
  	public final static short getId(short id) {
  		return (short) (id & ID_MASK);

[Exist-commits] eXist-1.0/src/org/exist/storage/analysis TextToken.java,1.3,1.4

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

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

Modified Files:
	TextToken.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: TextToken.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/analysis/TextToken.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TextToken.java	14 Apr 2004 12:17:23 -0000	1.3
--- TextToken.java	15 Aug 2004 20:29:10 -0000	1.4
***************
*** 104,107 ****
--- 104,114 ----
      }
  
+     public CharSequence getCharSequence() {
+     	if(start >= tokenText.length() || end > tokenText.length())
+             throw new StringIndexOutOfBoundsException("start: " + start +
+                 "; end=" + end + "; text=" + tokenText);
+         return tokenText.subSequence( start, end );
+     }
+     
      public String getText() {
          if(start >= tokenText.length() || end > tokenText.length())

[Exist-commits] eXist-1.0/src/org/exist/util/hashtable SequencedLongHashMap.java,1.1,1.2 Long2ObjectHashMap.java,1.4,1.5

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

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

Modified Files:
	SequencedLongHashMap.java Long2ObjectHashMap.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: SequencedLongHashMap.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/hashtable/SequencedLongHashMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequencedLongHashMap.java	12 Aug 2004 18:54:20 -0000	1.1
--- SequencedLongHashMap.java	15 Aug 2004 20:29:10 -0000	1.2
***************
*** 32,36 ****
  public class SequencedLongHashMap extends Long2ObjectHashMap {
  
! 	private static class Entry {
  		
  		long key;
--- 32,36 ----
  public class SequencedLongHashMap extends Long2ObjectHashMap {
  
! 	public final static class Entry {
  		
  		long key;
***************
*** 44,47 ****
--- 44,59 ----
  			this.value = value;
  		}
+         
+         public Entry getNext() {
+             return next;
+         }
+         
+         public long getKey() {
+             return key;
+         }
+         
+         public Object getValue() {
+             return value;
+         }
  	}
  	
***************
*** 61,82 ****
  		Entry duplicate = null;
  		try {
! 			duplicate = (Entry)insert(key, entry);
  		} catch (HashtableOverflowException e) {
! 			long[] copyKeys = keys;
! 			Object[] copyValues = values;
! 			// enlarge the table with a prime value
! 			tabSize = (int) nextPrime(tabSize + tabSize / 2);
! 			keys = new long[tabSize];
! 			values = new Object[tabSize];
! 			items = 0;
! 
! 			try {
! 				for (int k = 0; k < copyValues.length; k++) {
! 					if (copyValues[k] != null && copyValues[k] != REMOVED)
! 						insert(copyKeys[k], copyValues[k]);
! 				}
! 				duplicate = (Entry)insert(key, entry);
! 			} catch (HashtableOverflowException e1) {
! 			}
  		}
  		if(duplicate != null)
--- 73,98 ----
  		Entry duplicate = null;
  		try {
! 			Object old = insert(key, entry);
! 			if(old != null && !(old instanceof Entry))
! 				throw new RuntimeException("Found old object: " + old.getClass().getName());
! 			duplicate = (Entry)old;
  		} catch (HashtableOverflowException e) {
! 			throw new RuntimeException(e);
! //			long[] copyKeys = keys;
! //			Object[] copyValues = values;
! //			// enlarge the table with a prime value
! //			tabSize = (int) nextPrime(tabSize + tabSize / 2);
! //			keys = new long[tabSize];
! //			values = new Object[tabSize];
! //			items = 0;
! //
! //			try {
! //				for (int k = 0; k < copyValues.length; k++) {
! //					if (copyValues[k] != null && copyValues[k] != REMOVED)
! //						insert(copyKeys[k], copyValues[k]);
! //				}
! //				duplicate = (Entry)insert(key, entry);
! //			} catch (HashtableOverflowException e1) {
! //			}
  		}
  		if(duplicate != null)
***************
*** 97,100 ****
--- 113,120 ----
  	}
  	
+ 	public Entry getFirstEntry() {
+ 		return first;
+ 	}
+ 	
  	public Object remove(long key) {
  		Entry entry = (Entry) super.remove(key);
***************
*** 122,126 ****
  	}
  	
! 	private void removeEntry(Entry entry) {
  		if(entry.prev == null) {
  			if(entry.next == null) {
--- 142,146 ----
  	}
  	
! 	public void removeEntry(Entry entry) {
  		if(entry.prev == null) {
  			if(entry.next == null) {

Index: Long2ObjectHashMap.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/hashtable/Long2ObjectHashMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Long2ObjectHashMap.java	12 Aug 2004 18:54:20 -0000	1.4
--- Long2ObjectHashMap.java	15 Aug 2004 20:29:10 -0000	1.5
***************
*** 167,172 ****
  		for (int i = 0; i < tabSize; i++) {
  			idx = (idx + rehashVal) % tabSize;
!             if(values[idx] == REMOVED && bucket == -1) {
!                 bucket = idx;
  			} else if (values[idx] == null) {
                  if(bucket > -1) {
--- 167,173 ----
  		for (int i = 0; i < tabSize; i++) {
  			idx = (idx + rehashVal) % tabSize;
!             if(values[idx] == REMOVED) {
!             	if(bucket == -1)
!             		bucket = idx;
  			} else if (values[idx] == null) {
                  if(bucket > -1) {

[Exist-commits] eXist-1.0/src/org/exist/storage NativeTextEngine.java,1.68,1.69 NativeBroker.java,1.98,1.99

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

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

Modified Files:
	NativeTextEngine.java NativeBroker.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** NativeBroker.java	12 Aug 2004 18:54:22 -0000	1.98
--- NativeBroker.java	15 Aug 2004 20:29:09 -0000	1.99
***************
*** 198,202 ****
  				} else {
  					indexBuffers = buffers * 4;
! 					dataBuffers = buffers * 8;
  				}
  				LOG.debug("page buffer size = " + indexBuffers + "; " + dataBuffers);
--- 198,202 ----
  				} else {
  					indexBuffers = buffers * 4;
! 					dataBuffers = buffers * 4;
  				}
  				LOG.debug("page buffer size = " + indexBuffers + "; " + dataBuffers);

Index: NativeTextEngine.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeTextEngine.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** NativeTextEngine.java	11 Aug 2004 12:47:02 -0000	1.68
--- NativeTextEngine.java	15 Aug 2004 20:29:09 -0000	1.69
***************
*** 120,124 ****
  		if ((indexBuffers = config.getInteger("db-connection.words.buffers")) < 0) {
  			indexBuffers = buffers * 14;
! 			dataBuffers = buffers * 12;
  		} else
  			dataBuffers = indexBuffers;
--- 120,124 ----
  		if ((indexBuffers = config.getInteger("db-connection.words.buffers")) < 0) {
  			indexBuffers = buffers * 14;
! 			dataBuffers = buffers * 16;
  		} else
  			dataBuffers = indexBuffers;
***************
*** 733,737 ****
  		tokenizer.setText(text.getXMLString().transformToLower());
  		TextToken token;
! 		String word;
  		final long gid = text.getGID();
  		if (onetoken == true) {
--- 733,737 ----
  		tokenizer.setText(text.getXMLString().transformToLower());
  		TextToken token;
! 		CharSequence word;
  		final long gid = text.getGID();
  		if (onetoken == true) {
***************
*** 745,749 ****
  				continue;
  			}
! 			word = token.getText();
  			if (stoplist.contains(word) || word.length() > 1024) {
  				continue;
--- 745,750 ----
  				continue;
  			}
! 			word = token.getCharSequence();
! //			word = token.getText();
  			if (stoplist.contains(word) || word.length() > 1024) {
  				continue;
***************
*** 793,802 ****
  		}
  
! 		public void addText(String word, long gid) {
  			TermFrequencyList buf = (TermFrequencyList) words[0].get(word);
  			if (buf == null) {
  				buf = new TermFrequencyList();
  				buf.add(gid);
! 				words[0].put(word, buf);
  			} else if (buf.getLast() == gid) {
  				buf.incLastTerm();
--- 794,803 ----
  		}
  
! 		public void addText(CharSequence word, long gid) {
  			TermFrequencyList buf = (TermFrequencyList) words[0].get(word);
  			if (buf == null) {
  				buf = new TermFrequencyList();
  				buf.add(gid);
! 				words[0].put(word.toString(), buf);
  			} else if (buf.getLast() == gid) {
  				buf.incLastTerm();

[Exist-commits] eXist-1.0/src/org/exist/storage/cache LRUCache.java,1.5,1.6 LRDCache.java,1.7,1.8 GClockCache.java,1.13,1.14

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

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

Modified Files:
	LRUCache.java LRDCache.java GClockCache.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: GClockCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/cache/GClockCache.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GClockCache.java	21 Jun 2004 15:27:36 -0000	1.13
--- GClockCache.java	15 Aug 2004 20:29:09 -0000	1.14
***************
*** 46,49 ****
--- 46,50 ----
  	protected int size;
  	protected Long2ObjectHashMap map;
+ 	protected int used = 0;
  	protected int hits = 0 ;
  	protected int fails = 0 ;
***************
*** 69,74 ****
  			items[count++] = item;
  			map.put(item.getKey(), item);
! 		} else
  			removeOne(item);
  	}
  
--- 70,77 ----
  			items[count++] = item;
  			map.put(item.getKey(), item);
! 			used++;
! 		} else {
  			removeOne(item);
+ 		}
  	}
  
***************
*** 94,97 ****
--- 97,101 ----
  			if (items[i] != null && items[i].getKey() == key) {
  				items[i] = null;
+ 				used--;
  				return;
  			}
***************
*** 139,142 ****
--- 143,148 ----
  					map.remove(old.getKey());
  					old.sync();
+ 				} else {
+ 					used++;
  				}
  				items[bucket] = item;
***************
*** 153,157 ****
  
  	public int getUsedBuffers() {
! 		return count;
  	}
  
--- 159,163 ----
  
  	public int getUsedBuffers() {
! 		return used;
  	}
  

Index: LRDCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/cache/LRDCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LRDCache.java	3 Aug 2004 15:25:59 -0000	1.7
--- LRDCache.java	15 Aug 2004 20:29:09 -0000	1.8
***************
*** 52,57 ****
  	public LRDCache(int size) {
  		super(size);
! 		maxReferences = size * 1000;
! 		ageingPeriod = size * 500;
  	}
  
--- 52,57 ----
  	public LRDCache(int size) {
  		super(size);
! 		maxReferences = size * 10000;
! 		ageingPeriod = size * 5000;
  	}
  
***************
*** 74,77 ****
--- 74,78 ----
  				items[count++] = item;
  				map.put(item.getKey(), item);
+ 				used++;
  			} else
  				removeOne(item);
***************
*** 111,114 ****
--- 112,117 ----
  			map.remove(old.getKey());
  			old.sync();
+ 		} else {
+ 			used++;
  		}
  		items[bucket] = item;
***************
*** 143,155 ****
  	protected void cleanup() {
  		Cacheable item;
! 		totalReferences = 0;
  		for(int i = 0; i < count; i++) {
  			item = items[i];
  			if(item != null) {
  				item.setReferenceCount(1);
! 				item.setTimestamp(totalReferences++);
  			}
  		}
! 		LOG.debug("total references: " + totalReferences);
  		nextCleanup = totalReferences + ageingPeriod;
  	}
--- 146,159 ----
  	protected void cleanup() {
  		Cacheable item;
! 		LOG.debug("totalReferences = " + totalReferences + "; maxReferences = " + maxReferences);
! 		totalReferences = count;
  		for(int i = 0; i < count; i++) {
  			item = items[i];
  			if(item != null) {
  				item.setReferenceCount(1);
! 				item.setTimestamp(1);
  			}
  		}
! 		LOG.debug(fileName + " total references: " + totalReferences);
  		nextCleanup = totalReferences + ageingPeriod;
  	}

Index: LRUCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/cache/LRUCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LRUCache.java	12 Aug 2004 18:54:19 -0000	1.5
--- LRUCache.java	15 Aug 2004 20:29:09 -0000	1.6
***************
*** 23,30 ****
  package org.exist.storage.cache;
  
- import java.util.Iterator;
- import java.util.LinkedList;
- 
- import org.exist.util.hashtable.Long2ObjectHashMap;
  import org.exist.util.hashtable.SequencedLongHashMap;
  
--- 23,26 ----
***************
*** 40,43 ****
--- 36,41 ----
  	private int misses = 0;
  	
+ 	private String fileName = null;;
+ 	
  	public LRUCache(int size) {
  		this.max = size;
***************
*** 92,99 ****
  	 */
  	public void flush() {
! 		Cacheable next;
! 		for(Iterator i = map.valueIterator(); i.hasNext(); ) {
! 			next = (Cacheable)i.next();
! 			next.sync();
  		}
  	}
--- 90,101 ----
  	 */
  	public void flush() {
! 		Cacheable cacheable;
! 		SequencedLongHashMap.Entry next = map.getFirstEntry();
! 		while(next != null) {
! 			cacheable = (Cacheable)next.getValue();
! 			if(cacheable.isDirty()) {
! 				cacheable.sync();
! 			}
! 			next = next.getNext();
  		}
  	}
***************
*** 104,113 ****
       */
      public boolean hasDirtyItems() {
!         Cacheable next;
! 		for(Iterator i = map.valueIterator(); i.hasNext(); ) {
! 			next = (Cacheable)i.next();
! 			if(next.isDirty())
! 			    return true;
! 		}
  		return false;
      }
--- 106,117 ----
       */
      public boolean hasDirtyItems() {
!         Cacheable cacheable;
!         SequencedLongHashMap.Entry next = map.getFirstEntry();
!         while(next != null) {
!         	cacheable = (Cacheable)next.getValue();
!         	if(cacheable.isDirty())
!         		return true;
!         	next = next.getNext();
!         }
  		return false;
      }
***************
*** 145,159 ****
  	 */
  	public void setFileName(String fileName) {
  	}
  	
  	private final void removeOne(Cacheable item) {
  		boolean removed = false;
  		do {
! 			Cacheable cached = (Cacheable)map.removeFirst();
  			if(cached.allowUnload() && cached.getKey() != item.getKey()) {
  				cached.sync();
  				removed = true;
  			} else {
! 				map.put(cached.getKey(), cached);
  			}
  		} while(!removed);
--- 149,170 ----
  	 */
  	public void setFileName(String fileName) {
+ 		this.fileName = fileName;
  	}
  	
  	private final void removeOne(Cacheable item) {
  		boolean removed = false;
+ 		SequencedLongHashMap.Entry next = map.getFirstEntry();
  		do {
! 			Cacheable cached = (Cacheable)next.getValue();
  			if(cached.allowUnload() && cached.getKey() != item.getKey()) {
  				cached.sync();
+ 				map.remove(next.getKey());
  				removed = true;
  			} else {
! 				next = next.getNext();
! 				if(next == null) {
! 					LOG.debug("Unable to remove entry");
! 					next = map.getFirstEntry();
! 				}
  			}
  		} while(!removed);

[Exist-commits] eXist-1.0/src/org/exist/util XMLString.java,1.9,1.10 FixedByteArray.java,1.2,1.3

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

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

Modified Files:
	XMLString.java FixedByteArray.java 
Log Message:
Fixed class LRUCache. LRUCache is now used for the data pages in DOMFile + BFile. LRU seems to be a better strategy for the data pages than
LRD. It produces less page failures.

Index: FixedByteArray.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/FixedByteArray.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FixedByteArray.java	10 May 2004 11:22:40 -0000	1.2
--- FixedByteArray.java	15 Aug 2004 20:29:09 -0000	1.3
***************
*** 9,15 ****
  
  	private byte[] data;
  	
! 	public FixedByteArray(byte[] data) {
  		this.data = data;
  	}
  
--- 9,19 ----
  
  	private byte[] data;
+ 	private int start;
+ 	private int len;
  	
! 	public FixedByteArray(byte[] data, int start, int len) {
  		this.data = data;
+ 		this.start = start;
+ 		this.len = len;
  	}
  
***************
*** 25,29 ****
  	 */
  	public void copyTo(byte[] b, int offset, int length) {
! 		System.arraycopy(data, 0, b, offset, length);
  	}
  
--- 29,33 ----
  	 */
  	public void copyTo(byte[] b, int offset, int length) {
! 		System.arraycopy(data, start, b, offset, length);
  	}
  
***************
*** 32,36 ****
  	 */
  	public void copyTo(byte[] b, int offset) {
! 		System.arraycopy(data, 0, b, offset, data.length);
  	}
  
--- 36,40 ----
  	 */
  	public void copyTo(byte[] b, int offset) {
! 		System.arraycopy(data, start, b, offset, len);
  	}
  
***************
*** 38,47 ****
  	 * @see org.exist.util.ByteArray#copyTo(int, byte[], int, int)
  	 */
! 	public void copyTo(int start, byte[] newBuf, int offset, int len) {
! 		System.arraycopy(data, start, newBuf, offset, len);
  	}
  
  	public void copyTo(ByteArray other) {
! 	    other.append(data, 0, data.length);
  	}
  	
--- 42,51 ----
  	 * @see org.exist.util.ByteArray#copyTo(int, byte[], int, int)
  	 */
! 	public void copyTo(int startOffset, byte[] newBuf, int offset, int count) {
! 		System.arraycopy(data, start + startOffset, newBuf, offset, count);
  	}
  
  	public void copyTo(ByteArray other) {
! 	    other.append(data, start, len);
  	}
  	
***************
*** 71,75 ****
  	 */
  	public int size() {
! 		return data.length;
  	}
  
--- 75,79 ----
  	 */
  	public int size() {
! 		return len;
  	}
  

Index: XMLString.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/XMLString.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XMLString.java	27 Apr 2004 15:46:57 -0000	1.9
--- XMLString.java	15 Aug 2004 20:29:09 -0000	1.10
***************
*** 198,202 ****
  	 */
  	public final CharSequence subSequence(int start, int end) {
! 		return new String(value_, start_ + start, end - start);
  	}
  
--- 198,202 ----
  	 */
  	public final CharSequence subSequence(int start, int end) {
! 		return new XMLString(value_, start_ + start, end - start);
  	}
  

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

[Jean-Marc V. <jm...@us...>]

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

Added Files:
	applications.xml 
Log Message:
List of applications built with eXist


--- NEW FILE: applications.xml ---
<applications>
 <application open-source='yes'>
   <name>Botanical Database</name>
   <domain>biology, taxonomy, botany</domain>
   <description> Search engine for Flora of China descriptions.
     Aims at being a computer-aided identification tool for specimens.
   </description>
   <author>J.M. Vanel - http://jmvanel.free.fr/ </author>
   <production-site> http://jmvanel.free.fr/protea.html</production-site>
   <dev-site> http://wwbota.free.fr/</dev-site>
   <dev-notes> XSP pages, XSLT styles, java classes interpretating user input and generating XQuery </dev-notes>
   <institution> Worldwide Botanical Knowledge </institution>
 </application>
</applications>

[Exist-commits] eXist-1.0/webapp/apps - New directory

[Jean-Marc V. <jm...@us...>]

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/webapp/apps added to the repository

[Exist-commits] eXist-1.0/src/org/exist/xquery/value AbstractSequence.java,1.6,1.7

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

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

Modified Files:
	AbstractSequence.java 
Log Message:
Allow arrays to be passed to Java methods from XQuery.

Index: AbstractSequence.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/AbstractSequence.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractSequence.java	13 Aug 2004 21:28:48 -0000	1.6
--- AbstractSequence.java	14 Aug 2004 09:45:46 -0000	1.7
***************
*** 156,177 ****
  				Item item = i.nextItem();
  				Object obj = item.toJavaObject(componentType);
! 				if(target == double.class)
! 					Array.setDouble(array, index, ((Double)obj).doubleValue());
! 				else if(target == float.class)
! 					Array.setFloat(array, index, ((Float)obj).intValue());
! 				else if(target == long.class)
! 					Array.setLong(array, index, ((Long)obj).intValue());
! 				else if(target == int.class)
! 					Array.setInt(array, index, ((Integer)obj).intValue());
! 				else if(target == short.class)
! 					Array.setShort(array, index, ((Short)obj).shortValue());
! 				else if(target == byte.class)
! 					Array.setByte(array, index, ((Byte)obj).byteValue());
! 				else if(target == boolean.class)
! 					Array.setBoolean(array, index, ((Boolean)obj).booleanValue());
! 				else if(target == char.class)
! 					Array.setChar(array, index, ((Character)obj).charValue());
! 				else
! 					Array.set(array, index, obj);
  			}
  			return array;
--- 156,160 ----
  				Item item = i.nextItem();
  				Object obj = item.toJavaObject(componentType);
! 				Array.set(array, index, obj);
  			}
  			return array;

[Exist-commits] eXist-1.0/src/org/exist/xquery/functions/util EvalFunction.java,1.5,1.6

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

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

Modified Files:
	EvalFunction.java 
Log Message:
Allow arrays to be passed to Java methods from XQuery.

Index: EvalFunction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/EvalFunction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EvalFunction.java	21 Jun 2004 15:27:39 -0000	1.5
--- EvalFunction.java	13 Aug 2004 21:28:48 -0000	1.6
***************
*** 86,92 ****
  		throws XPathException {
          // get the query expression
! 		String expr = StringValue.expand(
! 			getArgument(0).eval(contextSequence, contextItem).getStringValue()
! 		);
          // check optional collection argument
          DocumentSet oldDocumentSet = null;
--- 86,90 ----
  		throws XPathException {
          // get the query expression
! 		String expr = getArgument(0).eval(contextSequence, contextItem).getStringValue();
          // check optional collection argument
          DocumentSet oldDocumentSet = null;

[Exist-commits] eXist-1.0/src/org/exist/xquery JavaCall.java,1.3,1.4

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

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

Modified Files:
	JavaCall.java 
Log Message:
Allow arrays to be passed to Java methods from XQuery.

Index: JavaCall.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/JavaCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JavaCall.java	28 May 2004 10:54:12 -0000	1.3
--- JavaCall.java	13 Aug 2004 21:28:48 -0000	1.4
***************
*** 173,177 ****
  			}
  		}
! //		LOG.debug("calling method " + bestMethod.toString());
  		Class paramTypes[] = null;
  		boolean isStatic = true;
--- 173,177 ----
  			}
  		}
! 		LOG.debug("calling method " + bestMethod.toString());
  		Class paramTypes[] = null;
  		boolean isStatic = true;

[Exist-commits] eXist-1.0/src/org/exist/xquery/value AbstractSequence.java,1.5,1.6

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

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

Modified Files:
	AbstractSequence.java 
Log Message:
Allow arrays to be passed to Java methods from XQuery.

Index: AbstractSequence.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/AbstractSequence.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractSequence.java	2 Jun 2004 11:34:34 -0000	1.5
--- AbstractSequence.java	13 Aug 2004 21:28:48 -0000	1.6
***************
*** 21,24 ****
--- 21,25 ----
  package org.exist.xquery.value;
  
+ import java.lang.reflect.Array;
  import java.util.ArrayList;
  import java.util.List;
***************
*** 129,133 ****
  		if(javaClass.isAssignableFrom(Sequence.class))
  			return 0;
! 		else if(javaClass.isAssignableFrom(List.class))
  			return 1;
  		else if(javaClass == Object.class)
--- 130,134 ----
  		if(javaClass.isAssignableFrom(Sequence.class))
  			return 0;
! 		else if(javaClass.isAssignableFrom(List.class) || javaClass.isArray())
  			return 1;
  		else if(javaClass == Object.class)
***************
*** 144,150 ****
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
! 		if(target.isAssignableFrom(Sequence.class))
  			return this;
! 		else if(target.isAssignableFrom(List.class)) {
  			List l = new ArrayList(getLength());
  			for(SequenceIterator i = iterate(); i.hasNext(); ) {
--- 145,180 ----
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
! 		if(target.isAssignableFrom(Sequence.class)) {
  			return this;
! 		} else if(target.isArray()) {
! 			Class componentType = target.getComponentType();
! 			// assume single-dimensional, then double-check that instance really matches desired type
! 			Object array = Array.newInstance(componentType, getLength());
! 			if (!target.isInstance(array)) return null;
! 			int index = 0;
! 			for(SequenceIterator i = iterate(); i.hasNext(); index++) {
! 				Item item = i.nextItem();
! 				Object obj = item.toJavaObject(componentType);
! 				if(target == double.class)
! 					Array.setDouble(array, index, ((Double)obj).doubleValue());
! 				else if(target == float.class)
! 					Array.setFloat(array, index, ((Float)obj).intValue());
! 				else if(target == long.class)
! 					Array.setLong(array, index, ((Long)obj).intValue());
! 				else if(target == int.class)
! 					Array.setInt(array, index, ((Integer)obj).intValue());
! 				else if(target == short.class)
! 					Array.setShort(array, index, ((Short)obj).shortValue());
! 				else if(target == byte.class)
! 					Array.setByte(array, index, ((Byte)obj).byteValue());
! 				else if(target == boolean.class)
! 					Array.setBoolean(array, index, ((Boolean)obj).booleanValue());
! 				else if(target == char.class)
! 					Array.setChar(array, index, ((Character)obj).charValue());
! 				else
! 					Array.set(array, index, obj);
! 			}
! 			return array;
! 		} else if(target.isAssignableFrom(List.class)) {
  			List l = new ArrayList(getLength());
  			for(SequenceIterator i = iterate(); i.hasNext(); ) {

[Exist-commits] eXist-1.0/src/org/exist/xquery/functions ExtFulltext.java,1.5,1.6

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

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

Modified Files:
	ExtFulltext.java 
Log Message:
Allow arrays to be passed to Java methods from XQuery.

Index: ExtFulltext.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/ExtFulltext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExtFulltext.java	28 May 2004 10:54:09 -0000	1.5
--- ExtFulltext.java	13 Aug 2004 21:28:47 -0000	1.6
***************
*** 205,227 ****
  		if (terms == null)
  			throw new RuntimeException("no search terms");
! 			NodeSet hits[] = new NodeSet[terms.length];
! 			for (int k = 0; k < terms.length; k++) {
! 				hits[k] =
! 					context.getBroker().getTextEngine().getNodesContaining(
! 					    context,
  						contextSet.getDocumentSet(),
  						contextSet,
  						terms[k]);
  			}
! 			NodeSet result = hits[0];
! 			if(result != null) {
! 				for(int k = 1; k < hits.length; k++) {
! 					if(hits[k] != null)
! 						result = (type == Constants.FULLTEXT_AND ? 
! 								result.deepIntersection(hits[k]) : result.union(hits[k]));
! 				}
! 				return result;
! 			} else
! 				return NodeSet.EMPTY_SET;
  	}
  
--- 205,229 ----
  		if (terms == null)
  			throw new RuntimeException("no search terms");
! 		if(terms.length == 0)
! 			return NodeSet.EMPTY_SET;
! 		NodeSet hits[] = new NodeSet[terms.length];
! 		for (int k = 0; k < terms.length; k++) {
! 			hits[k] =
! 				context.getBroker().getTextEngine().getNodesContaining(
! 						context,
  						contextSet.getDocumentSet(),
  						contextSet,
  						terms[k]);
+ 		}
+ 		NodeSet result = hits[0];
+ 		if(result != null) {
+ 			for(int k = 1; k < hits.length; k++) {
+ 				if(hits[k] != null)
+ 					result = (type == Constants.FULLTEXT_AND ? 
+ 							result.deepIntersection(hits[k]) : result.union(hits[k]));
  			}
! 			return result;
! 		} else
! 			return NodeSet.EMPTY_SET;
  	}
  

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

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

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

Modified Files:
	sidebar.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/simple/sidebar.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sidebar.xml	27 Jul 2004 12:15:01 -0000	1.10
--- sidebar.xml	13 Aug 2004 19:10:01 -0000	1.11
***************
*** 1,13 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <group href="../index.xml" name="Home"/>
!     <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>
--- 1,17 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <toolbar>
!         <link href="index.xml">Home</link>
!         <link href="index.xml#download">Download</link>
!         <link href="http://wiki.exist-db.org">Wiki</link>
!         <link href="examples.xml">Demo</link>
!     </toolbar>
! 
      <group name="About Us">
          <item>
!             <link href="../credits.xml">Who we are</link>
          </item>
!     </group>
!     <group name="Documentation">
          <item id="features">
              <link href="../facts.xml">Feature Sheet</link>
***************
*** 17,74 ****
          </item>
          <item>
!             <img src="../resources/new.gif" border="0"/><link
!                 href="../xquery.xml">XQuery Docs</link>
!         </item>
!         <item>
!             <link href="../devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="../client.xml">Java Admin Client</link>
!         </item>
!         <item>
!             <link href="../deployment.xml">Deployment</link>
!         </item>
!         <item>
!             <link href="../security.xml">Security</link>
!         </item>
! 		<item>
!             <link href="../xinclude.xml">XInclude</link>
! 		</item>
!         <item>
!             <link href="../configuration.xml">Server Configuration</link>
!         </item>
!         <item>
!             <link href="../ant-tasks.xml">Ant Tasks</link>
!         </item>
!         <item>
!             <link href="../index.xml#articles">Articles</link>
!         </item>
!         <item>
!             <link href="../api/index.html">Javadocs</link>
!         </item>
!         <item>
!             <link href="../changes.xml">Changes</link>
!         </item>
!         <item>
!             <link href="../performance.xml">Performance Issues</link>
!         </item>
!         <item>
!             <link href="../howtos.xml">Misc HowTos</link>
          </item>
-         <!--item>
-             <link href="design.xml">Design</link>
-         </item-->
      </group>
-     <group name="Community">
-         <item>
-         	<link href="../index.xml#mailing">Mailing List / IRC</link>
-         </item>
-         <item>
-         	<link href="http://wiki.exist-db.org">Wiki</link>
-         </item>
- 	</group>
      <group name="Examples">
          <item>
-             <img src="../resources/new.gif" border="0"/>
              <link href="../examples.xml">All Examples</link>
          </item>
--- 21,29 ----
          </item>
          <item>
!             <link href="../documentation.xml">Main Documentation</link>
          </item>
      </group>
      <group name="Examples">
          <item>
              <link href="../examples.xml">All Examples</link>
          </item>
***************
*** 89,95 ****
          </item> 
      </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 44,63 ----
          </item> 
      </group>
+     <group name="Development">
+         <item>
+             <link href="http://wiki.exist-db.org/space/Roadmap">Roadmap</link>
+         </item>
+         <item>
+             <link href="../api/index.html">Javadocs</link>
+         </item>
+         <item>
+             <link href="http://sourceforge.net/tracker/?group_id=17691&amp;atid=117691">
+                 Bug Tracker
+             </link>
+         </item>
+     </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin</link>
          </item>
          <item>
***************
*** 99,109 ****
      
      <banner>
!         <item>
!             <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="../resources/powered.gif"/></link>
! 		</item>
      </banner>
      
  	<banner name="" empty="true">
!       <item><link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link></item>
    </banner>
  </sidebar>
--- 67,75 ----
      
      <banner>
!         <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="resources/powered.gif"/></link>
      </banner>
      
  	<banner name="" empty="true">
!         <link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link>
    </banner>
  </sidebar>

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

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

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

Modified Files:
	sidebar.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/library/sidebar.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sidebar.xml	27 Jul 2004 12:15:01 -0000	1.11
--- sidebar.xml	13 Aug 2004 19:10:01 -0000	1.12
***************
*** 1,10 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <group href="../index.xml" name="Home"/>
!     <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>
--- 1,14 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <toolbar>
!         <link href="index.xml">Home</link>
!         <link href="index.xml#download">Download</link>
!         <link href="http://wiki.exist-db.org">Wiki</link>
!         <link href="examples.xml">Demo</link>
!     </toolbar>
! 
      <group name="About Us">
          <item>
!             <link href="../credits.xml">Who we are</link>
          </item>
      </group>
***************
*** 17,74 ****
          </item>
          <item>
!             <img src="../resources/new.gif" border="0"/><link
!                 href="../xquery.xml">XQuery Docs</link>
!         </item>
!         <item>
!             <link href="../devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="../client.xml">Java Admin Client</link>
!         </item>
!         <item>
!             <link href="../deployment.xml">Deployment</link>
!         </item>
!         <item>
!             <link href="../security.xml">Security</link>
!         </item>
! 		<item>
!             <link href="../xinclude.xml">XInclude</link>
! 		</item>
!         <item>
!             <link href="../configuration.xml">Server Configuration</link>
!         </item>
!         <item>
!             <link href="../ant-tasks.xml">Ant Tasks</link>
!         </item>
!         <item>
!             <link href="../index.xml#articles">Articles</link>
!         </item>
!         <item>
!             <link href="../api/index.html">Javadocs</link>
!         </item>
!         <item>
!             <link href="../changes.xml">Changes</link>
!         </item>
!         <item>
!             <link href="../performance.xml">Performance Issues</link>
!         </item>
!         <item>
!             <link href="../howtos.xml">Misc HowTos</link>
          </item>
-         <!--item>
-             <link href="design.xml">Design</link>
-         </item-->
      </group>
-     <group name="Community">
-         <item>
-         	<link href="../index.xml#mailing">Mailing List / IRC</link>
-         </item>
-         <item>
-         	<link href="http://wiki.exist-db.org">Wiki</link>
-         </item>
- 	</group>
      <group name="Examples">
          <item>
-             <img src="../resources/new.gif" border="0"/>
              <link href="../examples.xml">All Examples</link>
          </item>
--- 21,29 ----
          </item>
          <item>
!             <link href="../documentation.xml">Main Documentation</link>
          </item>
      </group>
      <group name="Examples">
          <item>
              <link href="../examples.xml">All Examples</link>
          </item>
***************
*** 89,95 ****
          </item> 
      </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 44,63 ----
          </item> 
      </group>
+     <group name="Development">
+         <item>
+             <link href="http://wiki.exist-db.org/space/Roadmap">Roadmap</link>
+         </item>
+         <item>
+             <link href="../api/index.html">Javadocs</link>
+         </item>
+         <item>
+             <link href="http://sourceforge.net/tracker/?group_id=17691&amp;atid=117691">
+                 Bug Tracker
+             </link>
+         </item>
+     </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin</link>
          </item>
          <item>
***************
*** 99,109 ****
      
      <banner>
!         <item>
!             <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="../resources/powered.gif"/></link>
! 		</item>
      </banner>
      
  	<banner name="" empty="true">
!       <item><link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link></item>
    </banner>
  </sidebar>
--- 67,75 ----
      
      <banner>
!         <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="resources/powered.gif"/></link>
      </banner>
      
  	<banner name="" empty="true">
!         <link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link>
    </banner>
  </sidebar>

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

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

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

Modified Files:
	sidebar.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/acronyms/sidebar.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sidebar.xml	27 Jul 2004 12:15:00 -0000	1.6
--- sidebar.xml	13 Aug 2004 19:10:01 -0000	1.7
***************
*** 1,10 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <group href="../index.xml" name="Home"/>
!     <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>
--- 1,14 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <toolbar>
!         <link href="../index.xml">Home</link>
!         <link href="../index.xml#download">Download</link>
!         <link href="http://wiki.exist-db.org">Wiki</link>
!         <link href="../examples.xml">Demo</link>
!     </toolbar>
! 
      <group name="About Us">
          <item>
!             <link href="../credits.xml">Who we are</link>
          </item>
      </group>
***************
*** 17,74 ****
          </item>
          <item>
!             <img src="../resources/new.gif" border="0"/><link
!                 href="../xquery.xml">XQuery Docs</link>
!         </item>
!         <item>
!             <link href="../devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="../client.xml">Java Admin Client</link>
!         </item>
!         <item>
!             <link href="../deployment.xml">Deployment</link>
!         </item>
!         <item>
!             <link href="../security.xml">Security</link>
!         </item>
! 		<item>
!             <link href="../xinclude.xml">XInclude</link>
! 		</item>
!         <item>
!             <link href="../configuration.xml">Server Configuration</link>
!         </item>
!         <item>
!             <link href="../ant-tasks.xml">Ant Tasks</link>
!         </item>
!         <item>
!             <link href="../index.xml#articles">Articles</link>
!         </item>
!         <item>
!             <link href="../api/index.html">Javadocs</link>
!         </item>
!         <item>
!             <link href="../changes.xml">Changes</link>
!         </item>
!         <item>
!             <link href="../performance.xml">Performance Issues</link>
!         </item>
!         <item>
!             <link href="../howtos.xml">Misc HowTos</link>
          </item>
-         <!--item>
-             <link href="design.xml">Design</link>
-         </item-->
      </group>
-     <group name="Community">
-         <item>
-         	<link href="../index.xml#mailing">Mailing List / IRC</link>
-         </item>
-         <item>
-         	<link href="http://wiki.exist-db.org">Wiki</link>
-         </item>
- 	</group>
      <group name="Examples">
          <item>
-             <img src="../resources/new.gif" border="0"/>
              <link href="../examples.xml">All Examples</link>
          </item>
--- 21,29 ----
          </item>
          <item>
!             <link href="../documentation.xml">Main Documentation</link>
          </item>
      </group>
      <group name="Examples">
          <item>
              <link href="../examples.xml">All Examples</link>
          </item>
***************
*** 89,95 ****
          </item> 
      </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 44,63 ----
          </item> 
      </group>
+     <group name="Development">
+         <item>
+             <link href="http://wiki.exist-db.org/space/Roadmap">Roadmap</link>
+         </item>
+         <item>
+             <link href="../api/index.html">Javadocs</link>
+         </item>
+         <item>
+             <link href="http://sourceforge.net/tracker/?group_id=17691&amp;atid=117691">
+                 Bug Tracker
+             </link>
+         </item>
+     </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin</link>
          </item>
          <item>
***************
*** 99,109 ****
      
      <banner>
!         <item>
!             <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="../resources/powered.gif"/></link>
! 		</item>
      </banner>
      
  	<banner name="" empty="true">
!       <item><link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link></item>
    </banner>
  </sidebar>
--- 67,75 ----
      
      <banner>
!         <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="resources/powered.gif"/></link>
      </banner>
      
  	<banner name="" empty="true">
!         <link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link>
    </banner>
  </sidebar>

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

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

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

Modified Files:
	sidebar.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/examples/sidebar.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sidebar.xml	27 Jul 2004 12:15:01 -0000	1.5
--- sidebar.xml	13 Aug 2004 19:10:01 -0000	1.6
***************
*** 1,9 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <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>
--- 1,14 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
!     <toolbar>
!         <link href="index.xml">Home</link>
!         <link href="index.xml#download">Download</link>
!         <link href="http://wiki.exist-db.org">Wiki</link>
!         <link href="examples.xml">Demo</link>
!     </toolbar>
! 
      <group name="About Us">
          <item>
!             <link href="../credits.xml">Who we are</link>
          </item>
      </group>
***************
*** 16,61 ****
          </item>
          <item>
!             <img src="../resources/new.gif" border="0"/><link
!                 href="../xquery.xml">XQuery Docs</link>
!         </item>
!         <item>
!             <link href="../devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="../client.xml">Java Admin Client</link>
!         </item>
!         <item>
!             <link href="../deployment.xml">Deployment</link>
!         </item>
!         <item>
!             <link href="../security.xml">Security</link>
!         </item>
! 		<item>
!             <link href="../xinclude.xml">XInclude</link>
! 		</item>
!         <item>
!             <link href="../configuration.xml">Server Configuration</link>
!         </item>
!         <item>
!             <link href="../index.xml#articles">Articles</link>
!         </item>
!         <item>
!             <link href="../api/index.html">Javadocs</link>
!         </item>
!         <item>
!             <link href="../changes.xml">Changes</link>
          </item>
      </group>
-     <group name="HowTo">
-         <item>
-             <link href="../performance.xml">Performance HowTo</link>
-         </item>
-         <item>
-             <link href="../howtos.xml">Misc HowTos</link>
-         </item>
- 	</group>
      <group name="Examples">
          <item>
-             <img src="../resources/new.gif" border="0"/>
              <link href="../examples.xml">All Examples</link>
          </item>
--- 21,29 ----
          </item>
          <item>
!             <link href="../documentation.xml">Main Documentation</link>
          </item>
      </group>
      <group name="Examples">
          <item>
              <link href="../examples.xml">All Examples</link>
          </item>
***************
*** 64,71 ****
          </item>
          <item>
!             <link href="../xquery/biblio.xq">Library</link>
          </item>
          <item>
-             <img src="../resources/new.gif" border="0"/>
              <link href="../xquery/xquery.xq">Basic XQuery Interface</link>
          </item>
--- 32,38 ----
          </item>
          <item>
!             <link href="../xquery/biblio.xml">Library</link>
          </item>
          <item>
              <link href="../xquery/xquery.xq">Basic XQuery Interface</link>
          </item>
***************
*** 77,83 ****
          </item> 
      </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 44,63 ----
          </item> 
      </group>
+     <group name="Development">
+         <item>
+             <link href="http://wiki.exist-db.org/space/Roadmap">Roadmap</link>
+         </item>
+         <item>
+             <link href="../api/index.html">Javadocs</link>
+         </item>
+         <item>
+             <link href="http://sourceforge.net/tracker/?group_id=17691&amp;atid=117691">
+                 Bug Tracker
+             </link>
+         </item>
+     </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin</link>
          </item>
          <item>
***************
*** 87,97 ****
      
      <banner>
!         <item>
!             <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="../resources/powered.gif"/></link>
! 		</item>
      </banner>
      
  	<banner name="" empty="true">
!       <item><link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link></item>
    </banner>
  </sidebar>
--- 67,75 ----
      
      <banner>
!         <link href="http://exist-db.org"><img alt="powered by eXist" border="0" src="resources/powered.gif"/></link>
      </banner>
      
  	<banner name="" empty="true">
!         <link href="http://sourceforge.net/projects/exist"><img src="http://sourceforge.net/sflogo.php?group_id=17691&amp;type=4" width="125" height="37" border="0" alt="SourceForge Logo"/></link>
    </banner>
  </sidebar>

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

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

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

Modified Files:
	sidebar.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/sidebar.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sidebar.xml	27 Jul 2004 12:15:02 -0000	1.10
--- sidebar.xml	13 Aug 2004 19:10:01 -0000	1.11
***************
*** 2,61 ****
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
      <toolbar>
! 		<link href="../index.xml">Home</link>
! 		<link href="../index.xml#download">Download</link>
          <link href="http://wiki.exist-db.org">Wiki</link>
! 		<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>
!         </item>
!         <item>
! 			<link href="../quickstart.xml">Quick Start</link>
!         </item>
!         <item>
! 			<link href="../xquery.xml">XQuery Docs <img src="resources/new.gif" border="0"/></link>
!         </item>
!         <item>
! 			<link href="../devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="../client.xml">Java Admin Client</link>
          </item>
          <item>
! 			<link href="../deployment.xml">Deployment</link>
          </item>
          <item>
! 			<link href="../security.xml">Security</link>
          </item>
! 		<item>
! 			<link href="../xinclude.xml">XInclude</link>
! 		</item>
          <item>
! 			<link href="../configuration.xml">Server Configuration</link>
          </item>
          <item>
! 			<link href="../ant-tasks.xml">Ant Tasks</link>
          </item>
          <item>
! 			<link href="../index.xml#articles">Articles</link>
          </item>
          <item>
! 			<link href="../changes.xml">Changes</link>
          </item>
          <item>
! 			<link href="../performance.xml">Performance Issues</link>
          </item>
          <item>
! 			<link href="../howtos.xml">Misc HowTos</link>
!         </item>
!         <!--item>
!             <link href="design.xml">Design</link>
!         </item-->
      </group>
      <group name="Development">
--- 2,46 ----
  <sidebar title="Navigation" xmlns="http://exist-db.org/NS/sidebar">
      <toolbar>
!         <link href="../index.xml">Home</link>
!         <link href="../index.xml#download">Download</link>
          <link href="http://wiki.exist-db.org">Wiki</link>
!         <link href="../examples.xml">Demo</link>
      </toolbar>
+ 
      <group name="About Us">
          <item>
!             <link href="../credits.xml">Who we are</link>
          </item>
!     </group>
!     <group name="Documentation">
          <item id="features">
!             <link href="../facts.xml">Feature Sheet</link>
          </item>
          <item>
!             <link href="../quickstart.xml">Quick Start</link>
          </item>
          <item>
!             <link href="../documentation.xml">Main Documentation</link>
          </item>
!     </group>
!     <group name="Examples">
          <item>
!             <link href="../examples.xml">All Examples</link>
          </item>
          <item>
!             <link href="acronyms.xq">XML Acronyms</link>
          </item>
          <item>
!             <link href="biblio.xml">Library</link>
          </item>
          <item>
!             <link href="xquery.xq">Basic XQuery Interface</link>
          </item>
          <item>
!             <link href="../xmldb/db/">Cocoon + XML:DB</link>
          </item>
          <item>
!             <link href="../xmldb/db/xinclude/xinclude.xml">XInclude</link>
!         </item> 
      </group>
      <group name="Development">
***************
*** 64,68 ****
          </item>
          <item>
! 			<link href="../api/index.html">Javadocs</link>
          </item>
          <item>
--- 49,53 ----
          </item>
          <item>
!             <link href="../api/index.html">Javadocs</link>
          </item>
          <item>
***************
*** 72,98 ****
          </item>
      </group>
-     <group name="Examples">
-         <item>
- 			<link href="../examples.xml">All Examples <img src="resources/new.gif" border="0"/></link>
-         </item>
-         <item>
- 			<link href="acronyms.xq">XML Acronyms</link>
-         </item>
-         <item>
-             <link href="biblio.xml">Library</link>
-         </item>
-         <item>
-             <link href="xquery.xq">Basic XQuery Interface</link>
-         </item>
-         <item>
- 			<link href="../xmldb/db/">Cocoon + XML:DB</link>
-         </item>
-         <item>
- 			<link href="../xmldb/db/xinclude/xinclude.xml">XInclude</link>
-         </item> 
-     </group>
      <group name="Administration">
          <item>
! 			<link href="../xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 57,63 ----
          </item>
      </group>
      <group name="Administration">
          <item>
!             <link href="../xadmin.xsp">Admin</link>
          </item>
          <item>

[Exist-commits] eXist-1.0/webapp documentation.xml,NONE,1.1 devguide.xml,1.12,1.13 sidebar.xml,1.24,1.25 credits.xml,1.2,1.3

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

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

Modified Files:
	devguide.xml sidebar.xml credits.xml 
Added Files:
	documentation.xml 
Log Message:
Changed web site menues.

Index: sidebar.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/sidebar.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** sidebar.xml	27 Jul 2004 11:58:39 -0000	1.24
--- sidebar.xml	13 Aug 2004 19:10:00 -0000	1.25
***************
*** 10,14 ****
      <group name="About Us">
          <item>
!             <link href="credits.xml">Credits</link>
          </item>
      </group>
--- 10,14 ----
      <group name="About Us">
          <item>
!             <link href="credits.xml">Who we are</link>
          </item>
      </group>
***************
*** 21,62 ****
          </item>
          <item>
!             <link href="xquery.xml">XQuery Docs <img src="resources/new.gif" border="0"/></link>
!         </item>
!         <item>
!             <link href="devguide.xml">Developer's Guide</link>
!         </item>
!         <item>
! 			<link href="client.xml">Java Admin Client</link>
!         </item>
!         <item>
!             <link href="deployment.xml">Deployment</link>
!         </item>
!         <item>
!             <link href="security.xml">Security</link>
          </item>
! 		<item>
!             <link href="xinclude.xml">XInclude</link>
! 		</item>
          <item>
!             <link href="configuration.xml">Server Configuration</link>
          </item>
          <item>
!             <link href="ant-tasks.xml">Ant Tasks</link>
          </item>
          <item>
!             <link href="index.xml#articles">Articles</link>
          </item>
          <item>
!             <link href="changes.xml">Changes</link>
          </item>
          <item>
!             <link href="performance.xml">Performance Issues</link>
          </item>
          <item>
!             <link href="howtos.xml">Misc HowTos</link>
!         </item>
!         <!--item>
!             <link href="design.xml">Design</link>
!         </item-->
      </group>
      <group name="Development">
--- 21,46 ----
          </item>
          <item>
!             <link href="documentation.xml">Main Documentation</link>
          </item>
!     </group>
!     <group name="Examples">
          <item>
!             <link href="examples.xml">All Examples</link>
          </item>
          <item>
!             <link href="xquery/acronyms.xq">XML Acronyms</link>
          </item>
          <item>
!             <link href="xquery/biblio.xml">Library</link>
          </item>
          <item>
!             <link href="xquery/xquery.xq">Basic XQuery Interface</link>
          </item>
          <item>
!             <link href="xmldb/db/">Cocoon + XML:DB</link>
          </item>
          <item>
!             <link href="xmldb/db/xinclude/xinclude.xml">XInclude</link>
!         </item> 
      </group>
      <group name="Development">
***************
*** 73,99 ****
          </item>
      </group>
-     <group name="Examples">
-         <item>
-             <link href="examples.xml">All Examples <img src="resources/new.gif" border="0"/></link>
-         </item>
-         <item>
-             <link href="xquery/acronyms.xq">XML Acronyms</link>
-         </item>
-         <item>
-             <link href="xquery/biblio.xml">Library</link>
-         </item>
-         <item>
-             <link href="xquery/xquery.xq">Basic XQuery Interface</link>
-         </item>
-         <item>
-             <link href="xmldb/db/">Cocoon + XML:DB</link>
-         </item>
-         <item>
-             <link href="xmldb/db/xinclude/xinclude.xml">XInclude</link>
-         </item> 
-     </group>
      <group name="Administration">
          <item>
!             <link href="xadmin.xsp">Admin Interface</link>
          </item>
          <item>
--- 57,63 ----
          </item>
      </group>
      <group name="Administration">
          <item>
!             <link href="xadmin.xsp">Admin</link>
          </item>
          <item>

Index: credits.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/credits.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** credits.xml	27 Jul 2004 12:38:34 -0000	1.2
--- credits.xml	13 Aug 2004 19:10:00 -0000	1.3
***************
*** 21,34 ****
        
      <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>
--- 21,103 ----
        
      <chapter>
! 		<title>Who we are</title>
!         
!         <section>
!             <title>About Us</title>
!             
!             <para>eXist has been founded by Wolfgang Meier (wolfgang at exist-db.org)
!             in late 2000, after reading a bunch of articles about efficient indexing methods 
!             for XML during his summer holiday. The project has been continuously developed
!             since then. Wolfgang is still project leader and the main
!             core developer of eXist.</para> 
!             
!             <para>The original plans have changed quite a bit over time, mostly in response 
!             to user demands. For example, while the main focus 
!             of eXist has been on document-centric documents in the first place, updating 
!             documents via XUpdate has become a major topic recently as more and more data-centric 
!             applications were developed with eXist.</para>
!             
!             <para>Our current focus is to finish the final 1.0 release. There are still
!             some open issues to be solved and we will be happy about any help we can get.
!             </para>
!         </section>
!         
!         <section>
!             <title>Contributing</title>
!             
!             <para>You are welcome to contribute to
!             the future development of eXist. If you would like to get involved, the first step 
!             is to join the <a href="http://sourceforge.net/mail/?group_id=17691">mailing list</a>. 
!             You may also have a look at the 
!             <ulink href="http://wiki.exist-db.org/space/Roadmap">roadmap</ulink> to see
!             the known issues that need to be addressed.</para> 
!             
!             <para>To become an active committer, start to post patches to the 
!             mailing list. You should also read the doc about 
!             <ulink href="http://jmvanel.free.fr/exist/howto-test.html">bug reporting and junit
!             tests</ulink>. You will get write access to the CVS if your patches
!             are ok.</para>
!         </section>
          
          <section>
              <title>Credits</title>
              
!             <para>The following people have contributed to eXist or are active
!             committers (in strict alphabetical order):</para>
!             
!             <unorderedlist>
!                 <listitem>
!                     <para>Timo Boehme</para>
!                 </listitem>
!                 <listitem>
!                     <para>Sebastian Bossung</para>
!                 </listitem>
!                 <listitem>
!                     <para>Igor Abade V. Leite</para>
!                 </listitem>
!                 <listitem>
!                     <para>Piotr Kaminski</para>
!                 </listitem>
!                 <listitem>
!                     <para>Stephan Körnig</para>
!                 </listitem>
!                 <listitem>
!                     <para>Wolfgang Meier</para>
!                 </listitem>
!                 <listitem>
!                     <para>Per Nyfelt</para>
!                 </listitem>
!                 <listitem>
!                     <para>Giulio Valentino</para>
!                 </listitem>
!                 <listitem>
!                     <para>Jean-Marc Vanel</para>
!                 </listitem>
!             </unorderedlist>
!             
!             <para>(probably, some
!             names are missing here, please send a message to Wolfgang to complete
!             this)</para>
!         </section>
      </chapter>
  </book>

Index: devguide.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/devguide.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** devguide.xml	18 May 2004 08:33:55 -0000	1.12
--- devguide.xml	13 Aug 2004 19:10:00 -0000	1.13
***************
*** 749,753 ****
  public class QueryExample {
      public static void main(String args[]) throws Exception {
!         String driver = "exist.xmldb.DatabaseImpl";
          Class cl = Class.forName(driver);			
          Database database = (Database)cl.newInstance();
--- 749,753 ----
  public class QueryExample {
      public static void main(String args[]) throws Exception {
!         String driver = "org.exist.xmldb.DatabaseImpl";
          Class cl = Class.forName(driver);			
          Database database = (Database)cl.newInstance();
***************
*** 798,802 ****
  public class QueryExample {
      public static void main(String args[]) throws Exception {
!         String driver = "exist.xmldb.DatabaseImpl";
          Class cl = Class.forName(driver);			
          Database database = (Database)cl.newInstance();
--- 798,802 ----
  public class QueryExample {
      public static void main(String args[]) throws Exception {
!         String driver = "org.exist.xmldb.DatabaseImpl";
          Class cl = Class.forName(driver);			
          Database database = (Database)cl.newInstance();

--- NEW FILE: documentation.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 Native 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>Documentation</title>
        
        <unorderedlist>
            <listitem>
                <para><ulink href="xquery.xml">XQuery Docs <img src="resources/new.gif" border="0"/></ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="devguide.xml">Developer's Guide</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="client.xml">Java Admin Client</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="deployment.xml">Deployment</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="security.xml">Security</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="xinclude.xml">XInclude</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="configuration.xml">Server Configuration</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="ant-tasks.xml">Ant Tasks</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="index.xml#articles">Articles</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="changes.xml">Changes</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="performance.xml">Performance Issues</ulink></para>
            </listitem>
            <listitem>
                <para><ulink href="howtos.xml">Misc HowTos</ulink></para>
            </listitem>
        </unorderedlist>
    </chapter>
</book>