Index: fop.sh
===================================================================
RCS file: /home/cvspublic/xml-fop/fop.sh,v
retrieving revision 1.5
diff -u -r1.5 fop.sh
--- fop.sh	30 Nov 2002 08:54:25 -0000	1.5
+++ fop.sh	30 Dec 2003 18:19:07 -0000
@@ -79,7 +79,7 @@
 LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
 
 # add in the dependency .jar files, which reside in $FOP_HOME/lib
-DIRLIBS=${FOP_HOME}/lib/*.jar
+DIRLIBS="${FOP_HOME}/lib/*.jar ${FOP_HOME}/lib/endorsed/*.jar"
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
@@ -93,12 +93,17 @@
     fi
 done
 
+if [ -z "$JAVA_ENDORSED_DIRS" ] ; then
+  JAVA_ENDORSED_DIRS=${FOP_HOME}/lib/endorsed
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   FOP_HOME=`cygpath --path --windows "$FOP_HOME"`
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
 fi
 
-$JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
+$JAVACMD -classpath "$LOCALCLASSPATH" -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" $FOP_OPTS org.apache.fop.apps.Fop "$@"
 
Index: fop.bat
===================================================================
RCS file: /home/cvspublic/xml-fop/fop.bat,v
retrieving revision 1.14
diff -u -r1.14 fop.bat
--- fop.bat	14 Jul 2003 07:40:50 -0000	1.14
+++ fop.bat	30 Dec 2003 18:19:27 -0000
@@ -5,7 +5,11 @@
 if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME=%~dp0
 
 set LIBDIR=%LOCAL_FOP_HOME%lib
+set ENDORSEDDIR=%LIBDIR%\endorsed
 set LOCALCLASSPATH=%LOCAL_FOP_HOME%build\fop.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%ENDORSEDDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%ENDORSEDDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%ENDORSEDDIR%\xalan-2.4.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
@@ -15,5 +19,5 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
-java -cp "%LOCALCLASSPATH%" org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+java -cp "%LOCALCLASSPATH%" -Djava.endorsed.dirs="%ENDORSEDDIR%" org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8