db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r446679 - in /db/derby/code/branches/10.2/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/iapi/sql/dictionary/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNe...
Date Fri, 15 Sep 2006 18:44:04 GMT
Author: rhillegas
Date: Fri Sep 15 11:44:03 2006
New Revision: 446679

URL: http://svn.apache.org/viewvc?view=rev&rev=446679
Log:
DERBY-1725: Merge the following patches from the trunk to the 10.2 branch: DERBY-1675 (441722), DERBY-1809 (441601), DERBY-15222 (441584).

Added:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/
      - copied from r441723, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
      - copied unchanged from r441723, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
      - copied unchanged from r441723, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
Modified:
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/TestProto.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/functions.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions.sql
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri Sep 15 11:44:03 2006
@@ -1688,8 +1688,10 @@
                                 securityMechanism != CodePoint.SECMEC_USRIDONL)
                         {
                             // These are the only other mechanisms we understand
-                            if ((securityMechanism !=
-                                        CodePoint.SECMEC_EUSRIDPWD) &&
+                            if (((securityMechanism != CodePoint.SECMEC_EUSRIDPWD) ||
+                                 (securityMechanism == CodePoint.SECMEC_EUSRIDPWD && 
+                                   !server.supportsEUSRIDPWD())
+                                 ) &&
                                 (securityMechanism !=
                                         CodePoint.SECMEC_USRSSBPWD))
                                 //securityCheckCode = CodePoint.SECCHKCD_NOTSUPPORTED;
@@ -2671,7 +2673,10 @@
                 // mechanisms for value of one SECMEC codepoint (JIRA 926)
                 // these are the ones we know about
                 writer.writeScalar2Bytes(CodePoint.SECMEC, CodePoint.SECMEC_USRIDPWD);
-                writer.writeScalar2Bytes(CodePoint.SECMEC, CodePoint.SECMEC_EUSRIDPWD);
+                // include EUSRIDPWD in the list of supported secmec only if 
+                // server can truely support it in the jvm that is running in
+                if ( server.supportsEUSRIDPWD())
+                    writer.writeScalar2Bytes(CodePoint.SECMEC, CodePoint.SECMEC_EUSRIDPWD);
                 writer.writeScalar2Bytes(CodePoint.SECMEC, CodePoint.SECMEC_USRIDONL);
                 writer.writeScalar2Bytes(CodePoint.SECMEC, CodePoint.SECMEC_USRSSBPWD);
             }

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri Sep 15 11:44:03 2006
@@ -297,8 +297,32 @@
 	// databases it has booted.
 	private boolean shutdownDatabasesOnShutdown = false;
 	
+    // Sun JCE does not have support for EUSRIDPWD, whereas
+    // most versions of IBM JCE have support for this.  Hence
+    // find out if the server can support EUSRIDPWD.
+    private static boolean SUPPORTS_EUSRIDPWD = false;
 
-	// constructor
+    static
+    {
+        try
+        {
+            // The DecryptionManager class will instantiate objects of the required 
+            // security algorithms that are needed for EUSRIDPWD
+            // An exception will be thrown if support is not available
+            // in the JCE implementation in the JVM in which the server
+            // is started.
+            new DecryptionManager();
+            SUPPORTS_EUSRIDPWD = true;
+        }catch(Exception e)
+        {
+            // if an exception is thrown, ignore exception.
+            // set SUPPORTS_EUSRIDPWD to false indicating that the server 
+            // does not have support for EUSRIDPWD security mechanism
+            SUPPORTS_EUSRIDPWD = false;
+        }
+    }
+
+    // constructor
 	public NetworkServerControlImpl() throws Exception
 	{
 		init();
@@ -2578,6 +2602,17 @@
         return null;
     }
    
+    /**
+     * EUSRIDPWD support depends on the availability of the
+     * algorithm in the JCE implementation in the classpath 
+     * of the server. At runtime, information about this 
+     * capability is figured out.  
+     * @return whether EUSRIDPWD is supported or not
+     */
+    boolean supportsEUSRIDPWD()
+    {
+        return SUPPORTS_EUSRIDPWD;
+    }
 	/**
 	 * Get integer property values
 	 *
@@ -2925,7 +2960,12 @@
     {
        allowOnlySecurityMechanism = getSecMecValue(s);
        
-       if (allowOnlySecurityMechanism == INVALID_OR_NOTSET_SECURITYMECHANISM)
+       // if server vm cannot support EUSRIDPWD, then do not allow 
+       // derby.drda.securityMechanism to be set to EUSRIDPWD security
+       // mechanism
+       if ((allowOnlySecurityMechanism == INVALID_OR_NOTSET_SECURITYMECHANISM) ||
+              (allowOnlySecurityMechanism == CodePoint.SECMEC_EUSRIDPWD &&
+              !SUPPORTS_EUSRIDPWD))
            consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
                        {s, Property.DRDA_PROP_SECURITYMECHANISM});
     }

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/TestProto.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/TestProto.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/TestProto.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/TestProto.java Fri Sep 15 11:44:03 2006
@@ -110,6 +110,7 @@
 	private static final int CHECK_SQLCARD = 54;
 	private static final int MORE_DATA = 55;
 	private static final int COMPLETE_TEST = 56;
+    private static final int READ_SECMEC_SECCHKCD = 57;
 
 	private static final String MULTIVAL_START = "MULTIVALSTART";
 	private static final String MULTIVAL_SEP = "SEP";
@@ -324,6 +325,7 @@
 		commandTable.put("checksqlcard", new Integer(CHECK_SQLCARD));
 		commandTable.put("moredata", new Integer(MORE_DATA));
 		commandTable.put("completetest", new Integer(COMPLETE_TEST));
+        commandTable.put("readsecmecandsecchkcd", new Integer(READ_SECMEC_SECCHKCD));
 		
 		Integer key;
 		for (Enumeration e = codePointNameTable.keys(); e.hasMoreElements(); )
@@ -468,6 +470,9 @@
 				val = reader.readByte();
 				checkIntOrCP(val);
 				break;
+            case READ_SECMEC_SECCHKCD:
+                readSecMecAndSECCHKCD();
+                break;
 			case READ_BYTES:
 				byte[] byteArray = reader.readBytes();
 				byte[] reqArray = getBytes();
@@ -884,6 +889,47 @@
 		if (codepoint != reqCP)
 			cpError(codepoint, reqCP);
 	}
+    
+    /**
+     * Handle the case of testing the reading of SECMEC and SECCHKCD, 
+     * where on an invalid SECMEC value for ACCSEC, the server can send 
+     * valid supported SECMEC values. One of the valid supported value can be 
+     * EUSRIDPWD (secmec value of 9) depending on if the server JVM 
+     * can actually support it or not.
+     * @exception   IOException, DRDAProtocolException  error reading file or protocol
+     */
+    private void readSecMecAndSECCHKCD() throws IOException, DRDAProtocolException
+    {
+        int codepoint;
+        boolean notDone = true;
+        int val = -1;
+        do
+        {
+            codepoint = reader.readLengthAndCodePoint();
+            switch(codepoint)
+            {
+              case CodePoint.SECMEC:
+              {
+                  System.out.print("SECMEC=");
+                  val = reader.readNetworkShort();
+                  System.out.print(val+" ");
+              }
+              break;
+              case CodePoint.SECCHKCD:
+              {
+                  System.out.print("SECCHKCD=");
+                  val = reader.readByte();
+                  System.out.println(val);
+                  notDone = false;
+              }
+              break;
+              default:
+                  notDone=false;
+            }
+        }while(notDone);
+    }
+
+    
 	/**
 	 * Codepoint error
  	 *

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java Fri Sep 15 11:44:03 2006
@@ -320,4 +320,13 @@
 	{
 		return specificName;
 	}
+    
+    /**
+     * Functions are persistent unless they are in the SYSFUN schema.
+     *
+     */
+    public boolean isPersistent()
+    {
+        return !getSchemaUUID().toString().equals(SchemaDescriptor.SYSFUN_SCHEMA_UUID);
+    }
 }

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -171,67 +171,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-T1: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION null userid not supported
-T2: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=max; - EXCEPTION null password not supported
-T3: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-T5: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=9; - EXCEPTION java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-T6: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T8: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T9: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=9; - EXCEPTION java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  java.security.InvalidAlgorithmParameterException is caught when initializing EncryptionManager 'Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin; - EXCEPTION null password not supported
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=3; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=9; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes; - EXCEPTION null userid not supported
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:; - EXCEPTION Invalid database url syntax: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;
-TEST_DS()EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=8; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -177,60 +177,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  null userid not supported
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T1: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION null userid not supported
-T2: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=max; - EXCEPTION null password not supported
-T3: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T5: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=9; - EXCEPTION java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-T6: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T8: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T9: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=9; - EXCEPTION java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin; - EXCEPTION null password not supported
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=3; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=9; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  null password not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes; - EXCEPTION null userid not supported
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  null userid not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:; - EXCEPTION Invalid database url syntax: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;
-TEST_DS()EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=8; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  null userid not supported
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -171,67 +171,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-T1: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION null userid not supported
-T2: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=max; - EXCEPTION null password not supported
-T3: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-T5: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=9; - EXCEPTION java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-T6: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T8: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T9: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=9; - EXCEPTION java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  java.lang.ClassNotFoundException is caught when initializing EncryptionManager 'IBMJCE'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin; - EXCEPTION null password not supported
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=3; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=9; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes; - EXCEPTION null userid not supported
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:; - EXCEPTION Invalid database url syntax: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;
-TEST_DS()EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=8; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -171,67 +171,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-T1: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION null userid not supported
-T2: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=max; - EXCEPTION null password not supported
-T3: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-T5: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=9; - EXCEPTION java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-T6: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T8: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-T9: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=neelima;password=lee;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=3; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-SQLSTATE(null): java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=9; - EXCEPTION java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  java.security.NoSuchAlgorithmException is caught when initializing EncryptionManager 'DH KeyPairGenerator not available'
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin; - EXCEPTION null password not supported
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=4; - EXCEPTION Connection authorization failure occurred.  Reason: security mechanism not supported
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authorization failure occurred.  Reason: security mechanism not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=3; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=9; - EXCEPTION null password not supported
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  null password not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:user=calvin;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes; - EXCEPTION null userid not supported
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:password=hobbes;securityMechanism=8; - EXCEPTION security mechanism '8' not supported
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
-Test: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:; - EXCEPTION Invalid database url syntax: jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;
-TEST_DS()EXCEPTION getDataSourceConnection()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=4; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=3; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=9; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  null userid not supported
-# jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat:;securityMechanism=8; - EXCEPTION null userid not supported
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  security mechanism '8' not supported
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -183,62 +183,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T1: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T2: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=max - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T3: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T5: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details.
-T6: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T8: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T9: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-SECMEC_EUSRIDPWD:EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details.
-SECMEC_USRSSBPWD:EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  Security exception encountered, see next exception for details.
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=3 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=9 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=8 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details.
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat; - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS()EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=3 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=9 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=8 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out Fri Sep 15 11:44:03 2006
@@ -183,62 +183,7 @@
 TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
 -----
 Testing with derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
-Checking security mechanism authentication with DriverManager
-T4: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T1: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T2: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=max - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T3: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T5: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-T6: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T8: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-T9: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-SECMEC_USRIDPWD:EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-SECMEC_EUSRIDPWD:EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-SECMEC_USRSSBPWD:EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test DERBY-1080
-withConnectionPooling
-DERBY-1080  EXCEPTION ()  Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-******testAllCombinationsOfUserPasswordsSecMecInput***
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(user=calvin;password=hobbes)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-TEST_DS (user=calvin;password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;password=hobbes;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin;password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(user=calvin)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (user=calvin,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=3 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=3)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=9 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=9)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=calvin;securityMechanism=8 - EXCEPTION Password can not be null.
-TEST_DS (user=calvin,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS(password=hobbes)EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=3 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=3)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=9 - EXCEPTION Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-TEST_DS (password=hobbes,securityMechanism=9)EXCEPTION testSecurityMechanism()  Security exception encountered, see next exception for details. Caused by exception class java.security.NoSuchProviderException: null
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;password=hobbes;securityMechanism=8 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (password=hobbes,securityMechanism=8)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-Test: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat; - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS()EXCEPTION getDataSourceConnection()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=4 - EXCEPTION Connection authentication failure occurred.  Reason: security mechanism not supported.
-TEST_DS (,securityMechanism=4)EXCEPTION testSecurityMechanism()  Connection authentication failure occurred.  Reason: security mechanism not supported.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=3 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=3)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=9 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=9)EXCEPTION testSecurityMechanism()  Password can not be null.
-# jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;;securityMechanism=8 - EXCEPTION Password can not be null.
-TEST_DS (,securityMechanism=8)EXCEPTION testSecurityMechanism()  Password can not be null.
+EXCEPTION DRDA_InvalidValue.U:Invalid value, ENCRYPTED_USER_AND_PASSWORD_SECURITY, for derby.drda.securityMechanism.
 -----
 Testing with derby.drda.securityMechanism=STRONG_PASSWORD_SUBSTITUTE_SECURITY
 Checking security mechanism authentication with DriverManager

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/functions.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/functions.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/functions.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/functions.out Fri Sep 15 11:44:03 2006
@@ -700,6 +700,16 @@
 NULL    
 0.836   
 ERROR 22003: The resulting value is outside the range for the data type DOUBLE.
+ij> CREATE VIEW VSMT AS SELECT SIN(d) sd, PI() pi FROM SYSFUN_MATH_TEST;
+0 rows inserted/updated/deleted
+ij> select cast (sd as DECIMAL(6,3)), cast (pi as DECIMAL(6,3)) from VSMT;
+1       |2       
+-----------------
+NULL    |3.141   
+0.620   |3.141   
+0.973   |3.141   
+ij> drop view VSMT;
+0 rows inserted/updated/deleted
 ij> drop table SYSFUN_MATH_TEST;
 0 rows inserted/updated/deleted
 ij> drop function SYSFUN.ACOS;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out Fri Sep 15 11:44:03 2006
@@ -23,6 +23,7 @@
 ACCSEC doesn't follow EXCSAT
 PASSED
 Test trying security mechanism we don't support
+SECMEC=3 SECMEC=4 SECMEC=8 SECCHKCD=1
 PASSED
 Test trying too big on SECMEC
 PASSED
@@ -33,12 +34,14 @@
 Test missing RDBNAM on ACCSEC
 PASSED
 Test specifying encrypted security mechanism without a security token
+SECMEC=3 SECMEC=4 SECMEC=8 SECCHKCD=1
 PASSED
 Test specifying unencrypted security mechanism with a security token
 PASSED
 Test SECCHK not following after ACCSEC
 PASSED
 Test doing two tries for security mechanism
+SECMEC=3 SECMEC=4 SECMEC=8 SECCHKCD=1
 PASSED
 Test missing SECMEC on SECCHK
 PASSED

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests Fri Sep 15 11:44:03 2006
@@ -139,11 +139,7 @@
 skipDss		// don't care about the EXCSATRM so just skip
 readReplyDss
 readLengthAndCodePoint ACCSECRD // ACCSECRD
-readScalar2Bytes SECMEC 3// SECMEC
-readScalar2Bytes SECMEC 9// SECMEC
-readScalar2Bytes SECMEC 4// SECMEC
-readScalar2Bytes SECMEC 8// SECMEC
-readScalar1Byte SECCHKCD 1// SECMEC
+readSecMecAndSECCHKCD // read secmec values and secchkcd
 endTest
 //
 DISPLAY "Test trying too big on SECMEC"
@@ -230,8 +226,7 @@
 skipDss		// don't care about the EXCSATRM so just skip
 readReplyDss
 readLengthAndCodePoint ACCSECRD // ACCSECRD
-readScalar2Bytes SECMEC 9 // SECMEC encrypted userid password
-readScalar1Byte SECCHKCD MULTIVALSTART 10 SEP 14 MULTIVALEND // can not start decryption manager for all jdks except ibm14
+readSecMecAndSECCHKCD
 endTest
 //
 DISPLAY "Test specifying unencrypted security mechanism with a security token"
@@ -296,11 +291,7 @@
 skipDss		// don't care about the EXCSATRM so just skip
 readReplyDss
 readLengthAndCodePoint ACCSECRD // ACCSECRD
-readScalar2Bytes SECMEC 3// SECMEC
-readScalar2Bytes SECMEC 9// SECMEC
-readScalar2Bytes SECMEC 4// SECMEC
-readScalar2Bytes SECMEC 8// SECMEC
-readScalar1Byte SECCHKCD 1// SECMEC
+readSecMecAndSECCHKCD
 // ok send one we support
 createDssRequest
 startDdm ACCSEC

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java Fri Sep 15 11:44:03 2006
@@ -236,6 +236,11 @@
 		                System.out.println("EXPECTED EXCEPTION "+ e.getMessage());
 		                continue;
 		            }
+                    // if server jvm does not support EUSRIDPWD, an exception
+                    // will be raised when server is started with 
+                    // derby.drda.securityMechanism=ENCRYPTED_USER_AND_PASSWORD_SECURITY
+                    System.out.println("EXCEPTION " +e.getMessage());
+                    continue;
 		        }
 		        
 		        // Wait for the NetworkServer to start.  As part of DERBY-1793

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java Fri Sep 15 11:44:03 2006
@@ -62,6 +62,11 @@
         suite.addTest(GroupByExpressionTest.suite());
         suite.addTest(MathTrigFunctionsTest.suite());
         suite.addTest(TimeHandlingTest.suite());
+        
+        // This test internally sets derby.database.sqlAuthorization to true
+        // This property is not resettable and hence may affect other tests 
+        // using it and sharing the same database.
+        suite.addTest(SQLAuthorizationPropTest.suite());
 		
 		// Tests that are compiled using 1.4 target need to
 		// be added this way, otherwise creating the suite

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions.sql
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions.sql?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions.sql (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions.sql Fri Sep 15 11:44:03 2006
@@ -303,6 +303,10 @@
 
 select cast (SYSFUN.ACOS(d) as DECIMAL(6,3)) AS SYSFUN_ACOS FROM SYSFUN_MATH_TEST;
 
+CREATE VIEW VSMT AS SELECT SIN(d) sd, PI() pi FROM SYSFUN_MATH_TEST;
+select cast (sd as DECIMAL(6,3)), cast (pi as DECIMAL(6,3)) from VSMT;
+drop view VSMT;
+
 drop table SYSFUN_MATH_TEST;
 
 drop function SYSFUN.ACOS;

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java Fri Sep 15 11:44:03 2006
@@ -343,4 +343,8 @@
     //isWrapperFor returns false is passed as a parameter to the 
     //unwrap method.
     public static final String UNABLE_TO_UNWRAP = "XJ128";
+    
+    public static final String LANG_GRANT_REVOKE_WITH_LEGACY_ACCESS = "42Z60";
+    public static final String SHUTDOWN_DATABASE = "08006";
+    public static final String PROPERTY_UNSUPPORTED_CHANGE = "XCY02";
 }

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java?view=diff&rev=446679&r1=446678&r2=446679
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java Fri Sep 15 11:44:03 2006
@@ -29,6 +29,8 @@
 
 import junit.framework.Test;
 
+import org.apache.derbyTesting.functionTests.util.SQLStateConstants;
+
 /**
  * Test decorator to set a set of database properties on setUp
  * and restore them to the previous values on tearDown.
@@ -75,15 +77,21 @@
         CallableStatement setDBP =  conn.prepareCall(
             "CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?, NULL)");
     	// Clear all the system properties set by the new set
-    	// that will not be reset by the old set.
-       	for (Enumeration e = newValues.propertyNames(); e.hasMoreElements();)
-       	{
-       		String key = (String) e.nextElement();
-       		if (oldValues.getProperty(key) == null)
-            {
-                 setDBP.setString(1, key);
-                 setDBP.executeUpdate();
-             }
+    	// that will not be reset by the old set. Ignore any 
+        // invalid property values.
+        try {
+        	for (Enumeration e = newValues.propertyNames(); e.hasMoreElements();)
+        	{
+        		String key = (String) e.nextElement();
+        		if (oldValues.getProperty(key) == null)
+        		{
+        			setDBP.setString(1, key);
+        			setDBP.executeUpdate();
+        		}
+        	}
+        } catch (SQLException sqle) {
+        	if(!sqle.getSQLState().equals(SQLStateConstants.PROPERTY_UNSUPPORTED_CHANGE))
+        		throw sqle;
         }
     	// and then reset nay old values which will cause the commit.
     	setProperties(oldValues);



Mime
View raw message