db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r380287 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
Date Fri, 24 Feb 2006 00:51:27 GMT
Author: fuzzylogic
Date: Thu Feb 23 16:51:26 2006
New Revision: 380287

URL: http://svn.apache.org/viewcvs?rev=380287&view=rev
Log:
DERBY-417: Remove hardcoded references to encryption providers in Beetle6038 and
let Derby choose the correct encryption provider. This allows the test to pass
on Mac OS X and any other JVM where the vendor is not Sun or IBM.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java?rev=380287&r1=380286&r2=380287&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
Thu Feb 23 16:51:26 2006
@@ -37,16 +37,7 @@
 	{
 		String driver = "org.apache.derby.jdbc.EmbeddedDriver";
 		Class.forName(driver).newInstance();
-		String dburl = null;
-
-		if(System.getProperty("java.vm.vendor") != null)
-		{
-			String vendor = System.getProperty("java.vm.vendor");
-			if(vendor.toUpperCase().lastIndexOf("SUN") != -1)
-				dburl="jdbc:derby:Beetle6038Db;create=true;dataEncryption=true;bootPassword=Thursday;encryptionAlgorithm=DES/CBC/NoPadding;encryptionProvider=com.sun.crypto.provider.SunJCE";
-			else
-			 dburl = "jdbc:derby:Beetle6038Db;create=true;dataEncryption=true;bootPassword=Thursday;encryptionAlgorithm=DES/CBC/NoPadding;encryptionProvider=com.ibm.crypto.provider.IBMJCE";
-		}
+		String dburl = "jdbc:derby:Beetle6038Db;create=true;dataEncryption=true;bootPassword=Thursday;encryptionAlgorithm=DES/CBC/NoPadding";
 
 		Connection conn = DriverManager.getConnection(dburl);
 		conn.close();



Mime
View raw message