[Exist-commits] eXist-1.0/src/org/exist/xmldb/test/concurrent ConcurrentXUpdateTest.java,1.5,1.6 XQueryAction.java,1.2,1.3

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

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

Modified Files:
	ConcurrentXUpdateTest.java XQueryAction.java 
Log Message:
Various fixes.

Index: XQueryAction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/concurrent/XQueryAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XQueryAction.java	31 Oct 2004 18:11:45 -0000	1.2
--- XQueryAction.java	28 Nov 2004 13:48:36 -0000	1.3
***************
*** 50,53 ****
--- 50,55 ----
  	 */
  	public boolean execute() throws Exception {
+ 	    Thread.currentThread().setName("XQuery Thread");
+ 	    
  		Collection col = DatabaseManager.getCollection(collectionPath);
  		System.out.println(Thread.currentThread().getName() + ": executing query: " + xquery);

Index: ConcurrentXUpdateTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/test/concurrent/ConcurrentXUpdateTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConcurrentXUpdateTest.java	12 Oct 2004 21:10:54 -0000	1.5
--- ConcurrentXUpdateTest.java	28 Nov 2004 13:48:36 -0000	1.6
***************
*** 50,56 ****
  		DBUtils.addXMLResource(getTestCollection(), "R1.xml", tempFile);
  		
  		addAction(new RemoveAppendAction(URI + "/C1", "R1.xml", wordList), 10, 500, 500);
  		addAction(new RemoveAppendAction(URI + "/C1", "R1.xml", wordList), 10, 300, 500);
! 		addAction(new RetrieveResourceAction(URI + "/C1", "R1.xml"), 10, 1000, 2000);
  	}
  	
--- 50,59 ----
  		DBUtils.addXMLResource(getTestCollection(), "R1.xml", tempFile);
  		
+ 		String query = "/ROOT-ELEMENT//ELEMENT-1[@attribute-3]";
+ 		
  		addAction(new RemoveAppendAction(URI + "/C1", "R1.xml", wordList), 10, 500, 500);
  		addAction(new RemoveAppendAction(URI + "/C1", "R1.xml", wordList), 10, 300, 500);
! //		addAction(new RetrieveResourceAction(URI + "/C1", "R1.xml"), 10, 1000, 2000);
! 		addAction(new XQueryAction(URI + "/C1", "R1.xml", query), 20, 100, 100);
  	}