exist-commits — Receive notifications about CVS commits.

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

[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-serv1560/src/org/exist/collections

Modified Files:
	Collection.java 
Log Message:
getDocumentWithLock throws NPE if document does not exist.

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Collection.java	12 Sep 2004 09:25:25 -0000	1.51
--- Collection.java	14 Sep 2004 17:05:35 -0000	1.52
***************
*** 457,460 ****
--- 457,462 ----
  			}
  	        DocumentImpl doc = (DocumentImpl) documents.get(name);
+ 	        if(doc == null)
+ 	        	return null;
  	        Lock updateLock = doc.getUpdateLock();
  	        updateLock.acquire(Lock.READ_LOCK);

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc/test XmlRpcTest.java,NONE,1.1

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

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

Added Files:
	XmlRpcTest.java 
Log Message:
Added junit test for xmlrpc methods (incomplete).

--- NEW FILE: XmlRpcTest.java ---
/*
 *  eXist Open Source Native XML Database
 *  Copyright (C) 2000-04,  Wolfgang M. Meier (wol...@ex...)
 *
 *  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 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: XmlRpcTest.java,v 1.1 2004/09/14 15:34:33 wolfgang_m Exp $
 */
package org.exist.xmlrpc.test;

import java.net.MalformedURLException;
import java.util.Hashtable;
import java.util.Vector;

import junit.framework.TestCase;

import org.apache.xmlrpc.WebServer;
import org.apache.xmlrpc.XmlRpc;
import org.apache.xmlrpc.XmlRpcClient;
import org.exist.storage.BrokerPool;
import org.exist.util.Configuration;
import org.exist.xmlrpc.AuthenticatedHandler;

/**
 * JUnit test for XMLRPC interface methods.
 * 
 * @author wolf
 */
public class XmlRpcTest extends TestCase {

    private final static int PORT = 8081;
    
    private final static String URI = "http://localhost:8081";
    
    private final static String XML_DATA =
    	"<test><para>ääööüüÄÄÖÖÜÜ</para></test>";
    
    private final static String TARGET_COLLECTION = "/db/test/";
    
    private WebServer webServer = null;
 
	public static void main(String[] args) {
		junit.textui.TestRunner.run(XmlRpcTest.class);
	}

	public void testStore() throws Exception {
		System.out.println("Storing document " + XML_DATA);
		// set parameters for XML-RPC call
		Vector params = new Vector();
		params.addElement(XML_DATA);
		params.addElement(TARGET_COLLECTION + "test.xml");
		params.addElement(new Integer(1));
		
		// execute the call
		XmlRpcClient xmlrpc = getClient();
		Boolean result = (Boolean)xmlrpc.execute("parse", params);
		assertTrue(result.booleanValue());
		System.out.println("Document stored.");
	}
	
	public void testRetrieveDoc() throws Exception {
		Hashtable options = new Hashtable();
        options.put("indent", "yes");
        options.put("encoding", "UTF-8");
        options.put("expand-xincludes", "yes");
        options.put("process-xsl-pi", "no");
        
        Vector params = new Vector();
        params.addElement( TARGET_COLLECTION + "test.xml" ); 
        params.addElement( options );
        
        // execute the call
		XmlRpcClient xmlrpc = getClient();
		byte[] data = (byte[])
        xmlrpc.execute( "getDocument", params );
		System.out.println( new String(data, "UTF-8") );
	}
	
	/*
	 * @see TestCase#setUp()
	 */
	/* (non-Javadoc)
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		if(webServer == null)
			startServer();
	}
	
	protected void startServer() throws Exception {
		System.out.println("Starting database ...");
		String pathSep = System.getProperty( "file.separator", "/" );
        String home = System.getProperty( "exist.home" );
        if ( home == null )
            home = System.getProperty( "user.dir" );
        System.out.println( "loading configuration from " + home +
            pathSep + "conf.xml" );
        Configuration config = new Configuration( "conf.xml", home );
        BrokerPool.configure( 1, 5, config );
        
        System.out.println( "starting XMLRPC listener at port " + PORT );
        XmlRpc.setEncoding( "UTF-8" );
        webServer = new WebServer( PORT );
        AuthenticatedHandler handler = new AuthenticatedHandler( config );
        webServer.addHandler( "$default", handler );
        webServer.start();
        System.err.println( "waiting for connections ..." );
	}
	
	protected XmlRpcClient getClient() throws MalformedURLException {
		XmlRpc.setEncoding("UTF-8");
		XmlRpcClient xmlrpc = new XmlRpcClient(URI);
		xmlrpc.setBasicAuthentication("admin", "");
		return xmlrpc;
	}
}

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc/test - New directory

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

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

Log Message:
Directory /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc/test added to the repository

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc RpcServlet.java,1.2,1.3

[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-serv14302/src/org/exist/xmlrpc

Modified Files:
	RpcServlet.java 
Log Message:
Statically set the encoding used by the xmlrpc lib to UTF-8.

Index: RpcServlet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc/RpcServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RpcServlet.java	29 Jan 2004 15:06:44 -0000	1.2
--- RpcServlet.java	14 Sep 2004 15:26:48 -0000	1.3
***************
*** 65,68 ****
--- 65,69 ----
              xmlrpc.addHandler( "$default", rpcserv );
              XmlRpc.setDebug( false );
+             XmlRpc.setEncoding( "UTF-8" );
          } catch (EXistException e) {
          	throw new ServletException( e );

[Exist-commits] eXist-1.0/src/org/exist/xquery SequenceConstructor.java,1.2,1.3 XQuery.java,1.5,1.6 ElementConstructor.java,1.7,1.8

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

Modified Files:
	SequenceConstructor.java XQuery.java ElementConstructor.java 
Log Message:
Fix for bug 1015954: Computed Node Constructors.

Index: XQuery.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/XQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XQuery.java	12 Sep 2004 09:25:14 -0000	1.5
--- XQuery.java	13 Sep 2004 14:06:35 -0000	1.6
***************
*** 92,96 ****
              		treeParser.getLastException());
              }
!             LOG.debug("compilation took "  +  (System.currentTimeMillis() - start));
              return expr;
          } catch (RecognitionException e) {
--- 92,96 ----
              		treeParser.getLastException());
              }
!             LOG.debug("Query:\n" + expr.pprint() + "\nCompilation took "  +  (System.currentTimeMillis() - start));
              return expr;
          } catch (RecognitionException e) {

Index: ElementConstructor.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/ElementConstructor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ElementConstructor.java	8 Aug 2004 19:03:26 -0000	1.7
--- ElementConstructor.java	13 Sep 2004 14:06:35 -0000	1.8
***************
*** 44,47 ****
--- 44,48 ----
  	private AttributeConstructor attributes[] = null;
  	private QName namespaceDecls[] = null;
+ 	private boolean isDynamic = true;
  	
  	public ElementConstructor(XQueryContext context) {
***************
*** 52,55 ****
--- 53,57 ----
  		super(context);
  		this.qnameExpr = new LiteralValue(context, new StringValue(qname));
+ 		this.isDynamic = false;
  	}
  	
***************
*** 164,167 ****
--- 166,171 ----
  	 */
  	public String pprint() {
+ 		if(isDynamic)
+ 			return pprintDynamic();
  		StringBuffer buf = new StringBuffer();
  		buf.append('<').append(qnameExpr.pprint());
***************
*** 183,186 ****
--- 187,201 ----
  	}
  	
+ 	public String pprintDynamic() {
+ 		StringBuffer buf = new StringBuffer();
+ 		buf.append("element { ");
+ 		buf.append(qnameExpr.pprint());
+ 		buf.append(" } { ");
+ 		if(content != null)
+ 			buf.append(content.pprint());
+ 		buf.append(" }");
+ 		return buf.toString();
+ 	}
+ 	
  	/* (non-Javadoc)
  	 * @see org.exist.xquery.AbstractExpression#setPrimaryAxis(int)

Index: SequenceConstructor.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/SequenceConstructor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SequenceConstructor.java	28 May 2004 10:54:12 -0000	1.2
--- SequenceConstructor.java	13 Sep 2004 14:06:35 -0000	1.3
***************
*** 23,29 ****
  package org.exist.xquery;
  
- import java.util.ArrayList;
  import java.util.Iterator;
- import java.util.List;
  
  import org.exist.xquery.value.Item;
--- 23,27 ----
***************
*** 38,44 ****
   * @author wolf
   */
! public class SequenceConstructor extends AbstractExpression {
! 
! 	List expressions = new ArrayList(5);
  	
  	/**
--- 36,40 ----
   * @author wolf
   */
! public class SequenceConstructor extends PathExpr {
  	
  	/**
***************
*** 48,55 ****
  		super(context);
  	}
- 
- 	public void addExpression(Expression expr) {
- 		expressions.add(expr);
- 	}
  	
  	/* (non-Javadoc)
--- 44,47 ----
***************
*** 62,66 ****
  		ValueSequence result = new ValueSequence();
  		Sequence temp;
! 		for(Iterator i = expressions.iterator(); i.hasNext(); ) {
  			temp = ((Expression)i.next()).eval(contextSequence, contextItem);
  			result.addAll(temp);
--- 54,58 ----
  		ValueSequence result = new ValueSequence();
  		Sequence temp;
! 		for(Iterator i = steps.iterator(); i.hasNext(); ) {
  			temp = ((Expression)i.next()).eval(contextSequence, contextItem);
  			result.addAll(temp);
***************
*** 74,78 ****
  	public String pprint() {
  		StringBuffer buf = new StringBuffer();
! 		for(Iterator i = expressions.iterator(); i.hasNext(); ) {
  			if(buf.length() > 0)
  				buf.append(", ");
--- 66,70 ----
  	public String pprint() {
  		StringBuffer buf = new StringBuffer();
! 		for(Iterator i = steps.iterator(); i.hasNext(); ) {
  			if(buf.length() > 0)
  				buf.append(", ");
***************
*** 100,104 ****
  	 */
  	public void resetState() {
! 		for (Iterator i = expressions.iterator(); i.hasNext();) {
  			((Expression) i.next()).resetState();
  		}
--- 92,96 ----
  	 */
  	public void resetState() {
! 		for (Iterator i = steps.iterator(); i.hasNext();) {
  			((Expression) i.next()).resetState();
  		}

[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQueryTreeParser.java,1.20,1.21 XQuery.g,1.25,1.26

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

Modified Files:
	XQueryTreeParser.java XQuery.g 
Log Message:
Fix for bug 1015954: Computed Node Constructors.

Index: XQueryTreeParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryTreeParser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** XQueryTreeParser.java	12 Sep 2004 09:25:18 -0000	1.20
--- XQueryTreeParser.java	13 Sep 2004 14:06:36 -0000	1.21
***************
*** 248,254 ****
  			
  						SequenceConstructor sc= new SequenceConstructor(context);
! 						sc.addExpression(left);
! 						sc.addExpression(right);
! 						path.add(sc);
  						step = sc;
  					
--- 248,254 ----
  			
  						SequenceConstructor sc= new SequenceConstructor(context);
! 						sc.addPath(left);
! 						sc.addPath(right);
! 						path.addPath(sc);
  						step = sc;
  					
***************
*** 4540,4545 ****
  						c.setASTNode(qn);
  						step= c;
! 						elementContent = new EnclosedExpr(context);
! 						c.setContent(elementContent);
  						PathExpr qnamePathExpr = new PathExpr(context);
  						c.setNameExpr(qnamePathExpr);
--- 4540,4547 ----
  						c.setASTNode(qn);
  						step= c;
! 						elementContent = new SequenceConstructor(context);
! 						EnclosedExpr enclosed = new EnclosedExpr(context);
! 						enclosed.addPath(elementContent);
! 						c.setContent(enclosed);
  						PathExpr qnamePathExpr = new PathExpr(context);
  						c.setNameExpr(qnamePathExpr);

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** XQuery.g	12 Sep 2004 09:25:18 -0000	1.25
--- XQuery.g	13 Sep 2004 14:06:36 -0000	1.26
***************
*** 1416,1422 ****
  		{
  			SequenceConstructor sc= new SequenceConstructor(context);
! 			sc.addExpression(left);
! 			sc.addExpression(right);
! 			path.add(sc);
  			step = sc;
  		}
--- 1416,1422 ----
  		{
  			SequenceConstructor sc= new SequenceConstructor(context);
! 			sc.addPath(left);
! 			sc.addPath(right);
! 			path.addPath(sc);
  			step = sc;
  		}
***************
*** 2434,2439 ****
  			c.setASTNode(qn);
  			step= c;
! 			elementContent = new EnclosedExpr(context);
! 			c.setContent(elementContent);
  			PathExpr qnamePathExpr = new PathExpr(context);
  			c.setNameExpr(qnamePathExpr);
--- 2434,2441 ----
  			c.setASTNode(qn);
  			step= c;
! 			elementContent = new SequenceConstructor(context);
! 			EnclosedExpr enclosed = new EnclosedExpr(context);
! 			enclosed.addPath(elementContent);
! 			c.setContent(enclosed);
  			PathExpr qnamePathExpr = new PathExpr(context);
  			c.setNameExpr(qnamePathExpr);

[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalCollection.java,1.44,1.45

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

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

Modified Files:
	LocalCollection.java 
Log Message:
Fix for bug 1015954: Computed Node Constructors.

Index: LocalCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollection.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** LocalCollection.java	12 Sep 2004 13:12:21 -0000	1.44
--- LocalCollection.java	13 Sep 2004 14:06:34 -0000	1.45
***************
*** 78,82 ****
  		defaultProperties.setProperty(OutputKeys.ENCODING, "UTF-8");
  		defaultProperties.setProperty(OutputKeys.INDENT, "yes");
! 		defaultProperties.setProperty(EXistOutputKeys.EXPAND_XINCLUDES, "no");
  		defaultProperties.setProperty(EXistOutputKeys.PROCESS_XSL_PI, "no");
  	}
--- 78,82 ----
  		defaultProperties.setProperty(OutputKeys.ENCODING, "UTF-8");
  		defaultProperties.setProperty(OutputKeys.INDENT, "yes");
! 		defaultProperties.setProperty(EXistOutputKeys.EXPAND_XINCLUDES, "yes");
  		defaultProperties.setProperty(EXistOutputKeys.PROCESS_XSL_PI, "no");
  	}

[Exist-commits] eXist-1.0/src/org/exist/source CocoonSource.java,1.1,1.2

[Luigi B. <fi...@us...>]

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

Modified Files:
	CocoonSource.java 
Log Message:
https://sourceforge.net/tracker/index.php?func=detail&aid=1019695&group_id=17691&atid=117691

org.exist.source.CocoonSource.getContent() throws NPE if the underlying InputSource cannot report its getContentLength(). For example, when initialized with an org.apache.excalibur.source.Source, which can legitimately report -1 for getContentLength() if the length is unknown a priori, then the CocoonSource.getContent() fails when trying to construct the outgoing ByteArrayOutputStream(source.getContentLength()).

This commit fixes the problem.



Index: CocoonSource.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/source/CocoonSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CocoonSource.java	17 May 2004 09:50:29 -0000	1.1
--- CocoonSource.java	13 Sep 2004 10:41:29 -0000	1.2
***************
*** 89,101 ****
  
      public String getContent() throws IOException {
!         ByteArrayOutputStream os = new ByteArrayOutputStream((int) inputSource
! 				.getContentLength());
! 		byte[] t = new byte[512];
! 		InputStream is = inputSource.getInputStream();
! 		int count = 0;
! 		while ((count = is.read(t)) != -1) {
! 			os.write(t, 0, count);
! 		}
! 		return os.toString("UTF-8");
      }
      
--- 89,107 ----
  
      public String getContent() throws IOException {
! 	int len = (int) inputSource.getContentLength();
! 
!         ByteArrayOutputStream os;
! 	if (len == -1)
!         	os = new ByteArrayOutputStream();
! 	else 
!         	os = new ByteArrayOutputStream(len);
! 
! 	byte[] t = new byte[512];
! 	InputStream is = inputSource.getInputStream();
! 	int count = 0;
! 	while ((count = is.read(t)) != -1) {
! 		os.write(t, 0, count);
! 	}
! 	return os.toString("UTF-8");
      }
      

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

[Sebastian B. <bo...@us...>]

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

Modified Files:
	FunNodeName.java 
Log Message:
failed when contextSequence was empty (NPE)

Index: FunNodeName.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/FunNodeName.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunNodeName.java	1 Sep 2004 17:41:31 -0000	1.2
--- FunNodeName.java	13 Sep 2004 09:36:03 -0000	1.3
***************
*** 76,80 ****
                  n = result.item(0);
          } else {
!             if(contextSequence.getLength() > 0 && contextSequence.getItemType() == Type.NODE)
                  n = ((NodeSet)contextSequence).item(0);
          }
--- 76,80 ----
                  n = result.item(0);
          } else {
!             if(contextSequence != null && contextSequence.getLength() > 0 && contextSequence.getItemType() == Type.NODE)
                  n = ((NodeSet)contextSequence).item(0);
          }
***************
*** 83,86 ****
--- 83,90 ----
                  case Node.ELEMENT_NODE:
                  case Node.ATTRIBUTE_NODE:
+                     QName qname = ((QNameable) n).getQName();
+                 	/*if (qname.getPrefix() != null) {
+                 	    context.declareNamespace(qname.getPrefix(), qname.getNamespaceURI());
+                 	}*/
                      retval = new QNameValue(context, ((QNameable) n).getQName());
                      break;

[Exist-commits] eXist-1.0/samples/xquery exceptions.xq,NONE,1.1

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

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

Added Files:
	exceptions.xq 
Log Message:
util:catch example.

--- NEW FILE: exceptions.xq ---
xquery version "1.0";

util:catch("org.exist.xquery.XPathException",
    util:eval("$undef"),
    <error>An error occurred: {$util:exception-message}.</error>
)

[Exist-commits] eXist-1.0/src/org/exist/xmldb/test RemoteDBTest.java,1.1,1.2 RemoteCollectionTest.java,1.4,1.5 ResourceTest.java,1.10,1.11

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

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

Modified Files:
	RemoteDBTest.java RemoteCollectionTest.java ResourceTest.java 
Log Message:
Changed the remote tests to shut down the database server after the test.

Index: RemoteCollectionTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/RemoteCollectionTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RemoteCollectionTest.java	12 Sep 2004 09:25:22 -0000	1.4
--- RemoteCollectionTest.java	12 Sep 2004 19:51:24 -0000	1.5
***************
*** 8,11 ****
--- 8,13 ----
  import java.util.Iterator;
  
+ import junit.textui.TestRunner;
+ 
  import org.exist.schema.RemoteSchemaService;
  import org.exist.xmldb.RemoteCollectionManagementService;
***************
*** 38,44 ****
    	protected void tearDown() throws Exception {
  	    removeCollection();
  	}
  
- 
      public void testIndexQueryService() {
  		// TODO .............
--- 40,46 ----
    	protected void tearDown() throws Exception {
  	    removeCollection();
+ 	    stopServer(getCollection());
  	}
  
      public void testIndexQueryService() {
  		// TODO .............
***************
*** 83,86 ****
--- 85,95 ----
  	}
  	
+ 	public void testGetNonExistentResource() throws XMLDBException {
+ 		System.out.println("Retrieving non-existing resource -----------------");
+ 		Collection collection = getCollection();
+ 		Resource resource = collection.getResource("12345.xml");
+ 		assertNull(resource);
+ 	}
+ 	
  	public void testListResources() throws XMLDBException {
  	    ArrayList xmlNames = new ArrayList();
***************
*** 115,117 ****
--- 124,129 ----
      }
  
+     public static void main(String[] args) {
+     	TestRunner.run(RemoteCollectionTest.class);
+ 	}
  }

Index: RemoteDBTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/RemoteDBTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RemoteDBTest.java	3 Sep 2004 09:05:33 -0000	1.1
--- RemoteDBTest.java	12 Sep 2004 19:51:24 -0000	1.2
***************
*** 87,90 ****
--- 87,93 ----
          // Thread ??
          Server.main(new String[] {});
+         synchronized(this) {
+         	wait(500);
+         }
      }
  
***************
*** 104,107 ****
--- 107,117 ----
          if (mgr != null)
              mgr.shutdown();
+         Server.shutdown();
+         synchronized(this) {
+         	try {
+ 				wait(1000);
+ 			} catch (InterruptedException e) {
+ 			}
+         }
      }
  

Index: ResourceTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/ResourceTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ResourceTest.java	3 Aug 2004 16:45:44 -0000	1.10
--- ResourceTest.java	12 Sep 2004 19:51:24 -0000	1.11
***************
*** 23,26 ****
--- 23,27 ----
  import org.xmldb.api.base.Collection;
  import org.xmldb.api.base.Database;
+ import org.xmldb.api.base.Resource;
  import org.xmldb.api.base.XMLDBException;
  import org.xmldb.api.modules.XMLResource;
***************
*** 39,42 ****
--- 40,55 ----
  	}
  	
+ 	public void testReadNonExistingResource() {
+ 		try {
+ 			Collection testCollection = DatabaseManager.getCollection(URI + "/test");
+ 			assertNotNull(testCollection);
+ 			Resource nonExistent = testCollection.getResource("12345.xml");
+ 			assertNull(nonExistent);
+ 		} catch(Exception e) {
+ 			System.out.println("testReadNonExistingResource(): Exception: " + e);
+ 			fail(e.getMessage());
+ 		}
+ 	}
+ 	
  	public void testReadResource() {
  		try {

[Exist-commits] eXist-1.0/src/org/exist Server.java,1.8,1.9

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

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

Modified Files:
	Server.java 
Log Message:
Added shutdown method (for the remote junit test cases to work).

Index: Server.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/Server.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Server.java	16 Feb 2004 14:12:23 -0000	1.8
--- Server.java	12 Sep 2004 19:49:25 -0000	1.9
***************
*** 149,152 ****
--- 149,162 ----
      }
  
+     public static void shutdown() {
+     	System.err.println("Shutdown ...");
+     	webServer.shutdown();
+     	http.shutdown();
+     	try {
+ 			http.join();
+ 		} catch (InterruptedException e) {
+ 		}
+     }
+     
      private static void printHelp() {
  		System.out.println("Usage: java " + Server.class.getName() + " [options]");

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

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

Modified Files:
	CatchFunction.java 
Log Message:
Changed CatchFunction to store the caught exception message into the module global variable util:exception-message.

Index: CatchFunction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/CatchFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CatchFunction.java	12 Sep 2004 09:25:16 -0000	1.3
--- CatchFunction.java	12 Sep 2004 19:48:28 -0000	1.4
***************
*** 89,93 ****
--- 89,95 ----
                  			(UtilModule) context.getModule(UtilModule.NAMESPACE_URI);
                          QName exQname = new QName("exception", UtilModule.NAMESPACE_URI, UtilModule.PREFIX);
+                         QName msgQname = new QName("exception-message", UtilModule.NAMESPACE_URI, UtilModule.PREFIX);
                          myModule.declareVariable(exQname, new StringValue(e.getClass().getName()));
+                         myModule.declareVariable(msgQname, new StringValue(e.getMessage()));
                          return getArgument(2).eval(contextSequence, contextItem);
                      }

[Exist-commits] eXist-1.0/src/org/exist/http HttpServer.java,1.5,1.6

[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-serv19947/src/org/exist/http

Modified Files:
	HttpServer.java 
Log Message:
HttpServer should close the ServerSocket after shutdown.

Index: HttpServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/HttpServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HttpServer.java	5 Mar 2004 11:15:28 -0000	1.5
--- HttpServer.java	12 Sep 2004 19:46:56 -0000	1.6
***************
*** 113,117 ****
              sock.setSoTimeout( 500 );
              LOG.debug( "listening at port " + port );
!             while ( !stop )
                  try {
                      Socket s = sock.accept();
--- 113,117 ----
              sock.setSoTimeout( 500 );
              LOG.debug( "listening at port " + port );
!             while ( !stop ) {
                  try {
                      Socket s = sock.accept();
***************
*** 122,126 ****
                  } catch ( InterruptedIOException ie ) {
                  }
! 
          } catch ( IOException io ) {
              LOG.error( io );
--- 122,128 ----
                  } catch ( InterruptedIOException ie ) {
                  }
!             }
!             LOG.info("Shutting down ...");
!             sock.close();
          } catch ( IOException io ) {
              LOG.error( io );

[Exist-commits] Patch to CocoonSource.java

[<fi...@us...>]

Would you also consider applying the following patch:



Index: src/org/exist/source/CocoonSource.java
===================================================================
RCS file: 
/cvsroot/exist/eXist-1.0/src/org/exist/source/CocoonSource.java,v
retrieving revision 1.1
diff -w -r1.1 CocoonSource.java
91,92c91,98
<         ByteArrayOutputStream os = new ByteArrayOutputStream((int) inputSource
<                               .getContentLength());
---
>       int len = (int) inputSource.getContentLength();
>
>         ByteArrayOutputStream os;
>       if (len == -1)
>               os = new ByteArrayOutputStream();
>       else
>               os = new ByteArrayOutputStream(len);
>

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

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

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

Modified Files:
	XMLDBGetChildCollections.java 
Log Message:
xmldb:get-child-collections function throws an XPathException if the specified collection does not exist.

Index: XMLDBGetChildCollections.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/xmldb/XMLDBGetChildCollections.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLDBGetChildCollections.java	12 Sep 2004 13:25:15 -0000	1.3
--- XMLDBGetChildCollections.java	12 Sep 2004 16:09:46 -0000	1.4
***************
*** 70,74 ****
  		ValueSequence r = new ValueSequence();	
  		String child;
! 		if (collection != null) {
  			throw new XPathException(getASTNode(), "Collection " + collectionURI + " does not exist");
  		}
--- 70,74 ----
  		ValueSequence r = new ValueSequence();	
  		String child;
! 		if (collection == null) {
  			throw new XPathException(getASTNode(), "Collection " + collectionURI + " does not exist");
  		}

[Exist-commits] eXist-1.0/src/org/exist/xquery/functions/xmldb XMLDBGetChildCollections.java,1.2,1.3

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

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

Modified Files:
	XMLDBGetChildCollections.java 
Log Message:
xmldb:get-child-collections function throws an XPathException if the specified collection does not exist.

Index: XMLDBGetChildCollections.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/xmldb/XMLDBGetChildCollections.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLDBGetChildCollections.java	12 Sep 2004 09:25:16 -0000	1.2
--- XMLDBGetChildCollections.java	12 Sep 2004 13:25:15 -0000	1.3
***************
*** 70,79 ****
  		ValueSequence r = new ValueSequence();	
  		String child;
! 			for (Iterator i = collection.collectionIterator(); i.hasNext(); ) 
! 			{
! 				child = (String) i.next();
! 				r.add(new StringValue(child));
! 			}
! 		
  		return r;
  	}
--- 70,82 ----
  		ValueSequence r = new ValueSequence();	
  		String child;
! 		if (collection != null) {
! 			throw new XPathException(getASTNode(), "Collection " + collectionURI + " does not exist");
! 		}
! 		for (Iterator i = collection.collectionIterator(); i.hasNext(); ) 
! 		{
! 			child = (String) i.next();
! 			r.add(new StringValue(child));
! 		}
! 
  		return r;
  	}

[Exist-commits] eXist-1.0/src/org/exist/xquery/functions/transform Transform.java,1.9,1.10

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

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

Modified Files:
	Transform.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: Transform.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/transform/Transform.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Transform.java	12 Sep 2004 09:25:22 -0000	1.9
--- Transform.java	12 Sep 2004 13:12:22 -0000	1.10
***************
*** 169,185 ****
  		if(stylesheet.indexOf(':') < 0) {
  			File f = new File(stylesheet);
! 			if(f.canRead())
! 				try {
! 					stylesheet = new URI(f.toURL().toString()).toASCIIString();
! 				} catch (Exception e1) {
! 				}
  			else {
  				stylesheet = context.getBaseURI() + File.separatorChar + stylesheet;
  				f = new File(stylesheet);
! 				if(f.canRead())
! 					try {
! 						stylesheet = f.toURL().toString();
! 					} catch (MalformedURLException e2) {
! 					}
  			}
  		}
--- 169,177 ----
  		if(stylesheet.indexOf(':') < 0) {
  			File f = new File(stylesheet);
! 			if(f.canRead()) stylesheet = f.toURI().toASCIIString();
  			else {
  				stylesheet = context.getBaseURI() + File.separatorChar + stylesheet;
  				f = new File(stylesheet);
! 				if(f.canRead()) stylesheet = f.toURI().toASCIIString();
  			}
  		}

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc RpcConnection.java,1.70,1.71

[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-serv4679/src/org/exist/xmlrpc

Modified Files:
	RpcConnection.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: RpcConnection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc/RpcConnection.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** RpcConnection.java	12 Sep 2004 12:40:51 -0000	1.70
--- RpcConnection.java	12 Sep 2004 13:12:23 -0000	1.71
***************
*** 1052,1062 ****
  								"Old document exists and overwrite is not allowed");
  				}
! 				String uri;
! 				try {
! 					uri = new URI(file.toURL().toString()).toASCIIString();
! 				} catch (Exception e) {
! 					uri = file.getAbsolutePath();
! 				}
! 				source = new InputSource(uri);
  				info = collection.validate(broker, docName, source);
  			} finally {
--- 1052,1056 ----
  								"Old document exists and overwrite is not allowed");
  				}
! 				source = new InputSource(file.toURI().toASCIIString());
  				info = collection.validate(broker, docName, source);
  			} finally {

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

[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-serv4679/src/org/exist/http

Modified Files:
	RESTServer.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: RESTServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/RESTServer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RESTServer.java	12 Sep 2004 09:25:19 -0000	1.16
--- RESTServer.java	12 Sep 2004 13:12:22 -0000	1.17
***************
*** 341,350 ****
  					broker.saveCollection(collection);
  				}
! 				String url;
! 				try {
! 					url = new URI(tempFile.toURL().toString()).toASCIIString();
! 				} catch (URISyntaxException e1) {
! 					url = tempFile.toString();
! 				}
  				if(contentType == null || contentType.equalsIgnoreCase("text/xml")) {
  					DocumentImpl doc = collection.addDocument(broker, docPath,
--- 341,345 ----
  					broker.saveCollection(collection);
  				}
! 				String url = tempFile.toURI().toASCIIString();
  				if(contentType == null || contentType.equalsIgnoreCase("text/xml")) {
  					DocumentImpl doc = collection.addDocument(broker, docPath,

[Exist-commits] eXist-1.0/src/org/exist/http/webdav/methods Put.java,1.5,1.6

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

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

Modified Files:
	Put.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: Put.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/methods/Put.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Put.java	6 Aug 2004 17:36:36 -0000	1.5
--- Put.java	12 Sep 2004 13:12:22 -0000	1.6
***************
*** 66,75 ****
  			HttpServletResponse response, String path) throws ServletException, IOException {
  		File tempFile = saveRequestContent(request);
! 		String url;
! 		try {
! 			url = new URI(tempFile.toURL().toString()).toASCIIString();
! 		} catch (URISyntaxException e1) {
! 			url = tempFile.toString();
! 		}
  		String contentType = request.getContentType();
  		DBBroker broker = null;
--- 66,70 ----
  			HttpServletResponse response, String path) throws ServletException, IOException {
  		File tempFile = saveRequestContent(request);
! 		String url = tempFile.toURI().toASCIIString();
  		String contentType = request.getContentType();
  		DBBroker broker = null;

[Exist-commits] eXist-1.0/src/org/exist/xquery XQueryContext.java,1.23,1.24

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

Modified Files:
	XQueryContext.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: XQueryContext.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/XQueryContext.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** XQueryContext.java	12 Sep 2004 09:25:14 -0000	1.23
--- XQueryContext.java	12 Sep 2004 13:12:23 -0000	1.24
***************
*** 815,822 ****
  							throw new XPathException("cannot read module source from file at " + f.getAbsolutePath());
  					}
! 					try {
! 						location = new URI(f.toURL().toString()).toASCIIString();
! 					} catch (Exception e1) {
! 					}
  				}
  				LOG.debug("Loading module from " + location);
--- 815,819 ----
  							throw new XPathException("cannot read module source from file at " + f.getAbsolutePath());
  					}
! 					location = f.toURI().toASCIIString();
  				}
  				LOG.debug("Loading module from " + location);

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

[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-serv4679/src/org/exist/backup

Modified Files:
	Restore.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: Restore.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/backup/Restore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Restore.java	21 Jun 2004 15:27:37 -0000	1.11
--- Restore.java	12 Sep 2004 13:12:22 -0000	1.12
***************
*** 123,129 ****
  			while(!stack.isEmpty()) {
  				contents = (File) stack.pop();
! 				String sysId = contents.toURL().toString();
! 				InputSource is = new InputSource(new FileInputStream(contents));
! 				is.setSystemId(sysId);
  				is.setEncoding("UTF-8");
  				System.out.println("restoring " + sysId);
--- 123,128 ----
  			while(!stack.isEmpty()) {
  				contents = (File) stack.pop();
! 				String sysId = contents.toURI().toASCIIString();
! 				InputSource is = new InputSource(sysId);
  				is.setEncoding("UTF-8");
  				System.out.println("restoring " + sysId);

[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalCollection.java,1.43,1.44

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

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

Modified Files:
	LocalCollection.java 
Log Message:
Replaced all occurrences of new URI(file.toURL().toString()).toASCIIString(); to file.toURI().toASCIIString(); (patch by Piotr).

Index: LocalCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollection.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** LocalCollection.java	12 Sep 2004 09:25:15 -0000	1.43
--- LocalCollection.java	12 Sep 2004 13:12:21 -0000	1.44
***************
*** 571,576 ****
  			String name = res.getDocumentId();
  			String uri = null;
! 			if(res.file != null)
! 				uri = new URI(res.file.toURL().toString()).toASCIIString();
  			DocumentImpl newDoc;
  			Collection collection = broker.openCollection(path, Lock.WRITE_LOCK);
--- 571,575 ----
  			String name = res.getDocumentId();
  			String uri = null;
! 			if(res.file != null) uri = res.file.toURI().toASCIIString();
  			DocumentImpl newDoc;
  			Collection collection = broker.openCollection(path, Lock.WRITE_LOCK);

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

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

Modified Files:
	QNameValue.java 
Log Message:
Set correct prefix in getStringValue as suggested by finder.

Index: QNameValue.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/QNameValue.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QNameValue.java	29 Jun 2004 14:23:26 -0000	1.3
--- QNameValue.java	12 Sep 2004 12:56:28 -0000	1.4
***************
*** 57,60 ****
--- 57,61 ----
  				throw new XPathException(
  					"namespace " + qname.getNamespaceURI() + " is not defined");
+ 			qname.setPrefix(prefix);
  	    }
  		return qname.toString();