Update libs

build.bat

@@ -21,7 +21,7 @@ set EXIST_HOME=%CD%
 
 :gotExistHome
 set ANT_HOME=%EXIST_HOME%\tools\ant
-set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher.jar
+set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher-1.9.4.jar
 
 set JAVA_ENDORSED_DIRS=%EXIST_HOME%\lib\endorsed
 

build.sh

@@ -30,7 +30,7 @@ fi
 
 ANT_HOME="$EXIST_HOME/tools/ant"
 
-LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher.jar"
+LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher-1.9.4.jar"
 
 JAVA_ENDORSED_DIRS="$EXIST_HOME"/lib/endorsed
 

build/scripts/build-impl.xml

@@ -102,7 +102,7 @@
         <classpath refid="classpath.core"/>
     </taskdef>
 
-    <taskdef classpath="${tools.aspectj}/lib/aspectjtools-1.8.2.jar" resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
+    <taskdef classpath="${tools.aspectj}/lib/aspectjtools-1.8.4.jar" resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"/>
     <path id="classpath.aspectj">
         <fileset dir="${tools.aspectj}/lib">
             <include name="*.jar"/>

build/scripts/quality.xml

@@ -18,14 +18,14 @@
 	<!-- import default properties from file -->
     <property file="build.properties"/>
 
-	<!-- You must put tools/ant/lib/jdepend-2.9.jar in the classpath,
+	<!-- You must put tools/ant/lib/jdepend-2.9.1.jar in the classpath,
 	     sorry this an Ant problem. -->
     <target name="jdepend" description="Run jdepend" depends="compile">
 
         <taskdef name="jdepend" loaderref="ant.classpath"
                 classname="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask">
             <classpath>
-                <pathelement path="$(tools.ant)/lib/jdepend-2.9.jar" />
+                <pathelement path="$(tools.ant)/lib/jdepend-2.9.1.jar" />
             </classpath>
         </taskdef>
 
@@ -41,7 +41,7 @@
             </classespath>
         </jdepend>
 
-        <style  destdir="test/jdepend/html"
+        <xslt  destdir="test/jdepend/html"
                includes="test/jdepend/data/jdepend.xml" 
                style="${tools.ant}/etc/jdepend-frames.xsl" />
 

extensions/modules/src/org/exist/xquery/modules/exi/DecodeExiFunction.java

@@ -47,7 +47,7 @@
 import com.siemens.ct.exi.GrammarFactory;
 import com.siemens.ct.exi.api.sax.SAXDecoder;
 import com.siemens.ct.exi.exceptions.EXIException;
-import com.siemens.ct.exi.grammar.Grammar;
+import com.siemens.ct.exi.grammars.Grammars;
 import com.siemens.ct.exi.helpers.DefaultEXIFactory;
 
 /**
@@ -102,8 +102,8 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
 					Item xsdItem = args[1].itemAt(0);
 					InputStream xsdInputStream = EXIUtils.getInputStream(xsdItem, context);
 					GrammarFactory grammarFactory = GrammarFactory.newInstance();
-					Grammar grammar = grammarFactory.createGrammar(xsdInputStream);
-					exiFactory.setGrammar(grammar);
+					Grammars grammar = grammarFactory.createGrammars(xsdInputStream);
+					exiFactory.setGrammars(grammar);
 				}
 			}
 			SAXDecoder decoder = new SAXDecoder(exiFactory);
@@ -125,4 +125,4 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
 		}
 	}
 
-}
+}

src/org/exist/util/serializer/EXISerializer.java

@@ -36,7 +36,7 @@
 import com.siemens.ct.exi.GrammarFactory;
 import com.siemens.ct.exi.api.sax.SAXEncoder;
 import com.siemens.ct.exi.exceptions.EXIException;
-import com.siemens.ct.exi.grammar.Grammar;
+import com.siemens.ct.exi.grammars.Grammars;
 import com.siemens.ct.exi.helpers.DefaultEXIFactory;
 
 public class EXISerializer implements ContentHandler, Receiver {
@@ -54,8 +54,8 @@ public EXISerializer(OutputStream exiOutputStream) throws EXIException, IOExcept
 	public EXISerializer(OutputStream exiOutputStream, InputStream xsdInputStream) throws EXIException, IOException {
 		final EXIFactory exiFactory = DefaultEXIFactory.newInstance();
 		final GrammarFactory grammarFactory = GrammarFactory.newInstance();
-		final Grammar g = grammarFactory.createGrammar(xsdInputStream);
-		exiFactory.setGrammar(g);
+		final Grammars g = grammarFactory.createGrammars(xsdInputStream);
+		exiFactory.setGrammars(g);
 		encoder = new SAXEncoder(exiFactory);
 		encoder.setOutputStream(exiOutputStream);
 	}
@@ -200,4 +200,4 @@ void setEncoder(SAXEncoder encoder) {
 		this.encoder = encoder;
 	}
 
-}
+}

tools/ant/etc/jdepend-frames.xsl

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:lxslt="http://xml.apache.org/xslt"
-  xmlns:redirect="org.apache.xalan.lib.Redirect"
+  xmlns:redirect="http://xml.apache.org/xalan/redirect"
   extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
 <!--