directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r952216 - in /directory: apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java
Date Mon, 07 Jun 2010 13:28:19 GMT
Author: felixk
Date: Mon Jun  7 13:28:19 2010
New Revision: 952216

URL: http://svn.apache.org/viewvc?rev=952216&view=rev
Log:
Former BEA JRockit has become Oracle JRockit in its latest release

Modified:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
    directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=952216&r1=952215&r2=952216&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
Mon Jun  7 13:28:19 2010
@@ -143,7 +143,12 @@ public class KeyDerivationServiceIT exte
          }
          else if ( vendor.equalsIgnoreCase( "BEA Systems, Inc." ) )
          {
-             // Could be 4 or 5 depending on whether AES-256 is enabled or not, on JRockit
+             // Could be 4 or 5 depending on whether AES-256 is enabled or not, on BEA JRockit
+             assertTrue( "Number of keys", krb5key.size() > 3 );
+         }
+         else if ( vendor.equalsIgnoreCase( "Oracle Corporation" ) )
+         {
+             // Could be 4 or 5 depending on whether AES-256 is enabled or not, on Oracle
JRockit
              assertTrue( "Number of keys", krb5key.size() > 3 );
          }
          else if ( vendor.equalsIgnoreCase( "Apple Inc." ) )

Modified: directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java?rev=952216&r1=952215&r2=952216&view=diff
==============================================================================
--- directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java
(original)
+++ directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/UniversalContextFactory.java
Mon Jun  7 13:28:19 2010
@@ -37,7 +37,8 @@ public class UniversalContextFactory imp
 {
     private static final String SUN_ICF_FQCN = "com.sun.jndi.ldap.LdapCtxFactory";
     private static final String IBM_ICF_FQCN = "com.ibm.jndi.LDAPCtxFactory";
-    private static final String BEA_ICF_FQCN = SUN_ICF_FQCN;  // JRocket might use SUN classes
+    private static final String BEA_ICF_FQCN = SUN_ICF_FQCN;  // BEA JRocket might use SUN
classes
+    private static final String ORACLE_FQCN = BEA_ICF_FQCN;  // Oracle JRocket is the former
BEA JRockit
     private static final String ICF_FQCN;
     
     
@@ -56,6 +57,10 @@ public class UniversalContextFactory imp
         }
         else if ( jvmVendor.equalsIgnoreCase( "BEA Systems, Inc." ) )
         {
+            ICF_FQCN = ORACLE_FQCN;
+        }
+        else if ( jvmVendor.equalsIgnoreCase( "Oracle Corporation" ) )
+        {
             ICF_FQCN = BEA_ICF_FQCN;
         }
         else if ( jvmVendor.equalsIgnoreCase( "IBM, Inc." ) )



Mime
View raw message