--- ./src/org/apache/fop/apps/InputHandler.java.notxi	2003-07-15 04:03:18.000000000 +0200
+++ ./src/org/apache/fop/apps/InputHandler.java	2005-10-17 15:31:53.000000000 +0200
@@ -103,8 +103,9 @@
         try {
             SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
+            spf.setXIncludeAware(true);
             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-            MessageHandler.logln("Using " + xmlReader.getClass().getName() + " as SAX2 Parser"); 
+            MessageHandler.logln("Using " + xmlReader.getClass().getName() + " (xinclude aware) "+ " as SAX2 Parser"); 
             return xmlReader;
         } catch (javax.xml.parsers.ParserConfigurationException e) {
           throw new FOPException(e);
--- ./build.xml.notxi	2003-07-15 04:03:22.000000000 +0200
+++ ./build.xml	2005-10-17 17:19:36.000000000 +0200
@@ -287,7 +287,7 @@
     -->
 
     <property name="main.class" value="org.apache.fop.apps.Fop"/>
-    <property name="runtime.classpath" value="xercesImpl-2.2.1.jar xml-apis.jar xalan-2.4.1.jar batik.jar jimi-1.0.jar avalon-framework-cvs-20020806.jar"/>
+    <property name="runtime.classpath" value="xercesImpl-2.7.1.jar xml-apis.jar xalan-2.7.0.jar batik.jar jimi-1.0.jar avalon-framework-cvs-20020806.jar"/>
 
     <filter filtersfile="${build.codegen}/filter"/>
   </target>
--- ./build.sh.notxi	2003-07-15 04:03:21.000000000 +0200
+++ ./build.sh	2005-10-17 17:51:55.000000000 +0200
@@ -27,12 +27,12 @@
 
 
 LIBDIR=lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant-1.5.1.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
+CLASSPATH=$CLASSPATH:$LIBDIR/ant-1.5.1.jar
+CLASSPATH=$CLASSPATH:$LIBDIR/xml-apis.jar
+CLASSPATH=$CLASSPATH:$LIBDIR/xercesImpl-2.7.1.jar
+CLASSPATH=$CLASSPATH:$LIBDIR/xalan-2.7.0.jar
+CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
+CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/classes.zip
 
 # antRun must be executable (can't do this in build.xml because Ant uses antRun
 # to do the chmod)
@@ -43,12 +43,12 @@
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
 fi
 
 echo
-echo Building with classpath $LOCALCLASSPATH
+echo Building with classpath $CLASSPATH
 echo Starting Ant...
 echo
 
-$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH" org.apache.tools.ant.Main $*
+$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$CLASSPATH" org.apache.tools.ant.Main $*