exist-commits — Receive notifications about CVS commits.

[Exist-commits] eXist-1.0/src/org/exist/dom NodeImpl.java,1.24,1.25 AVLTreeNodeSet.java,1.6,1.7 ElementImpl.java,1.39,1.40 DocumentImpl.java,1.42,1.43 NamedNode.java,1.1,1.2

[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-serv16641/src/org/exist/dom

Modified Files:
	NodeImpl.java AVLTreeNodeSet.java ElementImpl.java 
	DocumentImpl.java NamedNode.java 
Log Message:
Added copyResource method to DBBroker.

Index: ElementImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ElementImpl.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ElementImpl.java	17 Jun 2004 13:13:03 -0000	1.39
--- ElementImpl.java	21 Jun 2004 15:27:36 -0000	1.40
***************
*** 73,77 ****
  		super(Node.ELEMENT_NODE);
  	}
! 
  	/**
  	 *  Constructor for the ElementImpl object
--- 73,77 ----
  		super(Node.ELEMENT_NODE);
  	}
! 	
  	/**
  	 *  Constructor for the ElementImpl object
***************
*** 117,121 ****
  			namespaceMappings = null;
  	}
! 
  	public static NodeImpl deserialize(
  		byte[] data,
--- 117,121 ----
  			namespaceMappings = null;
  	}
! 	
  	public static NodeImpl deserialize(
  		byte[] data,

Index: NodeImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/NodeImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NodeImpl.java	16 Jun 2004 09:23:48 -0000	1.24
--- NodeImpl.java	21 Jun 2004 15:27:35 -0000	1.25
***************
*** 60,68 ****
  	}
  
- 	public NodeImpl(Node n) {
- 		this(n.getNodeType(), 0);
- 		ownerDocument = (DocumentImpl) n.getOwnerDocument();
- 	}
- 
  	public NodeImpl(long gid) {
  		this((short) 0, gid);
--- 60,63 ----
***************
*** 150,154 ****
  		return this;
  	}
! 
  	/**
  	 * @see java.lang.Object#equals(java.lang.Object)
--- 145,149 ----
  		return this;
  	}
!  
  	/**
  	 * @see java.lang.Object#equals(java.lang.Object)

Index: AVLTreeNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/AVLTreeNodeSet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AVLTreeNodeSet.java	28 May 2004 10:54:14 -0000	1.6
--- AVLTreeNodeSet.java	21 Jun 2004 15:27:36 -0000	1.7
***************
*** 547,551 ****
  
  		NodeProxy data;
! 		Node parent, leftChild, rightChild;
  		int height;
  	}
--- 547,553 ----
  
  		NodeProxy data;
! 		Node parent;
! 		Node leftChild;
! 		Node rightChild;
  		int height;
  	}

Index: DocumentImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/DocumentImpl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** DocumentImpl.java	17 Jun 2004 13:27:45 -0000	1.42
--- DocumentImpl.java	21 Jun 2004 15:27:36 -0000	1.43
***************
*** 96,99 ****
--- 96,101 ----
  	protected int pageCount = 0;
  	
+ //	protected transient int splitCount = 0;
+ 	
  	// number of levels in this DOM tree
  	protected int maxDepth = 0;
***************
*** 184,187 ****
--- 186,194 ----
  	}
  	
+ 	public void copyChildren(DocumentImpl other) {
+ 		childList = other.childList;
+ 		children = other.children;
+ 	}
+ 	
  	/**
  	 * Returns the type of this resource, either  {@link #XML_FILE} or 
***************
*** 909,911 ****
--- 916,930 ----
  	    childList = newChildList;
  	}
+ 	
+ //	public void incSplitCount() {
+ //		splitCount++;
+ //	}
+ //	
+ //	public int getSplitCount() {
+ //		return splitCount;
+ //	}
+ //	
+ //	public void setSplitCount(int count) {
+ //		splitCount = count;
+ //	}
  }

Index: NamedNode.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/NamedNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NamedNode.java	8 Jun 2004 08:16:08 -0000	1.1
--- NamedNode.java	21 Jun 2004 15:27:36 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  package org.exist.dom;
  
+ import org.w3c.dom.DOMException;
  import org.w3c.dom.Node;
  
***************
*** 47,58 ****
  
      /**
-      * @param n
-      */
-     public NamedNode(Node n) {
-         super(n);
-         this.nodeName = ((NodeImpl)n).getQName();
-     }
- 
-     /**
       * @param gid
       */
--- 48,51 ----

[Exist-commits] eXist-1.0/src/org/exist/util PorterStemmer.java,1.2,1.3 MutableStringTokenizer.java,1.1,1.2 Range.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-serv16641/src/org/exist/util

Modified Files:
	PorterStemmer.java MutableStringTokenizer.java Range.java 
Log Message:
Added copyResource method to DBBroker.

Index: Range.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/Range.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Range.java	29 Oct 2003 14:47:04 -0000	1.2
--- Range.java	21 Jun 2004 15:27:35 -0000	1.3
***************
*** 6,10 ****
  public class Range {
  	
! 	private long start_, end_;
  	
  	public Range(long start, long end) {
--- 6,11 ----
  public class Range {
  	
! 	private long start_;
! 	private long end_;
  	
  	public Range(long start, long end) {

Index: MutableStringTokenizer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/MutableStringTokenizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MutableStringTokenizer.java	12 Jun 2003 13:26:05 -0000	1.1
--- MutableStringTokenizer.java	21 Jun 2004 15:27:35 -0000	1.2
***************
*** 9,13 ****
  
  	private CharSequence buf_;
! 	private int pos_ = 0, last_ = 0;
  	private String tokens_;
  	
--- 9,14 ----
  
  	private CharSequence buf_;
! 	private int pos_ = 0 ;
! 	private int last_ = 0 ;
  	private String tokens_;
  	

Index: PorterStemmer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/util/PorterStemmer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PorterStemmer.java	2 Sep 2003 13:20:13 -0000	1.2
--- PorterStemmer.java	21 Jun 2004 15:27:35 -0000	1.3
***************
*** 39,44 ****
  {   
    private char[] b;
!   private int i,    /* offset into b */
!     j, k, k0;
    private boolean dirty = false;
    private static final int INC = 50; /* unit of size whereby b is increased */
--- 39,46 ----
  {   
    private char[] b;
!   private int i;
!   /* offset into b */ private int j;
!   private int k;
!   private int k0;
    private boolean dirty = false;
    private static final int INC = 50; /* unit of size whereby b is increased */

[Exist-commits] eXist-1.0/src/org/exist/storage/cache ClockCache.java,1.16,1.17 GClockCache.java,1.12,1.13

[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-serv16641/src/org/exist/storage/cache

Modified Files:
	ClockCache.java GClockCache.java 
Log Message:
Added copyResource method to DBBroker.

Index: GClockCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/cache/GClockCache.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GClockCache.java	8 Jun 2004 08:16:07 -0000	1.12
--- GClockCache.java	21 Jun 2004 15:27:36 -0000	1.13
***************
*** 46,50 ****
  	protected int size;
  	protected Long2ObjectHashMap map;
! 	protected int hits = 0, fails = 0;
  	
  	public GClockCache(int size) {
--- 46,51 ----
  	protected int size;
  	protected Long2ObjectHashMap map;
! 	protected int hits = 0 ;
! 	protected int fails = 0 ;
  	
  	public GClockCache(int size) {

Index: ClockCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/cache/ClockCache.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ClockCache.java	8 Jun 2004 08:16:07 -0000	1.16
--- ClockCache.java	21 Jun 2004 15:27:36 -0000	1.17
***************
*** 43,47 ****
  	protected int size;
  	protected int count = 0;
! 	protected int hits = 0, fails = 0;
  	
  	public ClockCache(int size) {
--- 43,48 ----
  	protected int size;
  	protected int count = 0;
! 	protected int hits = 0 ;
! 	protected int fails = 0 ;
  	
  	public ClockCache(int size) {

[Exist-commits] eXist-1.0/src/org/exist/xquery Union.java,1.2,1.3 CombiningExpression.java,1.2,1.3

[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-serv16641/src/org/exist/xquery

Modified Files:
	Union.java CombiningExpression.java 
Log Message:
Added copyResource method to DBBroker.

Index: Union.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Union.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Union.java	25 May 2004 09:25:43 -0000	1.2
--- Union.java	21 Jun 2004 15:27:32 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
  package org.exist.xquery;
  
+ import org.apache.log4j.Logger;
  import org.exist.dom.NodeSet;
  import org.exist.xquery.value.Item;
***************
*** 28,31 ****
--- 29,34 ----
  public class Union extends CombiningExpression {
  
+ 	private final static Logger LOG = Logger.getLogger(Union.class);
+ 	
      public Union(XQueryContext context, PathExpr left, PathExpr right) {
          super(context, left, right);
***************
*** 35,38 ****
--- 38,42 ----
  		Sequence lval = left.eval(contextSequence, contextItem);
  		Sequence rval = right.eval(contextSequence, contextItem);
+ 		long start = System.currentTimeMillis();
  		if(lval.getLength() == 0)
  		    return rval;
***************
*** 42,45 ****
--- 46,50 ----
  			throw new XPathException("union operand is not a node sequence");
          NodeSet result = lval.toNodeSet().union(rval.toNodeSet());
+         LOG.debug("Union took " + (System.currentTimeMillis() - start));
  		return result;
  	}

Index: CombiningExpression.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CombiningExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CombiningExpression.java	28 May 2004 10:54:13 -0000	1.2
--- CombiningExpression.java	21 Jun 2004 15:27:32 -0000	1.3
***************
*** 35,39 ****
  public abstract class CombiningExpression extends AbstractExpression {
  
! 	protected PathExpr left, right;
  	
  	/**
--- 35,40 ----
  public abstract class CombiningExpression extends AbstractExpression {
  
! 	protected PathExpr left;
! 	protected PathExpr right;
  	
  	/**

[Exist-commits] eXist-1.0/src/org/exist/storage/store DOMFileIterator.java,1.6,1.7 DOMFile.java,1.33,1.34

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

Modified Files:
	DOMFileIterator.java DOMFile.java 
Log Message:
Added copyResource method to DBBroker.

Index: DOMFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/DOMFile.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** DOMFile.java	16 Jun 2004 13:36:54 -0000	1.33
--- DOMFile.java	21 Jun 2004 15:27:35 -0000	1.34
***************
*** 582,594 ****
  	            dataCache.add(firstSplitPage);
  	        }
- //	        long next = nextSplitPage.getPageHeader().getNextDataPage();
- //	        if (-1 < next) {
- //	            DOMPage nextPage = getCurrentPage(nextSplitPage.getPageHeader()
- //	                    .getNextDataPage());
- //	            nextPage.getPageHeader()
- //	                    .setPrevDataPage(nextSplitPage.getPageNum());
- //	            nextPage.setDirty(true);
- //	            dataCache.add(nextPage);
- //	        }
          }
          long next = rec.page.getPageHeader().getNextDataPage();
--- 582,585 ----
***************
*** 605,608 ****
--- 596,603 ----
          rec.page.getPageHeader().setRecordCount(countRecordsInPage(rec.page));
          rec.offset = rec.page.len;
+ //        if(currentDocument != null) {
+ //        	currentDocument.incSplitCount();
+ //        	System.out.println(currentDocument.getFileName() + " split: " + currentDocument.getSplitCount());
+ //        }
          return rec;
      }

Index: DOMFileIterator.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/DOMFileIterator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DOMFileIterator.java	27 Apr 2004 15:38:54 -0000	1.6
--- DOMFileIterator.java	21 Jun 2004 15:27:35 -0000	1.7
***************
*** 32,36 ****
  		DOMFile db = null;
  		NodeProxy node = null;
! 		int offset, lastOffset = 0;
  		short lastTID = -1;
  		DOMPage p = null;
--- 32,37 ----
  		DOMFile db = null;
  		NodeProxy node = null;
! 		int offset;
! 		int lastOffset = 0 ;
  		short lastTID = -1;
  		DOMPage p = null;

[Exist-commits] eXist-1.0/src/org/exist/start start.config,1.16,1.17

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

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

Modified Files:
	start.config 
Log Message:
Added copyResource method to DBBroker.

Index: start.config
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/start/start.config,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** start.config	1 Mar 2004 13:20:35 -0000	1.16
--- start.config	21 Jun 2004 15:27:36 -0000	1.17
***************
*** 47,49 ****
  lib/optional/*					mode == other
  Jetty-4.1.4/lib/*				mode == jetty
! lib/*								always
--- 47,49 ----
  lib/optional/*					mode == other
  Jetty-4.1.4/lib/*				mode == jetty
! lib/*							always

[Exist-commits] eXist-1.0/src/org/exist/backup Restore.java,1.10,1.11

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

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

Modified Files:
	Restore.java 
Log Message:
Added copyResource method to DBBroker.

Index: Restore.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/backup/Restore.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Restore.java	3 Feb 2004 11:08:24 -0000	1.10
--- Restore.java	21 Jun 2004 15:27:37 -0000	1.11
***************
*** 15,18 ****
--- 15,19 ----
  
  import org.exist.security.User;
+ import org.exist.xmldb.CollectionImpl;
  import org.exist.xmldb.UserManagementService;
  import org.xml.sax.Attributes;
***************
*** 39,43 ****
  	private String pass;
  	private XMLReader reader;
! 	private Collection current;
  	private Stack stack = new Stack();
  	private RestoreDialog dialog = null;
--- 40,44 ----
  	private String pass;
  	private XMLReader reader;
! 	private CollectionImpl current;
  	private Stack stack = new Stack();
  	private RestoreDialog dialog = null;
***************
*** 211,215 ****
  	}
  
! 	private final Collection mkcol(String collPath) throws XMLDBException {
  		if (collPath.startsWith("/db"))
  			collPath = collPath.substring("/db".length());
--- 212,216 ----
  	}
  
! 	private final CollectionImpl mkcol(String collPath) throws XMLDBException {
  		if (collPath.startsWith("/db"))
  			collPath = collPath.substring("/db".length());
***************
*** 232,236 ****
  				current = c;
  		}
! 		return current;
  	}
  }
\ No newline at end of file
--- 233,237 ----
  				current = c;
  		}
! 		return (CollectionImpl)current;
  	}
  }
\ No newline at end of file

[Exist-commits] eXist-1.0/src/org/exist/storage/analysis Token.java,1.1,1.2

[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-serv16641/src/org/exist/storage/analysis

Modified Files:
	Token.java 
Log Message:
Added copyResource method to DBBroker.

Index: Token.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/analysis/Token.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Token.java	21 Jan 2003 13:29:24 -0000	1.1
--- Token.java	21 Jun 2004 15:27:34 -0000	1.2
***************
*** 20,24 ****
     * last character of this token.
     */
!   public int beginLine, beginColumn, endLine, endColumn;
  
    /**
--- 20,42 ----
     * last character of this token.
     */
!   public int beginLine;
!   /**
!    * beginLine and beginColumn describe the position of the first character
!    * of this token; endLine and endColumn describe the position of the
!    * last character of this token.
!    */
!   public int beginColumn;
!   /**
!    * beginLine and beginColumn describe the position of the first character
!    * of this token; endLine and endColumn describe the position of the
!    * last character of this token.
!    */
!   public int endLine;
!   /**
!    * beginLine and beginColumn describe the position of the first character
!    * of this token; endLine and endColumn describe the position of the
!    * last character of this token.
!    */
!   public int endColumn;
  
    /**

[Exist-commits] eXist-1.0/src/org/exist/storage/serializers NativeSerializer.java,1.23,1.24

[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-serv16641/src/org/exist/storage/serializers

Modified Files:
	NativeSerializer.java 
Log Message:
Added copyResource method to DBBroker.

Index: NativeSerializer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/serializers/NativeSerializer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** NativeSerializer.java	27 Apr 2004 15:46:58 -0000	1.23
--- NativeSerializer.java	21 Jun 2004 15:27:37 -0000	1.24
***************
*** 182,185 ****
--- 182,186 ----
              }
              if (first && showId > 0) {
+             	String src = doc.getCollection().getName() + '/' + doc.getFileName();
                  attributes.addAttribute(EXIST_NS, "source", "exist:source",
                          "CDATA", doc.getFileName());

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc RpcServer.java,1.38,1.39

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

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

Modified Files:
	RpcServer.java 
Log Message:
Added copyResource method to DBBroker.

Index: RpcServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc/RpcServer.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** RpcServer.java	8 Jun 2004 08:16:13 -0000	1.38
--- RpcServer.java	21 Jun 2004 15:27:39 -0000	1.39
***************
*** 1554,1562 ****
      public static byte[] compress(byte[] whatToCompress, int length) throws IOException {
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
!         GZIPOutputStream gzos = new GZIPOutputStream(baos);
! //        gzos.setMethod(gzos.DEFLATED);
! //        gzos.putNextEntry(new ZipEntry(length + ""));
          gzos.write(whatToCompress, 0, length);
! //        gzos.closeEntry();
          gzos.finish();
          gzos.close();
--- 1554,1562 ----
      public static byte[] compress(byte[] whatToCompress, int length) throws IOException {
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
!         ZipOutputStream gzos = new ZipOutputStream(baos);
!         gzos.setMethod(ZipOutputStream.DEFLATED);
!         gzos.putNextEntry(new ZipEntry(length + ""));
          gzos.write(whatToCompress, 0, length);
!         gzos.closeEntry();
          gzos.finish();
          gzos.close();
***************
*** 1567,1573 ****
              throws IOException {
          ByteArrayInputStream bais = new ByteArrayInputStream(whatToUncompress);
!         GZIPInputStream gzis = new GZIPInputStream(bais);
! //        ZipEntry zipentry = gzis.getNextEntry();
! //        int len = Integer.parseInt(zipentry.getName());
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          byte[] buf = new byte[512];
--- 1567,1573 ----
              throws IOException {
          ByteArrayInputStream bais = new ByteArrayInputStream(whatToUncompress);
!         ZipInputStream gzis = new ZipInputStream(bais);
!         ZipEntry zipentry = gzis.getNextEntry();
!         int len = Integer.parseInt(zipentry.getName());
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          byte[] buf = new byte[512];
***************
*** 1575,1579 ****
          while ((bread = gzis.read(buf)) != -1)
              baos.write(buf, 0, bread);
! //        gzis.closeEntry();
          gzis.close();
          return baos.toByteArray();
--- 1575,1579 ----
          while ((bread = gzis.read(buf)) != -1)
              baos.write(buf, 0, bread);
!         gzis.closeEntry();
          gzis.close();
          return baos.toByteArray();

[Exist-commits] eXist-1.0/src/org/exist/collections/triggers Trigger.java,1.3,1.4

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

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

Modified Files:
	Trigger.java 
Log Message:
Added copyResource method to DBBroker.

Index: Trigger.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/triggers/Trigger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Trigger.java	16 Apr 2004 14:44:24 -0000	1.3
--- Trigger.java	21 Jun 2004 15:27:39 -0000	1.4
***************
*** 136,140 ****
  	 * @param broker the database instance used to process the current action.
  	 * @param documentName the name of the document currently processed (relative to the collection path).
! 	 * @param existingDocument optional: if event is a {@link #UPDATE_DOCUMENT_EVENT UPDATE_DOCUMENT_EVENT},
  	 * 	existingDocument will contain the Document object for the old document, which will be overwritten. Otherwise, the parameter
  	 * 	is null.
--- 136,140 ----
  	 * @param broker the database instance used to process the current action.
  	 * @param documentName the name of the document currently processed (relative to the collection path).
! 	 * @param existingDocument optional: if event is a {@link #UPDATE_DOCUMENT_EVENT},
  	 * 	existingDocument will contain the Document object for the old document, which will be overwritten. Otherwise, the parameter
  	 * 	is null.

[Exist-commits] eXist-1.0/src/org/exist/http/webdav WebDAV.java,1.4,1.5

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

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

Modified Files:
	WebDAV.java 
Log Message:
Added copyResource method to DBBroker.

Index: WebDAV.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/WebDAV.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WebDAV.java	25 May 2004 09:26:13 -0000	1.4
--- WebDAV.java	21 Jun 2004 15:27:40 -0000	1.5
***************
*** 77,81 ****
  	
  	private int defaultAuthMethod;
! 	private Authenticator digestAuth, basicAuth;
  	private BrokerPool pool;
  	
--- 77,82 ----
  	
  	private int defaultAuthMethod;
! 	private Authenticator digestAuth;
! 	private Authenticator basicAuth;
  	private BrokerPool pool;
  	

[Exist-commits] eXist-1.0/src/org/exist/security security.properties,1.2,1.3

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

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

Modified Files:
	security.properties 
Log Message:
Added copyResource method to DBBroker.

Index: security.properties
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/security/security.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** security.properties	27 Apr 2004 15:46:59 -0000	1.2
--- security.properties	21 Jun 2004 15:27:39 -0000	1.3
***************
*** 10,12 ****
  # the database will not recognize the old passwords.
  
! passwords.encoding=md5
--- 10,12 ----
  # the database will not recognize the old passwords.
  
! passwords.encoding=simple-md5

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

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

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

Modified Files:
	RESTServer.java 
Log Message:
Added copyResource method to DBBroker.

Index: RESTServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/RESTServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RESTServer.java	25 May 2004 09:26:08 -0000	1.12
--- RESTServer.java	21 Jun 2004 15:27:38 -0000	1.13
***************
*** 616,619 ****
--- 616,623 ----
  			throw new BadRequestException("Error while serializing xml: "
  					+ e.toString(), e);
+ 		} catch(Exception e) {
+ 			LOG.warn(e.getMessage(), e);
+ 			throw new BadRequestException("Error while serializing xml: "
+ 					+ e.toString(), e);
  		}
  	}

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

[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-serv16641/src/org/exist/xquery/functions/util

Modified Files:
	EvalFunction.java 
Log Message:
Added copyResource method to DBBroker.

Index: EvalFunction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/EvalFunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EvalFunction.java	28 May 2004 10:54:21 -0000	1.4
--- EvalFunction.java	21 Jun 2004 15:27:39 -0000	1.5
***************
*** 117,123 ****
  						astParser.getErrorMessage(), astParser.getLastException());
  				}
  			    Sequence sequence = path.eval(null, null);
  			    path.reset();
! 			    LOG.debug("found " + sequence.getLength() + " for " + expr);
  			    return sequence;
  		} catch (RecognitionException e) {
--- 117,125 ----
  						astParser.getErrorMessage(), astParser.getLastException());
  				}
+ 				long start = System.currentTimeMillis();
  			    Sequence sequence = path.eval(null, null);
  			    path.reset();
! 			    LOG.debug("Found " + sequence.getLength() + " for " + expr);
! 			    LOG.debug("Query took " + (System.currentTimeMillis() - start));
  			    return sequence;
  		} catch (RecognitionException e) {

[Exist-commits] eXist-1.0/src/org/exist/collections/test CollectionTest.java,1.2,NONE

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

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

Removed Files:
	CollectionTest.java 
Log Message:
Added copyResource method to DBBroker.

--- CollectionTest.java DELETED ---

[Exist-commits] eXist-1.0/samples/org/exist/examples/triggers ExampleTrigger.java,1.3,1.4

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

Update of /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14855/samples/org/exist/examples/triggers

Modified Files:
	ExampleTrigger.java 
Log Message:
Fixed ExampleTrigger.

Index: ExampleTrigger.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers/ExampleTrigger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExampleTrigger.java	18 Jun 2004 12:05:16 -0000	1.3
--- ExampleTrigger.java	21 Jun 2004 10:37:01 -0000	1.4
***************
*** 54,59 ****
  		// create a document set containing "contents.xml"
  		DocumentSet docs = new DocumentSet();
! 		docs.add(this.doc);
! 		System.out.println("doc is " + this.doc.hashCode());
  		try {
  			// IMPORTANT: temporarily disable triggers on the collection.
--- 54,58 ----
  		// create a document set containing "contents.xml"
  		DocumentSet docs = new DocumentSet();
! 		docs.add(doc);
  		try {
  			// IMPORTANT: temporarily disable triggers on the collection.
***************
*** 90,94 ****
  			contentsFile = "contents.xml";
  		// try to retrieve the contents file
- 		System.out.println(parent.toString());
  		this.doc = parent.getDocument(broker, contentsFile);
  		if(this.doc == null)
--- 89,92 ----

[Exist-commits] eXist-1.0/src/org/exist/collections Collection.java,1.31,1.32

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

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

Modified Files:
	Collection.java 
Log Message:
Document object returned by Collection.addDocument is not a live object: changing it has no effect.
Fixed: the object is live again.


Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Collection.java	18 Jun 2004 12:08:42 -0000	1.31
--- Collection.java	21 Jun 2004 09:36:09 -0000	1.32
***************
*** 863,867 ****
  	
  			if(oldDoc == null)
! 			    addDocumentLink(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
--- 863,867 ----
  	
  			if(oldDoc == null)
! 			    addDocument(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
***************
*** 1062,1066 ****
  	
  			if(oldDoc == null)
! 			    addDocumentLink(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
--- 1062,1066 ----
  	
  			if(oldDoc == null)
! 			    addDocument(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
***************
*** 1228,1232 ****
  	
  			if(oldDoc == null)
! 			    addDocumentLink(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
--- 1228,1232 ----
  	
  			if(oldDoc == null)
! 			    addDocument(broker, document);
  			broker.addDocument(this, document);
  			broker.closeDocument();
***************
*** 1295,1299 ****
  			}
  			broker.storeBinaryResource(blob, data);
! 			addDocumentLink(broker, blob);
  			broker.addDocument(this, blob);
  			broker.closeDocument();
--- 1295,1299 ----
  			}
  			broker.storeBinaryResource(blob, data);
! 			addDocument(broker, blob);
  			broker.addDocument(this, blob);
  			broker.closeDocument();

[Exist-commits] eXist-1.0/src/org/exist/collections CollectionConfiguration.java,1.2,1.3 Collection.java,1.30,1.31

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

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

Modified Files:
	CollectionConfiguration.java Collection.java 
Log Message:
Additional check if triggers are enabled.

Index: CollectionConfiguration.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/CollectionConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CollectionConfiguration.java	16 Sep 2003 07:39:27 -0000	1.2
--- CollectionConfiguration.java	18 Jun 2004 12:08:42 -0000	1.3
***************
*** 1,2 ****
--- 1,22 ----
+ /*
+  *  eXist Open Source Native XML Database
+  *  Copyright (C) 2001-03,  Wolfgang M. Meier (me...@if...)
+  *
+  *  This library is free software; you can redistribute it and/or
+  *  modify it under the terms of the GNU Library General Public License
+  *  as published by the Free Software Foundation; either version 2
+  *  of the License, or (at your option) any later version.
+  *
+  *  This library is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU Library General Public License for more details.
+  *
+  *  You should have received a copy of the GNU Library General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  * 
+  *  $Id$
+  */
  package org.exist.collections;
  

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Collection.java	17 Jun 2004 14:40:40 -0000	1.30
--- Collection.java	18 Jun 2004 12:08:42 -0000	1.31
***************
*** 753,757 ****
  			// setup triggers
  			Trigger trigger = null;
! 			if (!name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);
--- 753,757 ----
  			// setup triggers
  			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);
***************
*** 941,945 ****
  			// setup triggers
  			Trigger trigger = null;
! 			if (!name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);
--- 941,945 ----
  			// setup triggers
  			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);
***************
*** 1140,1144 ****
  			// setup triggers
  			Trigger trigger = null;
! 			if (!name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);
--- 1140,1144 ----
  			// setup triggers
  			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
  				if (triggersEnabled) {
  					CollectionConfiguration config = getConfiguration(broker);

[Exist-commits] eXist-1.0/src/org/exist/xquery InstanceOfExpression.java,NONE,1.1

[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-serv10627/src/org/exist/xquery

Added Files:
	InstanceOfExpression.java 
Log Message:
Added support for "instance of" operator.

--- NEW FILE: InstanceOfExpression.java ---
/*
 *  eXist Open Source Native XML Database
 *  Copyright (C) 2001-04 Wolfgang M. Meier
 *  wol...@ex...
 *  http://exist.sourceforge.net
 *  
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Lesser General Public License
 *  as published by the Free Software Foundation; either version 2
 *  of the License, or (at your option) any later version.
 *  
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
 *  
 *  You should have received a copy of the GNU Lesser General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *  
 *  $Id: InstanceOfExpression.java,v 1.1 2004/06/18 12:07:27 wolfgang_m Exp $
 */
package org.exist.xquery;

import org.exist.xquery.value.BooleanValue;
import org.exist.xquery.value.Item;
import org.exist.xquery.value.Sequence;
import org.exist.xquery.value.SequenceIterator;
import org.exist.xquery.value.SequenceType;
import org.exist.xquery.value.Type;

/**
 * Implements the XQuery "instance of" operator.
 * 
 * @author wolf
 */
public class InstanceOfExpression extends AbstractExpression {

	private Expression expression;
	private SequenceType type;
	
	/**
	 * @param context
	 */
	public InstanceOfExpression(XQueryContext context, Expression expr, SequenceType type) {
		super(context);
		this.expression = expr;
		this.type = type;
	}

	/* (non-Javadoc)
	 * @see org.exist.xquery.Expression#eval(org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
	 */
	public Sequence eval(Sequence contextSequence, Item contextItem)
			throws XPathException {
		Sequence seq = expression.eval(contextSequence, contextItem);
		int items = seq.getLength();
		int requiredCardinality = type.getCardinality();
		if(items > 0 && requiredCardinality == Cardinality.EMPTY)
			return BooleanValue.FALSE;
		if(items == 0 && (requiredCardinality & Cardinality.ZERO) == 0)
			return BooleanValue.FALSE;
		else if(items > 1 && (requiredCardinality & Cardinality.MANY) == 0)
			return BooleanValue.FALSE;
		
		for(SequenceIterator i = seq.iterate(); i.hasNext(); ) {
			Item next = i.nextItem();
			if(!Type.subTypeOf(next.getType(), type.getPrimaryType()))
				return BooleanValue.FALSE;
		}
		return BooleanValue.TRUE;
	}

	/* (non-Javadoc)
	 * @see org.exist.xquery.Expression#pprint()
	 */
	public String pprint() {
		return expression.pprint() + " instance of " + type.toString();
	}

	/* (non-Javadoc)
	 * @see org.exist.xquery.Expression#returnsType()
	 */
	public int returnsType() {
		return Type.BOOLEAN;
	}

	/* (non-Javadoc)
	 * @see org.exist.xquery.AbstractExpression#getCardinality()
	 */
	public int getCardinality() {
		return Cardinality.EXACTLY_ONE;
	}
	
	/* (non-Javadoc)
	 * @see org.exist.xquery.AbstractExpression#getDependencies()
	 */
	public int getDependencies() {
		return Dependency.CONTEXT_SET + Dependency.CONTEXT_ITEM;
	}
	
	/* (non-Javadoc)
	 * @see org.exist.xquery.Expression#resetState()
	 */
	public void resetState() {
		expression.resetState();
	}

}

[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQuery.g,1.11,1.12

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

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

Modified Files:
	XQuery.g 
Log Message:
Added support for "instance of" operator.

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** XQuery.g	19 May 2004 08:18:50 -0000	1.11
--- XQuery.g	18 Jun 2004 12:06:51 -0000	1.12
***************
*** 334,340 ****
  andExpr
  :
! 	castExpr ( "and"^ castExpr )*
  	;
  
  castExpr
  :
--- 334,345 ----
  andExpr
  :
! 	instanceofExpr ( "and"^ instanceofExpr )*
  	;
  
+ instanceofExpr
+ :
+ 	castExpr ( "instance"^ "of"! sequenceType )?
+ 	;
+ 	
  castExpr
  :
***************
*** 913,916 ****
--- 918,925 ----
  	|
  	"return" { name = "return"; }
+ 	|
+ 	"instance" { name = "instance"; }
+ 	|
+ 	"of" { name = "of"; }
  	;
  
***************
*** 1541,1544 ****
--- 1550,1567 ----
  	|
  	#(
+ 		"instance"
+ 		{ 
+ 			PathExpr expr = new PathExpr(context);
+ 			SequenceType type= new SequenceType(); 
+ 		}
+ 		step=expr [expr]
+ 		sequenceType [type]
+ 		{ 
+ 			step = new InstanceOfExpression(context, expr, type); 
+ 			path.add(step);
+ 		}
+ 	)
+ 	|
+ 	#(
  		"or"
  		{

[Exist-commits] eXist-1.0/samples/org/exist/examples/triggers ExampleTrigger.java,1.2,1.3

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

Update of /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9003/samples/org/exist/examples/triggers

Modified Files:
	ExampleTrigger.java 
Log Message:
ExampleTrigger did not work.

Index: ExampleTrigger.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers/ExampleTrigger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExampleTrigger.java	18 Jun 2004 08:34:54 -0000	1.2
--- ExampleTrigger.java	18 Jun 2004 12:05:16 -0000	1.3
***************
*** 55,58 ****
--- 55,59 ----
  		DocumentSet docs = new DocumentSet();
  		docs.add(this.doc);
+ 		System.out.println("doc is " + this.doc.hashCode());
  		try {
  			// IMPORTANT: temporarily disable triggers on the collection.
***************
*** 67,70 ****
--- 68,72 ----
  			broker.flush();
  		} catch (Exception e) {
+ 			e.printStackTrace();
  			throw new TriggerException(e.getMessage(), e);
  		} finally {
***************
*** 88,92 ****
  			contentsFile = "contents.xml";
  		// try to retrieve the contents file
! 		this.doc = parent.getDocument(broker, parent.getName() + '/' + contentsFile);
  		if(this.doc == null)
  			// doesn't exist yet: create it
--- 90,95 ----
  			contentsFile = "contents.xml";
  		// try to retrieve the contents file
! 		System.out.println(parent.toString());
! 		this.doc = parent.getDocument(broker, contentsFile);
  		if(this.doc == null)
  			// doesn't exist yet: create it

[Exist-commits] eXist-1.0 client.properties,1.17,1.18

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

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

Modified Files:
	client.properties 
Log Message:
store xconf as xml

Index: client.properties
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/client.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** client.properties	25 May 2004 09:25:45 -0000	1.17
--- client.properties	18 Jun 2004 08:53:14 -0000	1.18
***************
*** 40,44 ****
  
  # files with the following suffixes are stored as XML files
! suffixes.xml=xml,xsl,xsd,svg,rdf,vscml,mods,xmi
  
  # files with the following suffixes are stored as binary resources
--- 40,44 ----
  
  # files with the following suffixes are stored as XML files
! suffixes.xml=xml,xsl,xsd,svg,rdf,vscml,mods,xmi,xconf
  
  # files with the following suffixes are stored as binary resources

[Exist-commits] eXist-1.0/samples/org/exist/examples/triggers ExampleTrigger.java,1.1,1.2

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

Update of /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3971/samples/org/exist/examples/triggers

Modified Files:
	ExampleTrigger.java 
Log Message:
wrong method call in trigger example.

Index: ExampleTrigger.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/samples/org/exist/examples/triggers/ExampleTrigger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExampleTrigger.java	16 Sep 2003 07:42:20 -0000	1.1
--- ExampleTrigger.java	18 Jun 2004 08:34:54 -0000	1.2
***************
*** 88,92 ****
  			contentsFile = "contents.xml";
  		// try to retrieve the contents file
! 		this.doc = parent.getDocument(parent.getName() + '/' + contentsFile);
  		if(this.doc == null)
  			// doesn't exist yet: create it
--- 88,92 ----
  			contentsFile = "contents.xml";
  		// try to retrieve the contents file
! 		this.doc = parent.getDocument(broker, parent.getName() + '/' + contentsFile);
  		if(this.doc == null)
  			// doesn't exist yet: create it

[Exist-commits] eXist-1.0/src/org/exist/collections Collection.java,1.29,1.30

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

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

Modified Files:
	Collection.java 
Log Message:
Fixed dead lock in Collection.write

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Collection.java	16 Jun 2004 09:19:26 -0000	1.29
--- Collection.java	17 Jun 2004 14:40:40 -0000	1.30
***************
*** 704,708 ****
  		if (broker.isReadOnly())
  			throw new PermissionDeniedException("Database is read-only");
- 		System.out.println(this);
  		DocumentImpl document, oldDoc = null;
  		XMLReader reader;
--- 704,707 ----
***************
*** 1369,1374 ****
  		ostream.writeByte((byte) permissions.getPermissions());
  		ostream.writeLong(created);
  		DocumentImpl doc;
! 		for (Iterator i = iterator(broker); i.hasNext(); ) {
  			doc = (DocumentImpl) i.next();
  			doc.write(ostream);
--- 1368,1377 ----
  		ostream.writeByte((byte) permissions.getPermissions());
  		ostream.writeLong(created);
+ 		if(reloadRequired) {
+ 		    broker.reloadCollection(this);
+ 		    reloadRequired = false;
+ 		}
  		DocumentImpl doc;
! 		for (Iterator i = documents.values().iterator(); i.hasNext(); ) {
  			doc = (DocumentImpl) i.next();
  			doc.write(ostream);