changeset 1569:f094eb92a6e0

Merge
author sherman
date Thu, 13 Aug 2009 15:12:32 -0700
parents 35f32639ee20 6797a2407a50
children 7fcdefc99dc4 5429444e93b1
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/security/sasl/Provider.java	Thu Aug 13 15:01:18 2009 -0700
+++ b/src/share/classes/com/sun/security/sasl/Provider.java	Thu Aug 13 15:12:32 2009 -0700
@@ -51,7 +51,7 @@
         " server mechanisms for: DIGEST-MD5, GSSAPI, CRAM-MD5)";
 
     public Provider() {
-        super("SunSASL", 1.5, info);
+        super("SunSASL", 1.7d, info);
 
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
--- a/src/share/classes/sun/security/jgss/SunProvider.java	Thu Aug 13 15:01:18 2009 -0700
+++ b/src/share/classes/sun/security/jgss/SunProvider.java	Thu Aug 13 15:12:32 2009 -0700
@@ -62,7 +62,7 @@
 
     public SunProvider() {
         /* We are the Sun JGSS provider */
-        super("SunJGSS", 1.0, INFO);
+        super("SunJGSS", 1.7d, INFO);
 
         AccessController.doPrivileged(
                         new java.security.PrivilegedAction<Void>() {
--- a/src/share/classes/sun/security/provider/Sun.java	Thu Aug 13 15:01:18 2009 -0700
+++ b/src/share/classes/sun/security/provider/Sun.java	Thu Aug 13 15:12:32 2009 -0700
@@ -46,7 +46,7 @@
 
     public Sun() {
         /* We are the SUN provider */
-        super("SUN", 1.6, INFO);
+        super("SUN", 1.7, INFO);
 
         // if there is no security manager installed, put directly into
         // the provider. Otherwise, create a temporary map and use a
--- a/src/share/classes/sun/security/smartcardio/SunPCSC.java	Thu Aug 13 15:01:18 2009 -0700
+++ b/src/share/classes/sun/security/smartcardio/SunPCSC.java	Thu Aug 13 15:12:32 2009 -0700
@@ -40,7 +40,7 @@
     private static final long serialVersionUID = 6168388284028876579L;
 
     public SunPCSC() {
-        super("SunPCSC", 1.6d, "Sun PC/SC provider");
+        super("SunPCSC", 1.7d, "Sun PC/SC provider");
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 put("TerminalFactory.PC/SC", "sun.security.smartcardio.SunPCSC$Factory");
--- a/src/share/classes/sun/security/ssl/SunJSSE.java	Thu Aug 13 15:01:18 2009 -0700
+++ b/src/share/classes/sun/security/ssl/SunJSSE.java	Thu Aug 13 15:12:32 2009 -0700
@@ -103,7 +103,7 @@
 
     // standard constructor
     protected SunJSSE() {
-        super("SunJSSE", 1.6d, info);
+        super("SunJSSE", 1.7d, info);
         subclassCheck();
         if (Boolean.TRUE.equals(fips)) {
             throw new ProviderException