2006-03-02 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics-branch for the period between
	the 0.20 release and the tag generics-merge-20050225.

3 files changed, 56 insertions, 0 deletions

diff --git a/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory b/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory
new file mode 100644
index 000000000..6fc0b4bb2
--- /dev/null
+++ b/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory
@@ -0,0 +1 @@
+gnu.xml.validation.datatype.TypeLibraryFactory
diff --git a/resource/gnu/javax/security/auth/callback/MessagesBundle.properties b/resource/gnu/javax/security/auth/callback/MessagesBundle.properties
new file mode 100644
index 000000000..95ad337f5
--- /dev/null
+++ b/resource/gnu/javax/security/auth/callback/MessagesBundle.properties
@@ -0,0 +1,52 @@
+# MessagesBundle.properties -- Default messages bundle.
+# Copyright (C) 2005  Free Software Foundation, Inc.
+#
+# This file is a part of GNU Classpath.
+#
+# GNU Classpath is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# GNU Classpath is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Classpath; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Linking this library statically or dynamically with other modules is
+# making a combined work based on this library.  Thus, the terms and
+# conditions of the GNU General Public License cover the whole
+# combination.
+#
+# As a special exception, the copyright holders of this library give
+# you permission to link this library with independent modules to
+# produce an executable, regardless of the license terms of these
+# independent modules, and to copy and distribute the resulting
+# executable under terms of your choice, provided that you also meet,
+# for each linked independent module, the terms and conditions of the
+# license of that module.  An independent module is a module which is
+# not derived from or based on this library.  If you modify this
+# library, you may extend this exception to your version of the
+# library, but you are not obligated to do so.  If you do not wish to
+# do so, delete this exception statement from your version.
+
+callback.yesNo=(yes or no)\ 
+callback.yesNoCancel=(yes, no, cancel)\ 
+callback.okCancel=(ok or cancel)\ 
+callback.language=Choose your language:\ 
+
+callback.yes=Yes
+callback.shortYes=y
+callback.no=No
+callback.shortNo=n
+callback.cancel=Cancel
+callback.ok=Okay
+
+callback.error=Error
+callback.information=Information
+callback.warning=Warning
diff --git a/resource/java/security/classpath.security b/resource/java/security/classpath.security
index c8e9dac94..cc7d49378 100644
--- a/resource/java/security/classpath.security
+++ b/resource/java/security/classpath.security
@@ -37,3 +37,6 @@
 
 
 security.provider.1=gnu.java.security.provider.Gnu
+security.provider.2=gnu.javax.crypto.jce.GnuCrypto
+security.provider.3=gnu.javax.crypto.jce.GnuSasl
+security.provider.4=gnu.javax.net.ssl.provider.Jessie