exist-commits Mailing List for eXist-db

Revision: 8792
          http://exist.svn.sourceforge.net/exist/?rev=8792&view=rev
Author:   ellefj
Date:     2009-03-31 20:05:23 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
[ignore] eclipse mylyn settings for sourceforge.net tasks via web connector.

Added Paths:
-----------
    trunk/eXist/.settings/
    trunk/eXist/.settings/org.eclipse.mylyn.tasks.ui.prefs

Added: trunk/eXist/.settings/org.eclipse.mylyn.tasks.ui.prefs
===================================================================
--- trunk/eXist/.settings/org.eclipse.mylyn.tasks.ui.prefs	                        (rev 0)
+++ trunk/eXist/.settings/org.eclipse.mylyn.tasks.ui.prefs	2009-03-31 20:05:23 UTC (rev 8792)
@@ -0,0 +1,4 @@
+#Mon Mar 30 17:11:18 CEST 2009
+eclipse.preferences.version=1
+project.repository.kind=web
+project.repository.url=http\://sourceforge.net


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8791
          http://exist.svn.sourceforge.net/exist/?rev=8791&view=rev
Author:   wolfgang_m
Date:     2009-03-31 11:22:31 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
[ignore] increase default setting for xupdate/allowed-fragmentation in conf.xml. Fragmentation is now less a problem than it used to be.

Modified Paths:
--------------
    trunk/eXist/conf.xml.tmpl

Modified: trunk/eXist/conf.xml.tmpl
===================================================================
--- trunk/eXist/conf.xml.tmpl	2009-03-31 11:20:22 UTC (rev 8790)
+++ trunk/eXist/conf.xml.tmpl	2009-03-31 11:22:31 UTC (rev 8791)
@@ -768,6 +768,6 @@
             containing valid nodes.
         
     -->
-    <xupdate allowed-fragmentation="5" enable-consistency-checks="no"/>
+    <xupdate allowed-fragmentation="100" enable-consistency-checks="no"/>
 
 </exist>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8790
          http://exist.svn.sourceforge.net/exist/?rev=8790&view=rev
Author:   wolfgang_m
Date:     2009-03-31 11:20:22 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
[feature] extended the module configuration in conf.xml to allow XQuery source files to be registered for a given module URI. This way, you don't need to provide an "at" clause for every "import module".

Modified Paths:
--------------
    trunk/eXist/conf.xml.tmpl
    trunk/eXist/src/org/exist/util/Configuration.java
    trunk/eXist/src/org/exist/xquery/XQueryContext.java

Modified: trunk/eXist/conf.xml.tmpl
===================================================================
--- trunk/eXist/conf.xml.tmpl	2009-03-30 17:40:54 UTC (rev 8789)
+++ trunk/eXist/conf.xml.tmpl	2009-03-31 11:20:22 UTC (rev 8790)
@@ -712,6 +712,10 @@
                 uri="http://exist-db.org/xquery/lucene"/>
 			-->
 
+			<!-- Versioning -->
+			<!--module src="resource:org/exist/versioning/xquery/versioning.xqm"
+				uri="http://exist-db.org/versioning"/-->
+
             <!-- Optional Modules -->
             <!--
             <module class="org.exist.xquery.modules.compression.CompressionModule"

Modified: trunk/eXist/src/org/exist/util/Configuration.java
===================================================================
--- trunk/eXist/src/org/exist/util/Configuration.java	2009-03-30 17:40:54 UTC (rev 8789)
+++ trunk/eXist/src/org/exist/util/Configuration.java	2009-03-31 11:20:22 UTC (rev 8790)
@@ -430,8 +430,11 @@
         LOG.debug(XQueryContext.PROPERTY_XQUERY_RAISE_ERROR_ON_FAILED_RETRIEVAL + ": " + config.get(XQueryContext.PROPERTY_XQUERY_RAISE_ERROR_ON_FAILED_RETRIEVAL));
         
         //built-in-modules
-        Map moduleMap = XQueryContext.loadModuleClasses(xquery);
-        config.put(XQueryContext.PROPERTY_BUILT_IN_MODULES, moduleMap);
+        Map classMap = new HashMap();
+        Map knownMappings = new HashMap();
+        XQueryContext.loadModuleClasses(xquery, classMap, knownMappings);
+        config.put(XQueryContext.PROPERTY_BUILT_IN_MODULES, classMap);
+        config.put(XQueryContext.PROPERTY_STATIC_MODULE_MAP, knownMappings);
     }
     
     public void configureXACML(Element xacml) {

Modified: trunk/eXist/src/org/exist/xquery/XQueryContext.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/XQueryContext.java	2009-03-30 17:40:54 UTC (rev 8789)
+++ trunk/eXist/src/org/exist/xquery/XQueryContext.java	2009-03-31 11:20:22 UTC (rev 8790)
@@ -122,7 +122,8 @@
 	//TODO : move elsewhere ?
 	public static final String CONFIGURATION_MODULE_ELEMENT_NAME = "module";
 	public static final String BUILT_IN_MODULE_URI_ATTRIBUTE = "uri";
-	public static final String BUILT_IN_MODULE_CLASS_ATTRIBUTE = "class";	
+	public static final String BUILT_IN_MODULE_CLASS_ATTRIBUTE = "class";
+    public static final String BUILT_IN_MODULE_SOURCE_ATTRIBUTE = "src";
 
 	public static final String PROPERTY_XQUERY_BACKWARD_COMPATIBLE = "xquery.backwardCompatible";
 	public static final String PROPERTY_ENABLE_QUERY_REWRITING = "xquery.enable-query-rewriting";
@@ -131,6 +132,7 @@
 
 	//TODO : move elsewhere ?
 	public static final String PROPERTY_BUILT_IN_MODULES = "xquery.modules";
+    public static final String PROPERTY_STATIC_MODULE_MAP = "xquery.modules.static";
 	
 	private static final String JAVA_URI_START = "java:";
     //private static final String XMLDB_URI_START = "xmldb:exist://";
@@ -2064,9 +2066,13 @@
 			// Set locally to remember the dependency in case it was inherited.
 			setModule(namespaceURI, module);
 		} else {
-			if(location == null)
-				location = namespaceURI;
-			
+			if(location == null) {
+                // check if there's a static mapping in the configuration
+                location = getModuleLocation(namespaceURI);
+                if (location == null)
+				    location = namespaceURI;
+            }
+
 			//Is the module's namespace mapped to a URL ?
 			if (mappedModules.containsKey(location))
 				location = mappedModules.get(location).toString();
@@ -2132,7 +2138,12 @@
 			prefix = module.getDefaultPrefix();
 		declareNamespace(prefix, namespaceURI);
 	}
-	
+
+    private String getModuleLocation(String namespaceURI) {
+        Map moduleMap = (Map) broker.getConfiguration().getProperty(PROPERTY_STATIC_MODULE_MAP);
+        return (String) moduleMap.get(namespaceURI);
+    }
+
 	private ExternalModule compileOrBorrowModule(String prefix, String namespaceURI, String location, Source source) throws XPathException {
 		ExternalModule module = broker.getBrokerPool().getXQueryPool().borrowModule(broker, source, this);
 		if (module == null) {
@@ -2152,10 +2163,6 @@
 	}
 
     /**
-     * @param namespaceURI
-     * @param location
-     * @param module
-     * @param source
      * @return The compiled module.
      * @throws XPathException
      */
@@ -2682,8 +2689,8 @@
      * @return class name mapped to Class object.
      * @throws DatabaseConfigurationException
      */
-    public static Map loadModuleClasses(Element xquery) throws DatabaseConfigurationException {
-        Map classMap = new HashMap();
+    public static void loadModuleClasses(Element xquery, Map classMap, Map externalMap)
+        throws DatabaseConfigurationException {
         // add the standard function module
         classMap.put(Namespaces.XPATH_FUNCTIONS_NS, org.exist.xquery.functions.ModuleImpl.class);
         // add other modules specified in configuration
@@ -2696,19 +2703,26 @@
 	                elem = (Element) modules.item(i);
 	                String uri = elem.getAttribute(XQueryContext.BUILT_IN_MODULE_URI_ATTRIBUTE);
 	                String clazz = elem.getAttribute(XQueryContext.BUILT_IN_MODULE_CLASS_ATTRIBUTE);
+                    String source = elem.getAttribute(XQueryContext.BUILT_IN_MODULE_SOURCE_ATTRIBUTE);
 	                if (uri == null)
 	                    throw new DatabaseConfigurationException("element 'module' requires an attribute 'uri'");
-	                if (clazz == null)
-	                    throw new DatabaseConfigurationException("element 'module' requires an attribute 'class'");
-
-                    Class mClass = lookupModuleClass(uri, clazz);
-                    if (mClass != null)
-                        classMap.put(uri, mClass);
-                    LOG.debug("Configured module '" + uri + "' implemented in '" + clazz + "'");
+	                if (clazz == null && source == null)
+	                    throw new DatabaseConfigurationException("element 'module' requires either an attribute " +
+                                "'class' or 'src'");
+                    if (source != null) {
+                        externalMap.put(uri, source);
+                        if (LOG.isDebugEnabled())
+                            LOG.debug("Registered mapping for module '" + uri + "' to '" + source + "'");
+                    } else {
+                        Class mClass = lookupModuleClass(uri, clazz);
+                        if (mClass != null)
+                            classMap.put(uri, mClass);
+                        if (LOG.isDebugEnabled())
+                            LOG.debug("Configured module '" + uri + "' implemented in '" + clazz + "'");
+                    }
                 }
             }
         }
-        return classMap;
     }
 
     private static Class lookupModuleClass(String uri, String clazz) throws DatabaseConfigurationException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8789
          http://exist.svn.sourceforge.net/exist/?rev=8789&view=rev
Author:   dizzzz
Date:     2009-03-30 17:40:54 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
[lib-update] upgrade of quartz library

Modified Paths:
--------------
    trunk/eXist/.classpath
    trunk/eXist/nbproject/project.properties

Added Paths:
-----------
    trunk/eXist/lib/core/quartz-1.6.5.jar

Removed Paths:
-------------
    trunk/eXist/lib/core/quartz-1.6.4.jar

Modified: trunk/eXist/.classpath
===================================================================
--- trunk/eXist/.classpath	2009-03-30 17:34:22 UTC (rev 8788)
+++ trunk/eXist/.classpath	2009-03-30 17:40:54 UTC (rev 8789)
@@ -97,7 +97,7 @@
 	<classpathentry kind="lib" path="tools/wrapper/lib/wrapper.jar"/>
 	<classpathentry kind="lib" path="lib/cocoon/avalon-framework-api-4.1.5.jar"/>
 	<classpathentry kind="lib" path="lib/core/jta-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/core/quartz-1.6.4.jar"/>
+	<classpathentry kind="lib" path="lib/core/quartz-1.6.5.jar"/>
 	<classpathentry kind="lib" path="lib/core/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/core/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/endorsed/resolver-1.2.jar"/>

Deleted: trunk/eXist/lib/core/quartz-1.6.4.jar
===================================================================
(Binary files differ)

Added: trunk/eXist/lib/core/quartz-1.6.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/eXist/lib/core/quartz-1.6.5.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/eXist/nbproject/project.properties
===================================================================
--- trunk/eXist/nbproject/project.properties	2009-03-30 17:34:22 UTC (rev 8788)
+++ trunk/eXist/nbproject/project.properties	2009-03-30 17:40:54 UTC (rev 8789)
@@ -104,7 +104,7 @@
     ${file.reference.jline-0.9.5.jar}:\
     ${file.reference.jta-1.1.jar}:\
     ${file.reference.log4j-1.2.15.jar}:\
-    ${file.reference.quartz-1.6.4.jar}:\
+    ${file.reference.quartz-1.6.5.jar}:\
     ${file.reference.stax-api-1.0.1.jar}:\
     ${file.reference.sunxacml-1.2.jar}:\
     ${file.reference.ws-commons-util-1.0.2.jar}:\
@@ -169,7 +169,7 @@
     ${file.reference.jmock-junit4-2.4.0.jar}
 file.reference.excalibur-io-1.1.jar=lib/cocoon/excalibur-io-1.1.jar
 javadoc.noindex=false
-file.reference.quartz-1.6.4.jar=lib/core/quartz-1.6.4.jar
+file.reference.quartz-1.6.5.jar=lib/core/quartz-1.6.5.jar
 file.reference.util.concurrent-1.3.4.jar=lib/cocoon/util.concurrent-1.3.4.jar
 file.reference.javacImpl-0.9.jar=lib/cocoon/javacImpl-0.9.jar
 file.reference.avalon-framework-api-4.1.5.jar=lib/cocoon/avalon-framework-api-4.1.5.jar


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8788
          http://exist.svn.sourceforge.net/exist/?rev=8788&view=rev
Author:   wolfgang_m
Date:     2009-03-30 17:34:22 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
[documentation] added some performance tuning notes about fn:id, regular expression matching and a warning about potentially slow JVMs on Mac OSX.

Modified Paths:
--------------
    trunk/eXist/webapp/tuning.xml

Modified: trunk/eXist/webapp/tuning.xml
===================================================================
--- trunk/eXist/webapp/tuning.xml	2009-03-30 17:27:05 UTC (rev 8787)
+++ trunk/eXist/webapp/tuning.xml	2009-03-30 17:34:22 UTC (rev 8788)
@@ -12,7 +12,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sidebar.xml"/>
     <chapter>
         <title>Tuning the Database</title>
-                
+        
         <section>
             <title>Cache settings</title>
             
@@ -52,6 +52,17 @@
         </section>
         
         <section>
+            <title>Problems with certain JVMs</title>
+            
+            <para>In some cases, huge differences could be observed between Java virtual machine
+                implementations. In particular, it has been reported that storing the same data
+                on a laptop running Mac OS X could sometimes be up to 15 times slower than on windows 
+                or GNU/Linux. This is just an observation based on the teaching experience of 
+                some users and should not be generalized. However, it might be worth to test 
+                different JVMs.</para>
+        </section>
+        
+        <section>
             <title>Index configuration</title>
 
             <section>
@@ -396,6 +407,42 @@
 
                 <para>The second query should be several times faster than the first one.</para>
             </section>
+
+			<section>
+				<title>Match regular expressions against the start of a string</title>
+
+				<para>Function fn:matches returns true if any substring of its argument string matches
+					the regular expression. The query engine thus needs to scan all index entries as the match
+					could be at any position of an entry.</para>
+					
+				<para>You can reduce the range of entries to be scanned by anchoring your pattern at the start
+					of a string (where applicable):</para>
+
+				<synopsis language="xquery"><![CDATA[fn:matches($str, "^XQuery")]]></synopsis>
+			</section>
+            
+            <section>
+                <title>Use fn:id to lookup xml:id attributes</title>
+                
+                <para>eXist automatically indexes all xml:id attributes and other attributes
+                with type ID as declared in a DTD (only if validation is enabled). This automatic
+                index is used by the standard id functions and provides a fast way to look up
+                an element. For example,</para>
+                
+                <synopsis language="xquery">id("sect1")/head</synopsis>
+                
+                <para>locates the element with id "sect1" and returns its <sgmltag>head</sgmltag>
+                child. This is done through a fast index lookup. However, please note that
+                the equivalent expression</para>
+                
+                <synopsis language="xquery">//section[@xml:id = 'sect1']/head</synopsis>
+                
+                <para>will <emphasis>NOT</emphasis> use the id index (you will need to declare
+                an extra range index for that).</para>
+                
+                <para>Please be also aware that larger xml:id values cost performance as has been
+                    reported by some users working with large databases.</para>
+            </section>
         </section>
         <section>
             <title>Known Issues in the 1.2.x Series</title>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8787
          http://exist.svn.sourceforge.net/exist/?rev=8787&view=rev
Author:   ellefj
Date:     2009-03-30 17:27:05 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
[ignore] small fixes in .classpath

Modified Paths:
--------------
    trunk/eXist/.classpath

Modified: trunk/eXist/.classpath
===================================================================
--- trunk/eXist/.classpath	2009-03-30 11:14:41 UTC (rev 8786)
+++ trunk/eXist/.classpath	2009-03-30 17:27:05 UTC (rev 8787)
@@ -90,6 +90,7 @@
 	<classpathentry kind="lib" path="thirdparty/tomcat5/server/lib/catalina-5.0.28.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/ant.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/junit-4.5.jar"/>
+	<classpathentry kind="lib" path="tools/ant/lib/svnkit.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.2.jar"/>
 	<classpathentry kind="lib" path="tools/ircbot/lib/pircbot.jar"/>
 	<classpathentry kind="lib" path="tools/jetty/lib/org.mortbay.jetty.jar"/>
@@ -105,7 +106,6 @@
 	<classpathentry kind="lib" path="lib/optional/onvdl-20070517.jar"/>
 	<classpathentry kind="lib" path="lib/endorsed/xalan-2.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/user/fop.jar"/>
-	<classpathentry kind="lib" path="lib/user/svnkit.jar"/>
-	<classpathentry kind="lib" path="lib/user/mail.jar"/>
+	<classpathentry kind="lib" path="lib/user/mail-1.4.2.jar"/>
 	<classpathentry kind="output" path="test/classes"/>
 </classpath>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8786
          http://exist.svn.sourceforge.net/exist/?rev=8786&view=rev
Author:   wolfgang_m
Date:     2009-03-30 11:14:41 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
[bugfix] further bug fixes concerning the evaluation of positional predicates: fixed processing of expressions like //(p)[2], /(.//p)[2] and similar.

Modified Paths:
--------------
    trunk/eXist/src/org/exist/dom/NodeProxy.java
    trunk/eXist/src/org/exist/memtree/InMemoryNodeSet.java
    trunk/eXist/src/org/exist/xquery/AbstractExpression.java
    trunk/eXist/src/org/exist/xquery/ElementConstructor.java
    trunk/eXist/src/org/exist/xquery/Expression.java
    trunk/eXist/src/org/exist/xquery/ExtensionExpression.java
    trunk/eXist/src/org/exist/xquery/FilteredExpression.java
    trunk/eXist/src/org/exist/xquery/PathExpr.java
    trunk/eXist/src/org/exist/xquery/Predicate.java
    trunk/eXist/src/org/exist/xquery/SimpleStep.java
    trunk/eXist/src/org/exist/xquery/Step.java
    trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
    trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java
    trunk/eXist/src/org/exist/xquery/value/MemoryNodeSet.java
    trunk/eXist/src/org/exist/xquery/value/ValueSequence.java

Modified: trunk/eXist/src/org/exist/dom/NodeProxy.java
===================================================================
--- trunk/eXist/src/org/exist/dom/NodeProxy.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/dom/NodeProxy.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -548,28 +548,28 @@
      * @param contextId an <code>int</code> value
      */
     public void clearContext(int contextId) {
-        context = null;
-        return;
-	//        if (contextId == Expression.IGNORE_CONTEXT) {
-	//            context = null;
-	//            return;
-	//        }
-	//        ContextItem newContext = null;
-	//        ContextItem last = null;
-	//        ContextItem next = context;
-	//        while (next != null) {
-	//            if (next.getContextId() != contextId) {
-	//                if (newContext == null) {
-	//                    newContext = next;
-	//                } else {
-	//                    last.setNextContextItem(next);
-	//                }
-	//                last = next;
-	//                last.setNextContextItem(null);
-	//            }
-	//            next = next.getNextDirect();
-	//        }
-	//        this.context = newContext;
+//        context = null;
+//        return;
+	        if (contextId == Expression.IGNORE_CONTEXT) {
+	            context = null;
+	            return;
+	        }
+	        ContextItem newContext = null;
+	        ContextItem last = null;
+	        ContextItem next = context;
+	        while (next != null) {
+	            if (next.getContextId() != contextId) {
+	                if (newContext == null) {
+	                    newContext = next;
+	                } else {
+	                    last.setNextContextItem(next);
+	                }
+	                last = next;
+	                last.setNextContextItem(null);
+	            }
+	            next = next.getNextDirect();
+	        }
+	        this.context = newContext;
     }
 
     /**

Modified: trunk/eXist/src/org/exist/memtree/InMemoryNodeSet.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/InMemoryNodeSet.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/memtree/InMemoryNodeSet.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -65,6 +65,16 @@
         return nodes;
     }
 
+    public Sequence getChildrenForParent(NodeImpl parent) {
+        InMemoryNodeSet nodes = new InMemoryNodeSet();
+        for (int i = 0; i <= size; i++) {
+            NodeImpl node = (NodeImpl) values[i];
+            if (node.getNodeId().isChildOf(parent.getNodeId()))
+                nodes.add(node);
+        }
+        return nodes;
+    }
+
     public Sequence getDescendants(boolean includeSelf, NodeTest test) throws XPathException {
         InMemoryNodeSet nodes = new InMemoryNodeSet();
         for (int i = 0; i <= size; i++) {

Modified: trunk/eXist/src/org/exist/xquery/AbstractExpression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/AbstractExpression.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/AbstractExpression.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -97,7 +97,11 @@
 	
 	public void setPrimaryAxis(int axis) {
 	}
-	
+
+    public int getPrimaryAxis() {
+        return Constants.UNKNOWN_AXIS;
+    }
+
     /* (non-Javadoc)
      * @see org.exist.xquery.Expression#setContextDocSet(org.exist.dom.DocumentSet)
      */

Modified: trunk/eXist/src/org/exist/xquery/ElementConstructor.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/ElementConstructor.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/ElementConstructor.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -344,9 +344,15 @@
 	public void setPrimaryAxis(int axis) {
 		if(content != null)
 			content.setPrimaryAxis(axis);
-	} 
+	}
 
-	/* (non-Javadoc)
+    public int getPrimaryAxis() {
+        if (content != null)
+            content.getPrimaryAxis();
+        return Constants.UNKNOWN_AXIS;
+    }
+
+    /* (non-Javadoc)
 	 * @see org.exist.xquery.AbstractExpression#resetState()
 	 */
 	public void resetState(boolean postOptimization) {

Modified: trunk/eXist/src/org/exist/xquery/Expression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Expression.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/Expression.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -141,7 +141,9 @@
 		throws XPathException;
 	
 	public void setPrimaryAxis(int axis);
-	
+
+    public int getPrimaryAxis();
+    
 	/**
 	 * The static return type of the expression.
 	 *

Modified: trunk/eXist/src/org/exist/xquery/ExtensionExpression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/ExtensionExpression.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/ExtensionExpression.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -148,9 +148,13 @@
         innerExpression.setPrimaryAxis(axis);            
     }
 
+    public int getPrimaryAxis() {
+        return innerExpression.getPrimaryAxis();
+    }
+
     /* (non-Javadoc)
-     * @see org.exist.xquery.AbstractExpression#resetState()
-     */
+    * @see org.exist.xquery.AbstractExpression#resetState()
+    */
     public void resetState(boolean postOptimization) {
         super.resetState(postOptimization);
         innerExpression.resetState(postOptimization);

Modified: trunk/eXist/src/org/exist/xquery/FilteredExpression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/FilteredExpression.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/FilteredExpression.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -23,8 +23,10 @@
 package org.exist.xquery;
 
 import org.exist.xquery.util.ExpressionDumper;
-import org.exist.xquery.value.Item;
-import org.exist.xquery.value.Sequence;
+import org.exist.xquery.value.*;
+import org.exist.dom.NodeSet;
+import org.exist.memtree.InMemoryNodeSet;
+import org.exist.memtree.NodeImpl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -40,6 +42,7 @@
 public class FilteredExpression extends AbstractExpression {
 
 	final protected Expression expression;
+    protected boolean abbreviated = false;
 	final protected List predicates = new ArrayList(2);
     private Expression parent;
     
@@ -98,13 +101,38 @@
 		Sequence seq = expression.eval(contextSequence, contextItem);
 		if (seq.isEmpty())
 			result = Sequence.EMPTY_SEQUENCE;
-        else {            
-//    		seq.setSelfAsContext();
-    		result = seq;           
-    		for (Iterator i = predicates.iterator(); i.hasNext();) {
-                Predicate pred = (Predicate) i.next();
-    			result = pred.evalPredicate(contextSequence, result, Constants.DESCENDANT_SELF_AXIS);
-    		}
+        else {
+            Predicate pred = (Predicate) predicates.get(0);
+            // If the current step is an // abbreviated step, we have to treat the predicate
+            // specially to get the context position right. //a[1] translates to /descendant-or-self::node()/a[1],
+            // so we need to return the 1st a from any parent of a.
+            //
+            // If the predicate is known to return a node set, no special treatment is required.
+            if (abbreviated &&
+                    (pred.getExecutionMode() != Predicate.NODE || !seq.isPersistentSet())) {
+                result = new ValueSequence();
+                if (seq.isPersistentSet()) {
+                    NodeSet contextSet = seq.toNodeSet();
+                    Sequence outerSequence = contextSet.getParents(getExpressionId());
+                    for (SequenceIterator i = outerSequence.iterate(); i.hasNext(); ) {
+                        NodeValue node = (NodeValue) i.nextItem();
+                        Sequence newContextSeq =
+                                contextSet.selectParentChild((NodeSet) node, NodeSet.DESCENDANT, getExpressionId());
+                        Sequence temp = processPredicate(outerSequence, newContextSeq);
+                        result.addAll(temp);
+                    }
+                } else {
+                    MemoryNodeSet nodes = seq.toMemNodeSet();
+                    Sequence outerSequence = nodes.getParents(new AnyNodeTest());
+                    for (SequenceIterator i = outerSequence.iterate(); i.hasNext(); ) {
+                        NodeValue node = (NodeValue) i.nextItem();
+                        Sequence newSet = nodes.getChildrenForParent((NodeImpl) node);
+                        Sequence temp = processPredicate(outerSequence, newSet);
+                        result.addAll(temp);
+                    }
+                }
+            } else
+                result = processPredicate(contextSequence, seq);
         }
         
         if (context.getProfiler().isEnabled())           
@@ -113,9 +141,17 @@
 		return result;
 	}
 
-	/* (non-Javadoc)
-     * @see org.exist.xquery.Expression#dump(org.exist.xquery.util.ExpressionDumper)
-     */
+    private Sequence processPredicate(Sequence contextSequence, Sequence seq) throws XPathException {
+        for (Iterator i = predicates.iterator(); i.hasNext();) {
+            Predicate pred = (Predicate) i.next();
+            seq = pred.evalPredicate(contextSequence, seq, Constants.DESCENDANT_SELF_AXIS);
+        }
+        return seq;
+    }
+
+    /* (non-Javadoc)
+    * @see org.exist.xquery.Expression#dump(org.exist.xquery.util.ExpressionDumper)
+    */
     public void dump(ExpressionDumper dumper) {
         expression.dump(dumper);
         for (Iterator i = predicates.iterator(); i.hasNext();) {
@@ -157,7 +193,15 @@
 	public void setPrimaryAxis(int axis) {
 		expression.setPrimaryAxis(axis);
 	}
-	
+
+    public int getPrimaryAxis() {
+        return expression.getPrimaryAxis();
+    }
+
+    public void setAbbreviated(boolean abbrev) {
+        abbreviated = abbrev;
+    }
+    
 	/* (non-Javadoc)
 	 * @see org.exist.xquery.AbstractExpression#getDependencies()
 	 */

Modified: trunk/eXist/src/org/exist/xquery/PathExpr.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/PathExpr.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/PathExpr.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -435,11 +435,17 @@
             ((Expression)steps.get(0)).setPrimaryAxis(axis);
     }
 
+    public int getPrimaryAxis() {
+        if (steps.size() > 0)
+            return ((Expression)steps.get(0)).getPrimaryAxis();
+        return Constants.UNKNOWN_AXIS;
+    }
+
     /*
-     * (non-Javadoc)
-     * 
-     * @see org.exist.xquery.AbstractExpression#resetState()
-     */
+    * (non-Javadoc)
+    *
+    * @see org.exist.xquery.AbstractExpression#resetState()
+    */
     public void resetState(boolean postOptimization) {
     	super.resetState(postOptimization);
     	for (int i = 0; i < steps.size(); i++) {

Modified: trunk/eXist/src/org/exist/xquery/Predicate.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Predicate.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/Predicate.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -422,6 +422,7 @@
 				    		temp.add(contextNode.getNode());
 				    	contextNode = contextNode.getNextDirect();
 				    }
+                    p.clearContext(getExpressionId());
                     //TODO : understand why we sort here...
 				    temp.sortInDocumentOrder();
 

Modified: trunk/eXist/src/org/exist/xquery/SimpleStep.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/SimpleStep.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/SimpleStep.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -119,4 +119,8 @@
 	public void setPrimaryAxis(int axis) {
 		expression.setPrimaryAxis(axis);
 	}
+
+    public int getPrimaryAxis() {
+        return expression.getPrimaryAxis();
+    }
 }

Modified: trunk/eXist/src/org/exist/xquery/Step.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Step.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/Step.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -114,6 +114,10 @@
 		this.axis = axis;
 	}
 
+    public int getPrimaryAxis() {
+        return this.axis;
+    }
+
     public boolean isAbbreviated() {
         return abbreviatedStep;
     }

Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g	2009-03-30 11:14:41 UTC (rev 8786)
@@ -1677,7 +1677,8 @@
 					if(((LocationStep) rightStep).getAxis() == Constants.UNKNOWN_AXIS)
 						((LocationStep) rightStep).setAxis(Constants.CHILD_AXIS);
 				} else {
-					rightStep.setPrimaryAxis(Constants.CHILD_AXIS);
+					if (rightStep.getPrimaryAxis() == Constants.UNKNOWN_AXIS)
+						rightStep.setPrimaryAxis(Constants.CHILD_AXIS);
 					if(rightStep instanceof VariableReference) {
 						rightStep = new SimpleStep(context, Constants.CHILD_AXIS, rightStep);
 						path.replaceLastExpression(rightStep);
@@ -1713,7 +1714,9 @@
 					if(rightStep instanceof VariableReference) {
 						rightStep = new SimpleStep(context, Constants.DESCENDANT_SELF_AXIS, rightStep);
 						path.replaceLastExpression(rightStep);
-					}
+					} else if (rightStep instanceof FilteredExpression)
+						((FilteredExpression)rightStep).setAbbreviated(true);
+
 				}
 			}
 		)?

Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -6330,7 +6330,8 @@
 									if(((LocationStep) rightStep).getAxis() == Constants.UNKNOWN_AXIS)
 										((LocationStep) rightStep).setAxis(Constants.CHILD_AXIS);
 								} else {
-									rightStep.setPrimaryAxis(Constants.CHILD_AXIS);
+									if (rightStep.getPrimaryAxis() == Constants.UNKNOWN_AXIS)
+										rightStep.setPrimaryAxis(Constants.CHILD_AXIS);
 									if(rightStep instanceof VariableReference) {
 										rightStep = new SimpleStep(context, Constants.CHILD_AXIS, rightStep);
 										path.replaceLastExpression(rightStep);
@@ -6483,7 +6484,9 @@
 									if(rightStep instanceof VariableReference) {
 										rightStep = new SimpleStep(context, Constants.DESCENDANT_SELF_AXIS, rightStep);
 										path.replaceLastExpression(rightStep);
-									}
+									} else if (rightStep instanceof FilteredExpression)
+										((FilteredExpression)rightStep).setAbbreviated(true);
+				
 								}
 							
 				break;

Modified: trunk/eXist/src/org/exist/xquery/value/MemoryNodeSet.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/MemoryNodeSet.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/value/MemoryNodeSet.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -2,6 +2,7 @@
 
 import org.exist.xquery.NodeTest;
 import org.exist.xquery.XPathException;
+import org.exist.memtree.NodeImpl;
 
 
 public interface MemoryNodeSet extends Sequence {
@@ -29,4 +30,6 @@
     public Sequence getFollowingSiblings(NodeTest test) throws XPathException;
     
     public Sequence getFollowing(NodeTest test) throws XPathException;
+
+    public Sequence getChildrenForParent(NodeImpl parent);
 }

Modified: trunk/eXist/src/org/exist/xquery/value/ValueSequence.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/ValueSequence.java	2009-03-30 10:46:08 UTC (rev 8785)
+++ trunk/eXist/src/org/exist/xquery/value/ValueSequence.java	2009-03-30 11:14:41 UTC (rev 8786)
@@ -484,6 +484,17 @@
         return nodes;
     }
 
+    public Sequence getChildrenForParent(NodeImpl parent) {
+        sortInDocumentOrder();
+        ValueSequence nodes = new ValueSequence(true);
+        for (int i = 0; i <= size; i++) {
+            NodeImpl node = (NodeImpl) values[i];
+            if (node.getNodeId().isChildOf(parent.getNodeId()))
+                nodes.add(node);
+        }
+        return nodes;
+    }
+
     public Sequence getDescendants(boolean includeSelf, NodeTest test) throws XPathException {
         sortInDocumentOrder();
         ValueSequence nodes = new ValueSequence(true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8785
          http://exist.svn.sourceforge.net/exist/?rev=8785&view=rev
Author:   dizzzz
Date:     2009-03-30 10:46:08 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
[ignore] update of javamail - api

Added Paths:
-----------
    trunk/eXist/lib/user/mail-1.4.2.jar

Removed Paths:
-------------
    trunk/eXist/lib/user/mail-1.4.1.jar

Deleted: trunk/eXist/lib/user/mail-1.4.1.jar
===================================================================
(Binary files differ)

Added: trunk/eXist/lib/user/mail-1.4.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/eXist/lib/user/mail-1.4.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8784
          http://exist.svn.sourceforge.net/exist/?rev=8784&view=rev
Author:   dizzzz
Date:     2009-03-29 19:52:07 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[ignore] added license files

Added Paths:
-----------
    trunk/eXist/lib/optional/axis-LICENSE.txt
    trunk/eXist/lib/optional/axis-NOTICE.txt
    trunk/eXist/lib/optional/axis-README.txt
    trunk/eXist/lib/optional/commons-codec-LICENSE.txt
    trunk/eXist/lib/optional/commons-discovery-LICENSE.txt
    trunk/eXist/lib/optional/commons-discovery-NOTICE.txt
    trunk/eXist/lib/optional/commons-fileupload-LICENSE.txt
    trunk/eXist/lib/optional/commons-fileupload-NOTICE.txt
    trunk/eXist/lib/optional/commons-httpclient-LICENSE.txt
    trunk/eXist/lib/optional/commons-httpclient-NOTICE.txt
    trunk/eXist/lib/optional/commons-io-LICENSE.txt
    trunk/eXist/lib/optional/commons-io-NOTICE.txt
    trunk/eXist/lib/optional/onvdl-LICENSE.txt

Removed Paths:
-------------
    trunk/eXist/lib/optional/onvdl.LICENSE.txt

Added: trunk/eXist/lib/optional/axis-LICENSE.txt
===================================================================
--- trunk/eXist/lib/optional/axis-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/axis-LICENSE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: trunk/eXist/lib/optional/axis-NOTICE.txt
===================================================================
--- trunk/eXist/lib/optional/axis-NOTICE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/axis-NOTICE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,7 @@
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache Axis distribution.        ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).

Added: trunk/eXist/lib/optional/axis-README.txt
===================================================================
--- trunk/eXist/lib/optional/axis-README.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/axis-README.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,10 @@
+Axis 1.4 depends on the following JARs stored in this directory:
+
+axis.jar
+axis-ant.jar
+commons-discovery.jar
+jaxrpc.jar
+saaj.jar
+wsdl4j.jar
+
+commons-logging.jar is also used.

Added: trunk/eXist/lib/optional/commons-codec-LICENSE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-codec-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-codec-LICENSE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: trunk/eXist/lib/optional/commons-discovery-LICENSE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-discovery-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-discovery-LICENSE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: trunk/eXist/lib/optional/commons-discovery-NOTICE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-discovery-NOTICE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-discovery-NOTICE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,5 @@
+Apache Jakarta Commons Discovery
+Copyright 2002-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Added: trunk/eXist/lib/optional/commons-fileupload-LICENSE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-fileupload-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-fileupload-LICENSE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: trunk/eXist/lib/optional/commons-fileupload-NOTICE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-fileupload-NOTICE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-fileupload-NOTICE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,5 @@
+Apache Commons FileUpload
+Copyright 2002-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Added: trunk/eXist/lib/optional/commons-httpclient-LICENSE.txt
===================================================================
--- trunk/eXist/lib/optional/commons-httpclient-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/optional/commons-httpclient-LICENSE.txt	2009-03-29 19:52:07 UTC (rev 8784)
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting ...
 
[truncated message content]

Revision: 8783
          http://exist.svn.sourceforge.net/exist/?rev=8783&view=rev
Author:   dizzzz
Date:     2009-03-29 19:25:10 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[ignore] added jar-version id's and Licence files. We could upgrade to java-mail 1.4.2...

Added Paths:
-----------
    trunk/eXist/lib/user/activation-1.1.1.jar
    trunk/eXist/lib/user/activation-LICENSE.txt
    trunk/eXist/lib/user/mail-1.4.1.jar
    trunk/eXist/lib/user/mail-LICENSE.txt

Removed Paths:
-------------
    trunk/eXist/lib/user/activation.jar
    trunk/eXist/lib/user/mail.jar

Copied: trunk/eXist/lib/user/activation-1.1.1.jar (from rev 8782, trunk/eXist/lib/user/activation.jar)
===================================================================
(Binary files differ)


Property changes on: trunk/eXist/lib/user/activation-1.1.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:mergeinfo
   + 

Added: trunk/eXist/lib/user/activation-LICENSE.txt
===================================================================
--- trunk/eXist/lib/user/activation-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/user/activation-LICENSE.txt	2009-03-29 19:25:10 UTC (rev 8783)
@@ -0,0 +1,306 @@
+A. Sun Microsystems, Inc. ("Sun") ENTITLEMENT for SOFTWARE
+
+Licensee/Company: Entity receiving Software.
+
+Effective Date: Date of delivery of the Software to You.
+
+Software: JavaBeans Activation Framework 1.1.1.
+
+License Term:  Perpetual (subject to termination under the SLA).
+
+Licensed Unit: Software Copy.
+
+Licensed unit Count: Unlimited.
+
+Permitted Uses:
+
+1. You may reproduce and use the Software for Individual, Commercial,
+or Research and Instructional Use for the purposes of designing,
+developing, testing, and running Your applets and
+application("Programs").
+
+2. Subject to the terms and conditions of this Agreement and
+restrictions and exceptions set forth in the Software's documentation,
+You may reproduce and distribute portions of Software identified as a
+redistributable in the documentation ("Redistributable"), provided
+that:
+
+(a) you distribute Redistributable complete and unmodified and only
+bundled as part of Your Programs,
+
+(b) your Programs add significant and primary functionality to the
+Redistributable,
+
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
+
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
+
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
+
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in this Agreement, and
+
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
+
+3. Java Technology Restrictions.  You may not create, modify, or change
+the behavior of, or authorize your licensees to create, modify, or
+change the behavior of, classes, interfaces, or subpackages that are in
+any way identified as "java", "javax", "sun" or similar convention as
+specified by Sun in any naming convention designation.
+
+B. Sun Microsystems, Inc. ("Sun")
+SOFTWARE LICENSE AGREEMENT
+
+READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
+SOFTWARE MEDIA PACKAGE. BY OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO
+THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
+ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
+THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE
+TO ALL OF THE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
+OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
+SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
+IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
+YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-5 OF THIS AGREEMENT
+("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
+MASTER TERMS IN RELATION TO THIS SOFTWARE.
+
+1.      Definitions.
+
+(a)     "Entitlement" means the collective set of applicable documents
+authorized by Sun evidencing your obligation to pay associated fees (if
+any) for the license, associated Services, and the authorized scope of
+use of Software under this Agreement.
+
+(b)     "Licensed Unit" means the unit of measure by which your use of
+Software and/or Service is licensed, as described in your Entitlement.
+
+(c)     "Permitted Use" means the licensed Software use(s) authorized
+in this Agreement as specified in your Entitlement. The Permitted Use
+for any bundled Sun software not specified in your Entitlement will be
+evaluation use as provided in Section 3.
+
+(d)     "Service" means the service(s) that Sun or its delegate will
+provide, if any, as selected in your Entitlement and as further
+described in the applicable service listings at
+www.sun.com/service/servicelist.
+
+(e)     "Software" means the Sun software described in your
+Entitlement. Also, certain software may be included for evaluation use
+under Section 3.
+
+(f)     "You" and "Your" means the individual or legal entity specified
+in the Entitlement, or for evaluation purposes, the entity performing
+the evaluation.
+
+2.      License Grant and Entitlement.
+
+Subject to the terms of your Entitlement, Sun grants you a
+nonexclusive, nontransferable limited license to use Software for its
+Permitted Use for the license term. Your Entitlement will specify (a)
+Software licensed, (b) the Permitted Use, (c) the license term, and (d)
+the Licensed Units.
+
+Additionally, if your Entitlement includes Services, then it will also
+specify the (e) Service and (f) service term.
+
+If your rights to Software or Services are limited in duration and the
+date such rights begin is other than the purchase date, your
+Entitlement will provide that beginning date(s).
+
+The Entitlement may be delivered to you in various ways depending on
+the manner in which you obtain Software and Services, for example, the
+Entitlement may be provided in your receipt, invoice or your contract
+with Sun or authorized Sun reseller. It may also be in electronic
+format if you download Software.
+
+3.      Permitted Use.
+
+As selected in your Entitlement, one or more of the following Permitted
+Uses will apply to your use of Software. Unless you have an Entitlement
+that expressly permits it, you may not use Software for any of the
+other Permitted Uses. If you don't have an Entitlement, or if your
+Entitlement doesn't cover additional software delivered to you, then
+such software is for your Evaluation Use.
+
+(a) Evaluation Use. You may evaluate Software internally for a period
+of 90 days from your first use.
+
+(b) Research and Instructional Use. You may use Software internally to
+design, develop and test, and also to provide instruction on such
+uses.
+
+(c) Individual Use. You may use Software internally for personal,
+individual use.
+
+(d) Commercial Use. You may use Software internally for your own
+commercial purposes.
+
+(e) Service Provider Use. You may make Software functionality
+accessible (but not by providing Software itself or through outsourcing
+services) to your end users in an extranet deployment, but not to your
+affiliated companies or to government agencies.
+
+4.      Licensed Units.
+
+Your Permitted Use is limited to the number of Licensed Units stated in
+your Entitlement. If you require additional Licensed Units, you will
+need additional Entitlement(s).
+
+5.	Restrictions.
+
+(a) The copies of Software provided to you under this Agreement are
+licensed, not sold, to you by Sun. Sun reserves all rights not
+expressly granted. (b) You may make a single archival copy of Software,
+but otherwise may not copy, modify, or distribute Software. However if
+the Sun documentation accompanying Software lists specific portions of
+Software, such as header files, class libraries, reference source code,
+and/or redistributable files, that may be handled differently, you may
+do so only as provided in the Sun documentation. (c) You may not rent,
+lease, lend or encumber Software. (d) Unless enforcement is prohibited
+by applicable law, you may not decompile, or reverse engineer
+Software.  (e) The terms and conditions of this Agreement will apply to
+any Software updates, provided to you at Sun's discretion, that replace
+and/or supplement the original Software, unless such update contains a
+separate license. (f) You may not publish or provide the results of any
+benchmark or comparison tests run on Software to any third party
+without the prior written consent of Sun. (g) Software is confidential
+and copyrighted. (h) Unless otherwise specified, if Software is
+delivered with embedded or bundled software that enables functionality
+of Software, you may not use such software on a stand-alone basis or
+use any portion of such software to interoperate with any program(s)
+other than Software.  (i) Software may contain programs that perform
+automated collection of system data and/or automated software updating
+services. System data collected through such programs may be used by
+Sun, its subcontractors, and its service delivery partners for the
+purpose of providing you with remote system services and/or improving
+Sun's software and systems. (j) Software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance
+of any nuclear facility and Sun and its licensors disclaim any express
+or implied warranty of fitness for such uses. (k) No right, title or
+interest in or to any trademark, service mark, logo or trade name of
+Sun or its licensors is granted under this Agreement.
+
+6.	Term and Termination. 
+
+The license and service term are set forth in your Entitlement(s). Your
+rights under this Agreement will terminate immediately without notice
+from Sun if you materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun may terminate
+this Agreement should any Software become, or in Sun's reasonable
+opinion likely to become, the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon
+termination, you will cease use of, and destroy, Software and confirm
+compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
+7.      Java Compatibility and Open Source.
+
+Software may contain Java technology. You may not create additional
+classes to, or modifications of, the Java technology, except under
+compatibility requirements available under a separate agreement
+available at www.java.net.
+
+Sun supports and benefits from the global community of open source
+developers, and thanks the community for its important contributions
+and open standards-based technology, which Sun has adopted into many of
+its products.
+
+Please note that portions of Software may be provided with notices and
+open source licenses from such communities and third parties that
+govern the use of those portions, and any licenses granted hereunder do
+not alter any rights and obligations you may have under such open
+source licenses, however, the disclaimer of warranty and limitation of
+liability provisions in this Agreement will apply to all Software in
+this distribution.
+
+8.      Limited Warranty.
+
+Sun warrants to you that for a period of 90 days from the date of
+purchase, as evidenced by a copy of the receipt, the media on which
+Software is furnished (if any) will be free of defects in materials and
+workmanship under normal use. Except for the foregoing, Software is
+provided "AS IS". Your exclusive remedy and Sun's entire liability
+under this limited warranty will be at Sun's option to replace Software
+media or refund the fee paid for Software. Some states do not allow
+limitations on certain implied warranties, so the above may not apply
+to you. This limited warranty gives you specific legal rights. You may
+have others, which vary from state to state.
+
+9.      Disclaimer of Warranty.
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO
+BE LEGALLY INVALID.
+
+10.     Limitation of Liability.
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR
+RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's
+liability to you, whether in contract, tort (including negligence), or
+otherwise, exceed the amount paid by you for Software under this
+Agreement. The foregoing limitations will apply even if the above
+stated warranty fails of its essential purpose. Some states do not
+allow the exclusion of incidental or consequential damages, so some of
+the terms above may not be applicable to you.
+
+11.     Export Regulations.
+
+All Software, documents, technical data, and any other materials
+delivered under this Agreement are subject to U.S. export control laws
+and may be subject to export or import regulations in other countries.
+You agree to comply strictly with these laws and regulations and
+acknowledge that you have the responsibility to obtain any licenses to
+export, re-export, or import as may be required after delivery to you.
+
+12.     U.S. Government Restricted Rights.
+
+If Software is being acquired by or on behalf of the U.S. Government or
+by a U.S. Government prime contractor or subcontractor (at any tier),
+then the Government's rights in Software and accompanying documentation
+will be only as set forth in this Agreement; this is in accordance with
+48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD)
+acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
+acquisitions).
+
+13.     Governing Law.
+
+Any action related to this Agreement will be governed by California law
+and controlling U.S. federal law. No choice of law rules of any
+jurisdiction will apply.
+
+14.     Severability.
+
+If any provision of this Agreement is held to be unenforceable, this
+Agreement will remain in effect with the provision omitted, unless
+omission would frustrate the intent of the parties, in which case this
+Agreement will immediately terminate.
+
+15.     Integration.
+
+This Agreement, including any terms contained in your Entitlement, is
+the entire agreement between you and Sun relating to its subject
+matter. It supersedes all prior or contemporaneous oral or written
+communications, proposals, representations and warranties and prevails
+over any conflicting or additional terms of any quote, order,
+acknowledgment, or other communication between the parties relating to
+its subject matter during the term of this Agreement. No modification
+of this Agreement will be binding, unless in writing and signed by an
+authorized representative of each party.
+
+Please contact Sun Microsystems, Inc. 4150 Network Circle, Santa Clara,
+California 95054 if you have questions.

Deleted: trunk/eXist/lib/user/activation.jar
===================================================================
(Binary files differ)

Copied: trunk/eXist/lib/user/mail-1.4.1.jar (from rev 8782, trunk/eXist/lib/user/mail.jar)
===================================================================
(Binary files differ)


Property changes on: trunk/eXist/lib/user/mail-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:mergeinfo
   + 

Added: trunk/eXist/lib/user/mail-LICENSE.txt
===================================================================
--- trunk/eXist/lib/user/mail-LICENSE.txt	                        (rev 0)
+++ trunk/eXist/lib/user/mail-LICENSE.txt	2009-03-29 19:25:10 UTC (rev 8783)
@@ -0,0 +1,308 @@
+Sun Microsystems, Inc. ("Sun") ENTITLEMENT for SOFTWARE
+
+Licensee/Company: Entity receiving Software.
+
+Effective Date: Date of delivery of the Software to You.
+
+Software: JavaMail 1.4.2
+
+License Term:  Perpetual (subject to termination under the SLA).
+
+Licensed Unit: Software Copy.
+
+Licensed unit Count: Unlimited.
+
+Permitted Uses:
+
+1. You may reproduce and use the Software for Individual, Commercial,
+or Research and Instructional Use for the purposes of designing,
+developing, testing, and running Your applets and
+application("Programs").
+
+2. Subject to the terms and conditions of this Agreement and
+restrictions and exceptions set forth in the Software's documentation,
+You may reproduce and distribute portions of Software identified as a
+redistributable in the documentation ("Redistributable"), provided
+that:
+
+(a) you distribute Redistributable complete and unmodified and only
+bundled as part of Your Programs,
+
+(b) your Programs add significant and primary functionality to the
+Redistributable,
+
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
+
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
+
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
+
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in this Agreement, and
+
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
+
+3. Java Technology Restrictions.  You may not create, modify, or change
+the behavior of, or authorize your licensees to create, modify, or
+change the behavior of, classes, interfaces, or subpackages that are in
+any way identified as "java", "javax", "sun" or similar convention as
+specified by Sun in any naming convention designation.
+
+B. Sun Microsystems, Inc. ("Sun")
+SOFTWARE LICENSE AGREEMENT
+
+READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
+SOFTWARE MEDIA PACKAGE. BY OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO
+THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
+ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
+THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE
+TO ALL OF THE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
+OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
+SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
+IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
+YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-5 OF THIS AGREEMENT
+("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
+MASTER TERMS IN RELATION TO THIS SOFTWARE.
+
+1.      Definitions.
+
+(a)     "Entitlement" means the collective set of applicable documents
+authorized by Sun evidencing your obligation to pay associated fees (if
+any) for the license, associated Services, and the authorized scope of
+use of Software under this Agreement.
+
+(b)     "Licensed Unit" means the unit of measure by which your use of
+Software and/or Service is licensed, as described in your Entitlement.
+
+(c)     "Permitted Use" means the licensed Software use(s) authorized
+in this Agreement as specified in your Entitlement. The Permitted Use
+for any bundled Sun software not specified in your Entitlement will be
+evaluation use as provided in Section 3.
+
+(d)     "Service" means the service(s) that Sun or its delegate will
+provide, if any, as selected in your Entitlement and as further
+described in the applicable service listings at
+www.sun.com/service/servicelist.
+
+(e)     "Software" means the Sun software described in your
+Entitlement. Also, certain software may be included for evaluation use
+under Section 3.
+
+
+(f)     "You" and "Your" means the individual or legal entity specified
+in the Entitlement, or for evaluation purposes, the entity performing
+the evaluation.
+
+2.      License Grant and Entitlement.
+
+Subject to the terms of your Entitlement, Sun grants you a
+nonexclusive, nontransferable limited license to use Software for its
+Permitted Use for the license term. Your Entitlement will specify (a)
+Software licensed, (b) the Permitted Use, (c) the license term, and (d)
+the Licensed Units.
+
+Additionally, if your Entitlement includes Services, then it will also
+specify the (e) Service and (f) service term.
+
+If your rights to Software or Services are limited in duration and the
+date such rights begin is other than the purchase date, your
+Entitlement will provide that beginning date(s).
+
+The Entitlement may be delivered to you in various ways depending on
+the manner in which you obtain Software and Services, for example, the
+Entitlement may be provided in your receipt, invoice or your contract
+with Sun or authorized Sun reseller. It may also be in electronic
+format if you download Software.
+
+3.      Permitted Use.
+
+As selected in your Entitlement, one or more of the following Permitted
+Uses will apply to your use of Software. Unless you have an Entitlement
+that expressly permits it, you may not use Software for any of the
+other Permitted Uses. If you don't have an Entitlement, or if your
+Entitlement doesn't cover additional software delivered to you, then
+such software is for your Evaluation Use.
+
+(a) Evaluation Use. You may evaluate Software internally for a period
+of 90 days from your first use.
+
+(b) Research and Instructional Use. You may use Software internally to
+design, develop and test, and also to provide instruction on such
+uses.
+
+(c) Individual Use. You may use Software internally for personal,
+individual use.
+
+(d) Commercial Use. You may use Software internally for your own
+commercial purposes.
+
+(e) Service Provider Use. You may make Software functionality
+accessible (but not by providing Software itself or through outsourcing
+services) to your end users in an extranet deployment, but not to your
+affiliated companies or to government agencies.
+
+4.      Licensed Units.
+
+Your Permitted Use is limited to the number of Licensed Units stated in
+your Entitlement. If you require additional Licensed Units, you will
+need additional Entitlement(s).
+
+5.	Restrictions.
+
+(a) The copies of Software provided to you under this Agreement are
+licensed, not sold, to you by Sun. Sun reserves all rights not
+expressly granted. (b) You may make a single archival copy of Software,
+but otherwise may not copy, modify, or distribute Software. However if
+the Sun documentation accompanying Software lists specific portions of
+Software, such as header files, class libraries, reference source code,
+and/or redistributable files, that may be handled differently, you may
+do so only as provided in the Sun documentation. (c) You may not rent,
+lease, lend or encumber Software. (d) Unless enforcement is prohibited
+by applicable law, you may not decompile, or reverse engineer Software.
+(e) The terms and conditions of this Agreement will apply to any
+Software updates, provided to you at Sun's discretion, that replace
+and/or supplement the original Software, unless such update contains a
+separate license. (f) You may not publish or provide the results of any
+benchmark or comparison tests run on Software to any third party
+without the prior written consent of Sun. (g) Software is confidential
+and copyrighted. (h) Unless otherwise specified, if Software is
+delivered with embedded or bundled software that enables functionality
+of Software, you may not use such software on a stand-alone basis or
+use any portion of such software to interoperate with any program(s)
+other than Software. (i) Software may contain programs that perform
+automated collection of system data and/or automated software updating
+services. System data collected through such programs may be used by
+Sun, its subcontractors, and its service delivery partners for the
+purpose of providing you with remote system services and/or improving
+Sun's software and systems. (j) Software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance
+of any nuclear facility and Sun and its licensors disclaim any express
+or implied warranty of fitness for such uses. (k) No right, title or
+interest in or to any trademark, service mark, logo or trade name of
+Sun or its licensors is granted under this Agreement.
+
+6.      Term and Termination.
+
+The license and service term are set forth in your Entitlement(s). Your
+rights under this Agreement will terminate immediately without notice
+from Sun if you materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun may terminate
+this Agreement should any Software become, or in Sun's reasonable
+opinion likely to become, the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon
+termination, you will cease use of, and destroy, Software and confirm
+compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
+7.      Java Compatibility and Open Source.
+
+Software may contain Java technology. You may not create additional
+classes to, or modifications of, the Java technology, except under
+compatibility requirements available under a separate agreement
+available at www.java.net.
+
+Sun supports and benefits from the global community of open source
+developers, and thanks the community for its important contributions
+and open standards-based technology, which Sun has adopted into many of
+its products.
+
+Please note that portions of Software may be provided with notices and
+open source licenses from such communities and third parties that
+govern the use of those portions, and any licenses granted hereunder do
+not alter any rights and obligations you may have under such open
+source licenses, however, the disclaimer of warranty and limitation of
+liability provisions in this Agreement will apply to all Software in
+this distribution.
+
+8.      Limited Warranty.
+
+Sun warrants to you that for a period of 90 days from the date of
+purchase, as evidenced by a copy of the receipt, the media on which
+Software is furnished (if any) will be free of defects in materials and
+workmanship under normal use. Except for the foregoing, Software is
+provided "AS IS". Your exclusive remedy and Sun's entire liability
+under this limited warranty will be at Sun's option to replace Software
+media or refund the fee paid for Software. Some states do not allow
+limitations on certain implied warranties, so the above may not apply
+to you. This limited warranty gives you specific legal rights. You may
+have others, which vary from state to state.
+
+9.      Disclaimer of Warranty.
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO
+BE LEGALLY INVALID.
+
+10.     Limitation of Liability.
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR
+RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's
+liability to you, whether in contract, tort (including negligence), or
+otherwise, exceed the amount paid by you for Software under this
+Agreement. The foregoing limitations will apply even if the above
+stated warranty fails of its essential purpose. Some states do not
+allow the exclusion of incidental or consequential damages, so some of
+the terms above may not be applicable to you.
+
+11.     Export Regulations.
+
+All Software, documents, technical data, and any other materials
+delivered under this Agreement are subject to U.S. export control laws
+and may be subject to export or import regulations in other countries.
+You agree to comply strictly with these laws and regulations and
+acknowledge that you have the responsibility to obtain any licenses to
+export, re-export, or import as may be required after delivery to you.
+
+12.     U.S. Government Restricted Rights.
+
+If Software is being acquired by or on behalf of the U.S. Government or
+by a U.S. Government prime contractor or subcontractor (at any tier),
+then the Government's rights in Software and accompanying documentation
+will be only as set forth in this Agreement; this is in accordance with
+48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD)
+acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
+acquisitions).
+
+13.     Governing Law.
+
+Any action related to this Agreement will be governed by California law
+and controlling U.S. federal law. No choice of law rules of any
+jurisdiction will apply.
+
+14.     Severability.
+
+If any provision of this Agreement is held to be unenforceable, this
+Agreement will remain in effect with the provision omitted, unless
+omission would frustrate the intent of the parties, in which case this
+Agreement will immediately terminate.
+
+15.     Integration.
+
+This Agreement, including any terms contained in your Entitlement, is
+the entire agreement between you and Sun relating to its subject
+matter. It supersedes all prior or contemporaneous oral or written
+communications, proposals, representations and warranties and prevails
+over any conflicting or additional terms of any quote, order,
+acknowledgment, or other communication between the parties relating to
+its subject matter during the term of this Agreement. No modification
+of this Agreement will be binding, unless in writing and signed by an
+authorized representative of each party.
+
+Please contact Sun Microsystems, Inc. 4150 Network Circle, Santa Clara,
+California 95054 if you have questions.
+

Deleted: trunk/eXist/lib/user/mail.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8782
          http://exist.svn.sourceforge.net/exist/?rev=8782&view=rev
Author:   deliriumsky
Date:     2009-03-29 19:06:28 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Previously httpStatus was not preserved for XPathException responses. Merge of 8781

Modified Paths:
--------------
    branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java

Property Changed:
----------------
    branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java

Modified: branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java
===================================================================
--- branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java	2009-03-29 18:58:13 UTC (rev 8781)
+++ branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java	2009-03-29 19:06:28 UTC (rev 8782)
@@ -85,8 +85,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -310,11 +308,10 @@
 						wrap, cache, request, response);
 
 			} catch (XPathException e) {
-				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 				if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-					writeXPathException(response, encoding, query, path, e);
+					writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 				} else {
-					writeXPathExceptionHtml(response, encoding, query, path, e);
+					writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 				}
 			}
 			return;
@@ -429,11 +426,10 @@
 				} catch (XPathException e) {
 					if (LOG.isDebugEnabled())
 						LOG.debug(e.getMessage(), e);
-					response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 					if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-						writeXPathException(response, encoding, query, path, e);
+						writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 					} else {
-						writeXPathExceptionHtml(response, encoding, query,
+						writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query,
 								path, e);
 					}
 				}
@@ -574,12 +570,11 @@
 								outputProperties, servletPath.toString(),
 								pathInfo.toString());
 					} catch (XPathException e) {
-						response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 						if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-							writeXPathException(response, encoding, null, path,
+							writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, null, path,
 									e);
 						} else {
-							writeXPathExceptionHtml(response, encoding, null,
+							writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, null,
 									path, e);
 						}
 					}
@@ -693,13 +688,12 @@
 								outputProperties, enclose, cache, request,
 								response);
 					} catch (XPathException e) {
-						response.setStatus(HttpServletResponse.SC_ACCEPTED);
 						result = e.getMessage();
                         if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-                            writeXPathException(response, encoding, null, path,
+                            writeXPathException(response, HttpServletResponse.SC_ACCEPTED, encoding, null, path,
                                     e);
                         } else {
-                            writeXPathExceptionHtml(response, encoding, null,
+                            writeXPathExceptionHtml(response, HttpServletResponse.SC_ACCEPTED, encoding, null,
                                     path, e);
                         }
 					}
@@ -1297,13 +1291,15 @@
 	 * @param e
 	 * 
 	 */
-	private void writeXPathExceptionHtml(HttpServletResponse response,
+	private void writeXPathExceptionHtml(HttpServletResponse response, int httpStatusCode,
 			String encoding, String query, String path, XPathException e)
 			throws IOException {
 
 		if( !response.isCommitted() ) {
 			response.reset();
 		}
+
+        response.setStatus(httpStatusCode);
 			
 		response.setContentType(MimeType.HTML_TYPE.getName() + "; charset="
 				+ encoding);
@@ -1339,14 +1335,15 @@
 	 * @param path
 	 * @param e
 	 */
-	private void writeXPathException(HttpServletResponse response,
-			String encoding, String query, String path, XPathException e)
+	private void writeXPathException(HttpServletResponse response, int httpStatusCode, String encoding, String query, String path, XPathException e)
 			throws IOException {
 
 		if( !response.isCommitted() ) {
 			response.reset();
 		}
-		
+
+        response.setStatus(httpStatusCode);
+
 		response.setContentType(MimeType.XML_TYPE.getName() + "; charset="
 				+ encoding);
 


Property changes on: branches/adam/eXist-1.3-hlt/src/org/exist/http/RESTServer.java
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/eXist/src/org/exist/http/RESTServer.java:8762-8781


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8781
          http://exist.svn.sourceforge.net/exist/?rev=8781&view=rev
Author:   deliriumsky
Date:     2009-03-29 18:58:13 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Previously httpStatus was not preserved for XPathException responses.

Modified Paths:
--------------
    trunk/eXist/src/org/exist/http/RESTServer.java

Modified: trunk/eXist/src/org/exist/http/RESTServer.java
===================================================================
--- trunk/eXist/src/org/exist/http/RESTServer.java	2009-03-29 18:30:00 UTC (rev 8780)
+++ trunk/eXist/src/org/exist/http/RESTServer.java	2009-03-29 18:58:13 UTC (rev 8781)
@@ -85,8 +85,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -310,11 +308,10 @@
 						wrap, cache, request, response);
 
 			} catch (XPathException e) {
-				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 				if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-					writeXPathException(response, encoding, query, path, e);
+					writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 				} else {
-					writeXPathExceptionHtml(response, encoding, query, path, e);
+					writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 				}
 			}
 			return;
@@ -429,11 +426,10 @@
 				} catch (XPathException e) {
 					if (LOG.isDebugEnabled())
 						LOG.debug(e.getMessage(), e);
-					response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 					if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-						writeXPathException(response, encoding, query, path, e);
+						writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query, path, e);
 					} else {
-						writeXPathExceptionHtml(response, encoding, query,
+						writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, query,
 								path, e);
 					}
 				}
@@ -574,12 +570,11 @@
 								outputProperties, servletPath.toString(),
 								pathInfo.toString());
 					} catch (XPathException e) {
-						response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 						if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-							writeXPathException(response, encoding, null, path,
+							writeXPathException(response, HttpServletResponse.SC_BAD_REQUEST, encoding, null, path,
 									e);
 						} else {
-							writeXPathExceptionHtml(response, encoding, null,
+							writeXPathExceptionHtml(response, HttpServletResponse.SC_BAD_REQUEST, encoding, null,
 									path, e);
 						}
 					}
@@ -693,13 +688,12 @@
 								outputProperties, enclose, cache, request,
 								response);
 					} catch (XPathException e) {
-						response.setStatus(HttpServletResponse.SC_ACCEPTED);
 						result = e.getMessage();
                         if (MimeType.XML_TYPE.getName().equals(mimeType)) {
-                            writeXPathException(response, encoding, null, path,
+                            writeXPathException(response, HttpServletResponse.SC_ACCEPTED, encoding, null, path,
                                     e);
                         } else {
-                            writeXPathExceptionHtml(response, encoding, null,
+                            writeXPathExceptionHtml(response, HttpServletResponse.SC_ACCEPTED, encoding, null,
                                     path, e);
                         }
 					}
@@ -1298,13 +1292,15 @@
 	 * @param e
 	 * 
 	 */
-	private void writeXPathExceptionHtml(HttpServletResponse response,
+	private void writeXPathExceptionHtml(HttpServletResponse response, int httpStatusCode,
 			String encoding, String query, String path, XPathException e)
 			throws IOException {
 
 		if( !response.isCommitted() ) {
 			response.reset();
 		}
+
+        response.setStatus(httpStatusCode);
 			
 		response.setContentType(MimeType.HTML_TYPE.getName() + "; charset="
 				+ encoding);
@@ -1340,14 +1336,15 @@
 	 * @param path
 	 * @param e
 	 */
-	private void writeXPathException(HttpServletResponse response,
-			String encoding, String query, String path, XPathException e)
+	private void writeXPathException(HttpServletResponse response, int httpStatusCode, String encoding, String query, String path, XPathException e)
 			throws IOException {
 
 		if( !response.isCommitted() ) {
 			response.reset();
 		}
-		
+
+        response.setStatus(httpStatusCode);
+
 		response.setContentType(MimeType.XML_TYPE.getName() + "; charset="
 				+ encoding);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8780
          http://exist.svn.sourceforge.net/exist/?rev=8780&view=rev
Author:   dizzzz
Date:     2009-03-29 18:30:00 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[ignore] ignore jar

Property Changed:
----------------
    trunk/eXist/lib/user/


Property changes on: trunk/eXist/lib/user
___________________________________________________________________
Modified: svn:ignore
   - avalon-framework-api-4.3.jar
avalon-framework-impl-4.3.jar
batik-all-1.7.jar
fop.jar
xmlgraphics-commons-1.3.1.jar

   + avalon-framework-api-4.3.jar
avalon-framework-impl-4.3.jar
batik-all-1.7.jar
fop.jar
xmlgraphics-commons-1.3.1.jar
icu4k-*.jar



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8779
          http://exist.svn.sourceforge.net/exist/?rev=8779&view=rev
Author:   dizzzz
Date:     2009-03-29 18:08:49 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[ignore] Re-added original test. Seem to fail under windows only

Modified Paths:
--------------
    trunk/eXist/src/org/exist/xmldb/LocalCollection.java
    trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java

Modified: trunk/eXist/src/org/exist/xmldb/LocalCollection.java
===================================================================
--- trunk/eXist/src/org/exist/xmldb/LocalCollection.java	2009-03-29 17:54:56 UTC (rev 8778)
+++ trunk/eXist/src/org/exist/xmldb/LocalCollection.java	2009-03-29 18:08:49 UTC (rev 8779)
@@ -648,12 +648,14 @@
             ((LocalXMLResource)resource).datecreated =a;
             ((LocalXMLResource)resource).datemodified =b;
             storeXMLResource((LocalXMLResource) resource);
+
         } else if (resource.getResourceType().equals("BinaryResource")) {
             if (LOG.isDebugEnabled())
                 LOG.debug("storing binary resource " + resource.getId());
             ((LocalBinaryResource)resource).datecreated =a;
             ((LocalBinaryResource)resource).datemodified =b;
             storeBinaryResource((LocalBinaryResource) resource);
+            
         } else
             throw new XMLDBException(
                     ErrorCodes.UNKNOWN_RESOURCE_TYPE,

Modified: trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java	2009-03-29 17:54:56 UTC (rev 8778)
+++ trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java	2009-03-29 18:08:49 UTC (rev 8779)
@@ -79,6 +79,33 @@
         }
     }
 
+    // with same docname test fails for windows 
+    public void testUpdateBinary_windows() {
+        try {
+            for (int i = 0; i < REPEAT; i++) {
+                BinaryResource binaryResource = (BinaryResource)
+                        testCollection.createResource("test.xml", "BinaryResource");
+                binaryResource.setContent(binFile);
+                testCollection.storeResource(binaryResource);
+
+                Resource resource = testCollection.getResource("test.xml");
+                assertNotNull(resource);
+                System.out.println("Content:\n" + resource.getContent().toString());
+
+                XMLResource xmlResource = (XMLResource) testCollection.createResource("test.xml", "XMLResource");
+                xmlResource.setContent(xmlFile);
+                testCollection.storeResource(xmlResource);
+
+                resource = testCollection.getResource("test.xml");
+                assertNotNull(resource);
+                System.out.println("Content:\n" + resource.getContent().toString());
+            }
+        } catch (XMLDBException e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+
     protected void setUp() {
 		try {
 			// initialize driver


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8778
          http://exist.svn.sourceforge.net/exist/?rev=8778&view=rev
Author:   dizzzz
Date:     2009-03-29 17:54:56 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Test attempted to replace XML document with binary file with same name. Not sure how this should work, temp. solution: use 2 different file names.

Modified Paths:
--------------
    trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java

Modified: trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java	2009-03-29 17:28:41 UTC (rev 8777)
+++ trunk/eXist/test/src/org/exist/xmldb/BinaryResourceUpdateTest.java	2009-03-29 17:54:56 UTC (rev 8778)
@@ -57,19 +57,19 @@
         try {
             for (int i = 0; i < REPEAT; i++) {
                 BinaryResource binaryResource = (BinaryResource)
-                        testCollection.createResource("test.xml", "BinaryResource");
+                        testCollection.createResource("test1.xml", "BinaryResource");
                 binaryResource.setContent(binFile);
                 testCollection.storeResource(binaryResource);
 
-                Resource resource = testCollection.getResource("test.xml");
+                Resource resource = testCollection.getResource("test1.xml");
                 assertNotNull(resource);
                 System.out.println("Content:\n" + resource.getContent().toString());
 
-                XMLResource xmlResource = (XMLResource) testCollection.createResource("test.xml", "XMLResource");
+                XMLResource xmlResource = (XMLResource) testCollection.createResource("test2.xml", "XMLResource");
                 xmlResource.setContent(xmlFile);
                 testCollection.storeResource(xmlResource);
 
-                resource = testCollection.getResource("test.xml");
+                resource = testCollection.getResource("test2.xml");
                 assertNotNull(resource);
                 System.out.println("Content:\n" + resource.getContent().toString());
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8777
          http://exist.svn.sourceforge.net/exist/?rev=8777&view=rev
Author:   brihaye
Date:     2009-03-29 17:28:41 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[ignore] spatial tests were relying upon the incorrect implementation of //. Fixed.
Nice to see the test suite (nearly) passes again :-)

Modified Paths:
--------------
    trunk/eXist/extensions/indexes/spatial/test/src/org/exist/indexing/spatial/GMLIndexTest.java

Modified: trunk/eXist/extensions/indexes/spatial/test/src/org/exist/indexing/spatial/GMLIndexTest.java
===================================================================
--- trunk/eXist/extensions/indexes/spatial/test/src/org/exist/indexing/spatial/GMLIndexTest.java	2009-03-29 15:42:07 UTC (rev 8776)
+++ trunk/eXist/extensions/indexes/spatial/test/src/org/exist/indexing/spatial/GMLIndexTest.java	2009-03-29 17:28:41 UTC (rev 8777)
@@ -385,161 +385,161 @@
             String query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getWKT(//gml:Polygon[1])";
+        	"spatial:getWKT((//gml:Polygon)[1])";
 	        Sequence seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getWKB(//gml:Polygon[1])";
+        	"spatial:getWKB((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);	        
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getMinX(//gml:Polygon[1])";
+        	"spatial:getMinX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getMaxX(//gml:Polygon[1])";
+        	"spatial:getMaxX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getMinY(//gml:Polygon[1])";
+        	"spatial:getMinY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getMaxY(//gml:Polygon[1])";
+        	"spatial:getMaxY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getCentroidX(//gml:Polygon[1])";
+        	"spatial:getCentroidX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getCentroidY(//gml:Polygon[1])";
+        	"spatial:getCentroidY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getArea(//gml:Polygon[1])";
+        	"spatial:getArea((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326WKT(//gml:Polygon[1])";
+        	"spatial:getEPSG4326WKT((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);	 	        
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326WKB(//gml:Polygon[1])";
+        	"spatial:getEPSG4326WKB((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);	 	        
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326MinX(//gml:Polygon[1])";
+        	"spatial:getEPSG4326MinX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326MaxX(//gml:Polygon[1])";
+        	"spatial:getEPSG4326MaxX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326MinY(//gml:Polygon[1])";
+        	"spatial:getEPSG4326MinY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326MaxY(//gml:Polygon[1])";
+        	"spatial:getEPSG4326MaxY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326CentroidX(//gml:Polygon[1])";
+        	"spatial:getEPSG4326CentroidX((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326CentroidY(//gml:Polygon[1])";
+        	"spatial:getEPSG4326CentroidY((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getEPSG4326Area(//gml:Polygon[1])";
+        	"spatial:getEPSG4326Area((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
 	        query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getSRS(//gml:Polygon[1])";
+        	"spatial:getSRS((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getGeometryType(//gml:Polygon[1])";
+        	"spatial:getGeometryType((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:isClosed(//gml:Polygon[1])";
+        	"spatial:isClosed((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:isSimple(//gml:Polygon[1])";
+        	"spatial:isSimple((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);        
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:isValid(//gml:Polygon[1])";
+        	"spatial:isValid((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);	  
@@ -741,77 +741,77 @@
             String query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:transform(//gml:Polygon[1], 'EPSG:4326')";
+        	"spatial:transform((//gml:Polygon)[1], 'EPSG:4326')";
 	        Sequence seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
 	        query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getWKT(//gml:Polygon[1])";
+        	"spatial:getWKT((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:buffer(//gml:Polygon[1], 100)";
+        	"spatial:buffer((//gml:Polygon)[1], 100)";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:buffer(//gml:Polygon[1], 100, 1)";
+        	"spatial:buffer((//gml:Polygon)[1], 100, 1)";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:getBbox(//gml:Polygon[1])";
+        	"spatial:getBbox((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);	        
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:convexHull(//gml:Polygon[1])";
+        	"spatial:convexHull((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:boundary(//gml:Polygon[1])";
+        	"spatial:boundary((//gml:Polygon)[1])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:intersection(//gml:Polygon[1], //gml:Polygon[2])";
+        	"spatial:intersection((//gml:Polygon)[1], (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:union(//gml:Polygon[1], //gml:Polygon[2])";
+        	"spatial:union((//gml:Polygon)[1], (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:difference(//gml:Polygon[1], //gml:Polygon[2])";
+        	"spatial:difference((//gml:Polygon)[1], (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:symetricDifference(//gml:Polygon[1], //gml:Polygon[2])";
+        	"spatial:symetricDifference((//gml:Polygon)[1], (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
@@ -876,14 +876,14 @@
 	        query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
 	    	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
 	    	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-	    	"spatial:union(//gml:Polygon[1], ())";	
+	    	"spatial:union((//gml:Polygon)[1], ())";	
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() == 1);
 	        query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
 	    	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
 	    	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-	    	"spatial:union((), //gml:Polygon[1])";	
+	    	"spatial:union((), (//gml:Polygon)[1])";	
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() == 1);
@@ -934,56 +934,56 @@
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:intersection(" + IN_MEMORY_GML + ", //gml:Polygon[2])";
+        	"spatial:intersection(" + IN_MEMORY_GML + ", (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:union(" + IN_MEMORY_GML + ", //gml:Polygon[2])";
+        	"spatial:union(" + IN_MEMORY_GML + ", (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:difference(" + IN_MEMORY_GML + ", //gml:Polygon[2])";
+        	"spatial:difference(" + IN_MEMORY_GML + ", (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:symetricDifference(" + IN_MEMORY_GML + ", //gml:Polygon[2])";
+        	"spatial:symetricDifference(" + IN_MEMORY_GML + ", (//gml:Polygon)[2])";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:intersection(//gml:Polygon[1]," + IN_MEMORY_GML + ")";
+        	"spatial:intersection((//gml:Polygon)[1]," + IN_MEMORY_GML + ")";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:union(//gml:Polygon[1]," + IN_MEMORY_GML + ")";
+        	"spatial:union((//gml:Polygon)[1]," + IN_MEMORY_GML + ")";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:difference(//gml:Polygon[1]," + IN_MEMORY_GML + ")";
+        	"spatial:difference((//gml:Polygon)[1]," + IN_MEMORY_GML + ")";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
             query = "import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
-        	"spatial:symetricDifference(//gml:Polygon[1]," + IN_MEMORY_GML + ")";
+        	"spatial:symetricDifference((//gml:Polygon)[1]," + IN_MEMORY_GML + ")";
 	        seq = xquery.execute(query, null, AccessContext.TEST);
 	        assertNotNull(seq);		
 	        assertTrue(seq.getItemCount() > 0);
@@ -1009,7 +1009,7 @@
         	"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         	"declare namespace gml = 'http://www.opengis.net/gml'; " +
         	"(# exist:force-index-use #) { " +
-        	"spatial:getArea(//gml:Polygon[1]) " +
+        	"spatial:getArea((//gml:Polygon)[1]) " +
         	"}";
             Sequence seq = xquery.execute(query, null, AccessContext.TEST);
             assertNotNull(seq);		
@@ -1018,9 +1018,9 @@
             query =	"import module namespace spatial='http://exist-db.org/xquery/spatial' " +
         		"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         		"declare namespace gml = 'http://www.opengis.net/gml'; " +
-            	"update value //gml:Polygon[1]/gml:outerBoundaryIs/gml:LinearRing/gml:coordinates " +
+            	"update value (//gml:Polygon)[1]/gml:outerBoundaryIs/gml:LinearRing/gml:coordinates " +
             	"(: strip decimals :) " +
-            	"with fn:replace(//gml:Polygon[1], '(\\d+).(\\d+)', '$1')";
+            	"with fn:replace((//gml:Polygon)[1], '(\\d+).(\\d+)', '$1')";
             seq = xquery.execute(query, null, AccessContext.TEST);
             assertNotNull(seq);		
             assertTrue(seq.getItemCount() == 0);
@@ -1028,7 +1028,7 @@
         		"at 'java:org.exist.examples.indexing.spatial.module.SpatialModule'; " +
         		"declare namespace gml = 'http://www.opengis.net/gml'; " +
         		"(# exist:force-index-use #) { " +
-        		"spatial:getArea(//gml:Polygon[1])" +
+        		"spatial:getArea((//gml:Polygon)[1])" +
             	"}";
             seq = xquery.execute(query, null, AccessContext.TEST);
             assertNotNull(seq);		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8776
          http://exist.svn.sourceforge.net/exist/?rev=8776&view=rev
Author:   deliriumsky
Date:     2009-03-29 15:42:07 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Return XMLReader to pool

Modified Paths:
--------------
    branches/eXist-stable-1.2/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java

Modified: branches/eXist-stable-1.2/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java
===================================================================
--- branches/eXist-stable-1.2/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 15:41:40 UTC (rev 8775)
+++ branches/eXist-stable-1.2/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 15:42:07 UTC (rev 8776)
@@ -69,10 +69,12 @@
 	public static NodeValue stringToXML(XQueryContext context, String xml)
 			throws XPathException, SAXException {
 		context.pushDocumentContext();
+
+        XMLReader reader = null;
 		try {
 			// try and construct xml document from input stream, we use eXist's
 			// in-memory DOM implementation
-                        XMLReader reader= context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
+                        reader = context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
                         LOG.debug("Parsing XML response ...");
 			// TODO : we should be able to cope with context.getBaseURI()
 			InputSource src = new InputSource(new ByteArrayInputStream(xml.getBytes()));
@@ -88,6 +90,9 @@
 			throw new XPathException(e.getMessage());
 		} finally {
 			context.popDocumentContext();
+
+            if(reader != null)
+                context.getBroker().getBrokerPool().getParserPool().returnXMLReader(reader);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8775
          http://exist.svn.sourceforge.net/exist/?rev=8775&view=rev
Author:   deliriumsky
Date:     2009-03-29 15:41:40 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Return XMLReader to pool

Modified Paths:
--------------
    trunk/eXist/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java

Modified: trunk/eXist/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java
===================================================================
--- trunk/eXist/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 15:41:13 UTC (rev 8774)
+++ trunk/eXist/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 15:41:40 UTC (rev 8775)
@@ -83,11 +83,12 @@
 	public static NodeValue streamToXML( XQueryContext context, InputStream xml ) throws XPathException, SAXException 
 	{
 		context.pushDocumentContext();
-		
+
+        XMLReader reader = null;
 		try {
 			// try and construct xml document from input stream, we use eXist's
 			// in-memory DOM implementation
-            XMLReader reader= context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
+            reader = context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
             LOG.debug( "Parsing XML response ..." );
 			
 			// TODO : we should be able to cope with context.getBaseURI()
@@ -105,6 +106,9 @@
 		} 
 		finally {
 			context.popDocumentContext();
+
+            if(reader != null)
+                context.getBroker().getBrokerPool().getParserPool().returnXMLReader(reader);
 		}
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8774
          http://exist.svn.sourceforge.net/exist/?rev=8774&view=rev
Author:   deliriumsky
Date:     2009-03-29 15:41:13 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] Return XMLReader to pool

Modified Paths:
--------------
    branches/adam/eXist-1.3-hlt/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java

Modified: branches/adam/eXist-1.3-hlt/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java
===================================================================
--- branches/adam/eXist-1.3-hlt/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 09:45:04 UTC (rev 8773)
+++ branches/adam/eXist-1.3-hlt/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java	2009-03-29 15:41:13 UTC (rev 8774)
@@ -83,11 +83,12 @@
 	public static NodeValue streamToXML( XQueryContext context, InputStream xml ) throws XPathException, SAXException 
 	{
 		context.pushDocumentContext();
-		
+
+        XMLReader reader = null;
 		try {
 			// try and construct xml document from input stream, we use eXist's
 			// in-memory DOM implementation
-            XMLReader reader= context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
+            reader = context.getBroker().getBrokerPool().getParserPool().borrowXMLReader();
             LOG.debug( "Parsing XML response ..." );
 			
 			// TODO : we should be able to cope with context.getBaseURI()
@@ -105,6 +106,9 @@
 		} 
 		finally {
 			context.popDocumentContext();
+            
+            if(reader != null);
+                context.getBroker().getBrokerPool().getParserPool().returnXMLReader(reader);
 		}
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8773
          http://exist.svn.sourceforge.net/exist/?rev=8773&view=rev
Author:   wolfgang_m
Date:     2009-03-29 09:45:04 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
[bugfix] fixed evaluation of positional predicates with a //n abbreviated step (which translates to /desendant-or-self::node()/n). Examples: /a//b[1], /a//b[position() = last()], /a/descendant-or-self::node()/b[1].

Modified Paths:
--------------
    trunk/eXist/src/org/exist/dom/NodeSetHelper.java
    trunk/eXist/src/org/exist/xquery/LocationStep.java
    trunk/eXist/src/org/exist/xquery/Predicate.java
    trunk/eXist/src/org/exist/xquery/Step.java
    trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
    trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java

Modified: trunk/eXist/src/org/exist/dom/NodeSetHelper.java
===================================================================
--- trunk/eXist/src/org/exist/dom/NodeSetHelper.java	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/dom/NodeSetHelper.java	2009-03-29 09:45:04 UTC (rev 8773)
@@ -218,7 +218,7 @@
      */
     public static NodeSet selectAncestors(NodeSet al, NodeSet dl,
                                           boolean includeSelf, int contextId) {
-        NodeSet result = new ExtArrayNodeSet();
+        NodeSet result = new NewArrayNodeSet();
         for (Iterator i = dl.iterator(); i.hasNext();) {
             NodeProxy descendant = (NodeProxy) i.next();
             NodeSet ancestors = ancestorsForChild(al, descendant, false, includeSelf);
@@ -250,12 +250,12 @@
      */
     private static NodeSet ancestorsForChild(NodeSet ancestors,
                                              NodeProxy child, boolean directParent, boolean includeSelf) {
-        NodeSet result = new ExtArrayNodeSet(5);
+        NodeSet result = new NewArrayNodeSet(5);
         NodeId nodeId = child.getNodeId();
         NodeProxy temp = ancestors.get(child.getDocument(), nodeId);
         if (includeSelf && temp != null)
             result.add(temp);
-        while (nodeId != null) {
+        while (nodeId != null && nodeId != NodeId.DOCUMENT_NODE) {
         	nodeId = nodeId.getParentId();
             temp = ancestors.get(child.getDocument(), nodeId);
             if (temp != null)

Modified: trunk/eXist/src/org/exist/xquery/LocationStep.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/LocationStep.java	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/xquery/LocationStep.java	2009-03-29 09:45:04 UTC (rev 8773)
@@ -34,10 +34,9 @@
 import org.exist.storage.ElementIndex;
 import org.exist.storage.ElementValue;
 import org.exist.storage.UpdateListener;
-import org.exist.xquery.value.Item;
-import org.exist.xquery.value.MemoryNodeSet;
-import org.exist.xquery.value.Sequence;
-import org.exist.xquery.value.Type;
+import org.exist.xquery.value.*;
+import org.exist.memtree.NodeImpl;
+import org.exist.memtree.InMemoryNodeSet;
 import org.w3c.dom.Node;
 
 import java.util.Iterator;
@@ -181,6 +180,43 @@
         if (predicates.size() == 0)
             // Nothing to apply
             return contextSequence;
+        Sequence result;
+        Predicate pred = (Predicate) predicates.get(0);
+        // If the current step is an // abbreviated step, we have to treat the predicate
+        // specially to get the context position right. //a[1] translates to /descendant-or-self::node()/a[1],
+        // so we need to return the 1st a from any parent of a.
+        //
+        // If the predicate is known to return a node set, no special treatment is required.
+        if (abbreviatedStep &&
+                (pred.getExecutionMode() != Predicate.NODE || !contextSequence.isPersistentSet())) {
+            result = new ValueSequence();
+            if (contextSequence.isPersistentSet()) {
+                NodeSet contextSet = contextSequence.toNodeSet();
+                outerSequence = contextSet.getParents(getExpressionId());
+                for (SequenceIterator i = outerSequence.iterate(); i.hasNext(); ) {
+                    NodeValue node = (NodeValue) i.nextItem();
+                    Sequence newContextSeq =
+                            contextSet.selectParentChild((NodeSet) node, NodeSet.DESCENDANT, getExpressionId());
+                    Sequence temp = processPredicate(outerSequence, newContextSeq);
+                    result.addAll(temp);
+                }
+            } else {
+                MemoryNodeSet nodes = contextSequence.toMemNodeSet();
+                outerSequence = nodes.getParents(new AnyNodeTest());
+                for (SequenceIterator i = outerSequence.iterate(); i.hasNext(); ) {
+                    NodeValue node = (NodeValue) i.nextItem();
+                    InMemoryNodeSet newSet = new InMemoryNodeSet();
+                    ((NodeImpl)node).selectChildren(test, newSet);
+                    Sequence temp = processPredicate(outerSequence, newSet);
+                    result.addAll(temp);
+                }
+            }
+        } else
+            result = processPredicate(outerSequence, contextSequence);
+        return result;
+    }
+
+    private Sequence processPredicate(Sequence outerSequence, Sequence contextSequence) throws XPathException {
         Predicate pred;
         Sequence result = contextSequence;
         for (Iterator i = predicates.iterator(); i.hasNext();) {

Modified: trunk/eXist/src/org/exist/xquery/Predicate.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Predicate.java	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/xquery/Predicate.java	2009-03-29 09:45:04 UTC (rev 8773)
@@ -47,10 +47,10 @@
  */
 public class Predicate extends PathExpr {
 
-	private final static int UNKNOWN = -1;
-	private final static int NODE = 0;
-    private final static int BOOLEAN = 1;
-    private final static int POSITIONAL = 2;
+	public final static int UNKNOWN = -1;
+	public final static int NODE = 0;
+    public final static int BOOLEAN = 1;
+    public final static int POSITIONAL = 2;
 
 	private CachedResult cached = null;
 
@@ -390,11 +390,12 @@
 
         		if (outerSequence instanceof VirtualNodeSet) {
 
-        			outerNodeSet = new NewArrayNodeSet();
-        			for (int i = 0 ; i < outerSequence.getItemCount() ; i++) {
-        				outerNodeSet.add(outerSequence.itemAt(i));
-        			}
-
+                    // Looks like we don't need to treat VirtualNodeSet specially here.
+                    outerNodeSet = outerSequence.toNodeSet();
+//        			outerNodeSet = new NewArrayNodeSet();
+//        			for (int i = 0 ; i < outerSequence.getItemCount() ; i++) {
+//        				outerNodeSet.add(outerSequence.itemAt(i));
+//        			}
         		} else outerNodeSet = outerSequence.toNodeSet();
 
         		//Comment the line below if you have uncommented the lines above :-)
@@ -403,11 +404,12 @@
             	//outerSequence.toNodeSet() will generate a document
             	//which will be different from the one(s) in contextSet
             	//ancestors will thus be empty :-(
-            	if (outerSequence instanceof VirtualNodeSet)
-            		((VirtualNodeSet)outerSequence).realize();
-//                Sequence ancestors = outerNodeSet.selectAncestors(contextSet, true, getExpressionId());
-                Sequence ancestors = contextSet.selectAncestorDescendant(outerNodeSet,
-						NodeSet.ANCESTOR, true, getExpressionId());
+
+                // A special treatment of VirtualNodeSet does not seem to be required
+                // anymore, at least for trunk:
+//            	if (outerSequence instanceof VirtualNodeSet)
+//            		((VirtualNodeSet)outerSequence).realize();
+                Sequence ancestors = outerNodeSet.selectAncestors(contextSet, true, getExpressionId());
 				if (contextSet.getDocumentSet().intersection(outerNodeSet.getDocumentSet()).getDocumentCount() == 0)
 					LOG.info("contextSet and outerNodeSet don't share any document");
 				NewArrayNodeSet temp = new NewArrayNodeSet(100);
@@ -539,7 +541,11 @@
 		if (getLength() > 0)
 			getExpression(0).setContextDocSet(contextSet);
 	}
-	
+
+    public int getExecutionMode() {
+        return executionMode;
+    }
+    
 	/* (non-Javadoc)
 	 * @see org.exist.xquery.PathExpr#resetState()
 	 */

Modified: trunk/eXist/src/org/exist/xquery/Step.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Step.java	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/xquery/Step.java	2009-03-29 09:45:04 UTC (rev 8773)
@@ -36,6 +36,7 @@
 	protected final static Logger LOG = Logger.getLogger(Step.class);
 	
     protected int axis = Constants.UNKNOWN_AXIS;
+    protected boolean abbreviatedStep = false;
     protected ArrayList predicates = new ArrayList();
     protected NodeTest test;
 	protected boolean inPredicate = false;
@@ -113,6 +114,14 @@
 		this.axis = axis;
 	}
 
+    public boolean isAbbreviated() {
+        return abbreviatedStep;
+    }
+
+    public void setAbbreviated(boolean abbrev) {
+        abbreviatedStep = abbrev;
+    }
+
     /* (non-Javadoc)
      * @see org.exist.xquery.Expression#dump(org.exist.xquery.util.ExpressionDumper)
      */

Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g	2009-03-29 09:45:04 UTC (rev 8773)
@@ -1364,8 +1364,10 @@
 						s.getTest().getType() == Type.ATTRIBUTE)
 						// combines descendant-or-self::node()/attribute:*
 						s.setAxis(Constants.DESCENDANT_ATTRIBUTE_AXIS);
-					else
+					else {
 						s.setAxis(Constants.DESCENDANT_SELF_AXIS);
+						s.setAbbreviated(true);
+					}
 				} else
 					step.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
 			}
@@ -1700,10 +1702,11 @@
 						rs.getTest().getType() == Type.ATTRIBUTE) {
 						rs.setAxis(Constants.DESCENDANT_ATTRIBUTE_AXIS);
 					} else if (rs.getAxis() == Constants.CHILD_AXIS && rs.getTest().isWildcardTest()) {
-                                                rs.setAxis(Constants.DESCENDANT_AXIS);
-                                        } else {
-			                        rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
-                                        }
+						rs.setAxis(Constants.DESCENDANT_AXIS);
+					} else {
+						rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
+						rs.setAbbreviated(true);
+					}
 
 				} else {
 					rightStep.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
@@ -1716,8 +1719,10 @@
 		)?
 	)
 	{
-		if (step instanceof LocationStep && ((LocationStep) step).getAxis() == Constants.UNKNOWN_AXIS)
+		if (step instanceof LocationStep && ((LocationStep) step).getAxis() == Constants.UNKNOWN_AXIS) {
 			 ((LocationStep) step).setAxis(Constants.DESCENDANT_SELF_AXIS);
+			 ((LocationStep) step).setAbbreviated(true);
+		}
 	}
 	;
 

Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java	2009-03-28 21:08:27 UTC (rev 8772)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java	2009-03-29 09:45:04 UTC (rev 8773)
@@ -2632,8 +2632,10 @@
 										s.getTest().getType() == Type.ATTRIBUTE)
 										// combines descendant-or-self::node()/attribute:*
 										s.setAxis(Constants.DESCENDANT_ATTRIBUTE_AXIS);
-									else
+									else {
 										s.setAxis(Constants.DESCENDANT_SELF_AXIS);
+										s.setAbbreviated(true);
+									}
 								} else
 									step.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
 							
@@ -6470,10 +6472,11 @@
 										rs.getTest().getType() == Type.ATTRIBUTE) {
 										rs.setAxis(Constants.DESCENDANT_ATTRIBUTE_AXIS);
 									} else if (rs.getAxis() == Constants.CHILD_AXIS && rs.getTest().isWildcardTest()) {
-				rs.setAxis(Constants.DESCENDANT_AXIS);
-				} else {
-							                        rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
-				}
+										rs.setAxis(Constants.DESCENDANT_AXIS);
+									} else {
+										rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
+										rs.setAbbreviated(true);
+									}
 				
 								} else {
 									rightStep.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
@@ -6498,8 +6501,10 @@
 			_t = __t191;
 			_t = _t.getNextSibling();
 			
-					if (step instanceof LocationStep && ((LocationStep) step).getAxis() == Constants.UNKNOWN_AXIS)
+					if (step instanceof LocationStep && ((LocationStep) step).getAxis() == Constants.UNKNOWN_AXIS) {
 						 ((LocationStep) step).setAxis(Constants.DESCENDANT_SELF_AXIS);
+						 ((LocationStep) step).setAbbreviated(true);
+					}
 				
 			break;
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8772
          http://exist.svn.sourceforge.net/exist/?rev=8772&view=rev
Author:   deliriumsky
Date:     2009-03-28 21:08:27 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
[bugfix] Make sure DOMStreamer is always returned to the SerializerPool. Back-port of rev 8770

Revision Links:
--------------
    http://exist.svn.sourceforge.net/exist/?rev=8770&view=rev

Modified Paths:
--------------
    branches/eXist-stable-1.2/src/org/exist/memtree/NodeImpl.java

Modified: branches/eXist-stable-1.2/src/org/exist/memtree/NodeImpl.java
===================================================================
--- branches/eXist-stable-1.2/src/org/exist/memtree/NodeImpl.java	2009-03-28 18:10:08 UTC (rev 8771)
+++ branches/eXist-stable-1.2/src/org/exist/memtree/NodeImpl.java	2009-03-28 21:08:27 UTC (rev 8772)
@@ -22,9 +22,6 @@
  */
 package org.exist.memtree;
 
-import java.util.Iterator;
-import java.util.Properties;
-
 import org.exist.dom.DocumentSet;
 import org.exist.dom.EmptyNodeSet;
 import org.exist.dom.NodeSet;
@@ -638,10 +635,12 @@
             
 			streamer.serialize(this, false);
 		} catch (Exception e) {
-		    SerializerPool.getInstance().returnObject(streamer);
 		    e.printStackTrace();
 			throw new SAXException(e);
-		}
+		} finally {
+            if(streamer != null)
+                SerializerPool.getInstance().returnObject(streamer);
+        }
 	}
 
 	public void copyTo(DBBroker broker, DocumentBuilderReceiver receiver) throws SAXException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8771
          http://exist.svn.sourceforge.net/exist/?rev=8771&view=rev
Author:   deliriumsky
Date:     2009-03-28 18:10:08 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
[bugfix] Make sure DOMStreamer is always returned to the SerializerPool. Port of rev 8770

Revision Links:
--------------
    http://exist.svn.sourceforge.net/exist/?rev=8770&view=rev

Modified Paths:
--------------
    branches/adam/eXist-1.3-hlt/src/org/exist/memtree/NodeImpl.java

Modified: branches/adam/eXist-1.3-hlt/src/org/exist/memtree/NodeImpl.java
===================================================================
--- branches/adam/eXist-1.3-hlt/src/org/exist/memtree/NodeImpl.java	2009-03-28 18:05:32 UTC (rev 8770)
+++ branches/adam/eXist-1.3-hlt/src/org/exist/memtree/NodeImpl.java	2009-03-28 18:10:08 UTC (rev 8771)
@@ -669,10 +669,12 @@
             
 			streamer.serialize(this, false);
 		} catch (Exception e) {
-		    SerializerPool.getInstance().returnObject(streamer);
 		    e.printStackTrace();
 			throw new SAXException(e);
-		}
+		} finally {
+            if(streamer != null)
+                SerializerPool.getInstance().returnObject(streamer);
+        }
 	}
 
 	public void copyTo(DBBroker broker, DocumentBuilderReceiver receiver) throws SAXException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8770
          http://exist.svn.sourceforge.net/exist/?rev=8770&view=rev
Author:   deliriumsky
Date:     2009-03-28 18:05:32 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
[bugfix] Make sure DOMStreamer is always returned to the SerializerPool

Modified Paths:
--------------
    trunk/eXist/src/org/exist/memtree/NodeImpl.java

Modified: trunk/eXist/src/org/exist/memtree/NodeImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/NodeImpl.java	2009-03-28 16:18:17 UTC (rev 8769)
+++ trunk/eXist/src/org/exist/memtree/NodeImpl.java	2009-03-28 18:05:32 UTC (rev 8770)
@@ -669,10 +669,12 @@
             
 			streamer.serialize(this, false);
 		} catch (Exception e) {
-		    SerializerPool.getInstance().returnObject(streamer);
 		    e.printStackTrace();
 			throw new SAXException(e);
-		}
+		} finally {
+            if(streamer != null)
+                SerializerPool.getInstance().returnObject(streamer);
+        }
 	}
 
 	public void copyTo(DBBroker broker, DocumentBuilderReceiver receiver) throws SAXException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8769
          http://exist.svn.sourceforge.net/exist/?rev=8769&view=rev
Author:   deliriumsky
Date:     2009-03-28 16:18:17 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Add licence template for Netbeans

Modified Paths:
--------------
    branches/adam/eXist-1.3-hlt/nbproject/project.properties

Added Paths:
-----------
    branches/adam/eXist-1.3-hlt/nbproject/eXist LGPL.template

Added: branches/adam/eXist-1.3-hlt/nbproject/eXist LGPL.template
===================================================================
--- branches/adam/eXist-1.3-hlt/nbproject/eXist LGPL.template	                        (rev 0)
+++ branches/adam/eXist-1.3-hlt/nbproject/eXist LGPL.template	2009-03-28 16:18:17 UTC (rev 8769)
@@ -0,0 +1,26 @@
+<#if licenseFirst??>
+${licenseFirst}
+</#if>
+${licensePrefix}
+${licensePrefix}eXist Open Source Native XML Database
+${licensePrefix}Copyright (C) ${date?date?string("yyyy")} The eXist team
+${licensePrefix}http://exist-db.org
+${licensePrefix}
+${licensePrefix}This program is free software; you can redistribute it and/or
+${licensePrefix}modify it under the terms of the GNU Lesser General Public License
+${licensePrefix}as published by the Free Software Foundation; either version 2
+${licensePrefix}of the License, or (at your option) any later version.
+${licensePrefix}
+${licensePrefix}This program is distributed in the hope that it will be useful,
+${licensePrefix}but WITHOUT ANY WARRANTY; without even the implied warranty of
+${licensePrefix}MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+${licensePrefix}GNU Lesser General Public License for more details.
+${licensePrefix}
+${licensePrefix}You should have received a copy of the GNU Lesser General Public
+${licensePrefix}License along with this library; if not, write to the Free Software
+${licensePrefix}Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+${licensePrefix}
+${licensePrefix}$Id$
+<#if licenseLast??>
+${licenseLast}
+</#if>

Modified: branches/adam/eXist-1.3-hlt/nbproject/project.properties
===================================================================
--- branches/adam/eXist-1.3-hlt/nbproject/project.properties	2009-03-28 16:17:46 UTC (rev 8768)
+++ branches/adam/eXist-1.3-hlt/nbproject/project.properties	2009-03-28 16:18:17 UTC (rev 8769)
@@ -225,3 +225,4 @@
 file.reference.commons-collections-3.2.1.jar=lib/core/commons-collections-3.2.1.jar
 debug.classpath=${run.classpath}
 file.reference.excalibur-instrument-manager-1.0.jar=lib/cocoon/excalibur-instrument-manager-1.0.jar
+project.license=eXist LGPL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8768
          http://exist.svn.sourceforge.net/exist/?rev=8768&view=rev
Author:   deliriumsky
Date:     2009-03-28 16:17:46 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Add licence template

Modified Paths:
--------------
    trunk/eXist/nbproject/project.properties

Added Paths:
-----------
    trunk/eXist/nbproject/eXist LGPL.template

Added: trunk/eXist/nbproject/eXist LGPL.template
===================================================================
--- trunk/eXist/nbproject/eXist LGPL.template	                        (rev 0)
+++ trunk/eXist/nbproject/eXist LGPL.template	2009-03-28 16:17:46 UTC (rev 8768)
@@ -0,0 +1,26 @@
+<#if licenseFirst??>
+${licenseFirst}
+</#if>
+${licensePrefix}
+${licensePrefix}eXist Open Source Native XML Database
+${licensePrefix}Copyright (C) ${date?date?string("yyyy")} The eXist team
+${licensePrefix}http://exist-db.org
+${licensePrefix}
+${licensePrefix}This program is free software; you can redistribute it and/or
+${licensePrefix}modify it under the terms of the GNU Lesser General Public License
+${licensePrefix}as published by the Free Software Foundation; either version 2
+${licensePrefix}of the License, or (at your option) any later version.
+${licensePrefix}
+${licensePrefix}This program is distributed in the hope that it will be useful,
+${licensePrefix}but WITHOUT ANY WARRANTY; without even the implied warranty of
+${licensePrefix}MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+${licensePrefix}GNU Lesser General Public License for more details.
+${licensePrefix}
+${licensePrefix}You should have received a copy of the GNU Lesser General Public
+${licensePrefix}License along with this library; if not, write to the Free Software
+${licensePrefix}Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+${licensePrefix}
+${licensePrefix}$Id$
+<#if licenseLast??>
+${licenseLast}
+</#if>

Modified: trunk/eXist/nbproject/project.properties
===================================================================
--- trunk/eXist/nbproject/project.properties	2009-03-28 15:44:36 UTC (rev 8767)
+++ trunk/eXist/nbproject/project.properties	2009-03-28 16:17:46 UTC (rev 8768)
@@ -225,3 +225,4 @@
 file.reference.commons-collections-3.2.1.jar=lib/core/commons-collections-3.2.1.jar
 debug.classpath=${run.classpath}
 file.reference.excalibur-instrument-manager-1.0.jar=lib/cocoon/excalibur-instrument-manager-1.0.jar
+project.license=eXist LGPL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.