* gnu/xml/*: Imported from GNU JAXP.

       * javax/xml/*: Likewise.
       * external/*: Imported external sax and w3c_dom projects.
       * LICENSE: Add new copyright and distribution notices.
       * Makefile.am (SUBDirs): Add external.
       (DIST_SUBDIRS): Likewise.
       * configure.ac (AC_CONFIG_FILES): Add external/Makefile,
       external/sax/Makefile and external/w3c_dom/Makefile.
       * lib/gen-classlist.sh.in (FIND): Search in external/sax and
       external/w3c_dom.
       (Split): Add new classes.xml for gcj.
       * lib/Makefile.am (compile_classpath): Add external/sax and
       external/w3c_dom.
       (FOUND_GCJ): Compile classes.xml.
       * lib/.cvsignore: Add classes.xml.
       * .classpath: Updated exclusion filter and add external projects plus
       examples.

3 files changed, 10 insertions, 6 deletions

diff --git a/lib/.cvsignore b/lib/.cvsignore
index b5789254a..d1591316a 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -11,6 +11,7 @@ classes.locale1
 classes.locale2
 classes.standard
 classes.standardx
+classes.xml
 glibj.zip
 deps.sh
 gen-classlist.sh
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 220c07000..c9a2bd44e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@ FIND = @FIND@
 propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -type d ! -name CVS -print)
 propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print)
 
-compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB)
+compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
@@ -24,6 +24,7 @@ JAVAC = $(GCJ) --bootclasspath '' --classpath $(compile_classpath) -C -d . @clas
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.awt \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale1 \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.locale2 \
+&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.xml \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) -C -d . @classes.standardx
 else
 if FOUND_JIKES
@@ -97,7 +98,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile
 
 EXTRA_DIST = standard.omit mkcollections.pl.in
 CLEANFILES = compile-classes resources classes \
-	classes.standard classes.awt classes.standardx \
+	classes.standard classes.awt classes.standardx classes.xml \
 	classes.locale1 classes.locale2 glibj.zip classes.1 \
 	$(top_builddir)/java/util/LocaleData.java \
 	$(JAVA_DEPEND)
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in
index 858bd6f75..584565e47 100755
--- a/lib/gen-classlist.sh.in
+++ b/lib/gen-classlist.sh.in
@@ -1,9 +1,9 @@
 #! @SH@
 # @configure_input@
 if test "@top_srcdir@" = "${top_builddir}"; then
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
 else
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
 fi
 
 for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done
@@ -30,9 +30,11 @@ fi
 # Split in multiple parts for gcj
 grep -v /javax/ classes | grep -v /awt/ \
                         | grep -v /beans/ \
-                        | grep -v /locale/ > classes.standard
+                        | grep -v /locale/ \
+			| grep -v /xml/ > classes.standard
 grep /awt/ classes > classes.awt
 grep /beans/ classes >> classes.awt
 grep /locale/ classes | grep _[j-z][a-z].java > classes.locale1
 grep /locale/ classes | grep -v _[j-z][a-z].java > classes.locale2
-grep /javax/ classes > classes.standardx
+grep /xml/ classes > classes.xml
+grep /javax/ classes | grep -v /xml/ > classes.standardx