db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r358591 [4/6] - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/ testing/org/apache/derbyTesting/functionTests/harness/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTes...
Date Thu, 22 Dec 2005 17:29:08 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out Thu Dec 22 09:26:55 2005
@@ -98,11 +98,11 @@
 ij(CONNECTION3)> -- Invalid ones:
 connect 'wombat;user=Jamie;password=theHooligan';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4* - 	jdbc:derby://localhost:1527/wombat
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
 * = current connection
 ij(CONNECTION4)> connect 'guestSchemeDB;user=kreg;password=IwasBornReady';
 ij(CONNECTION5)> connect 'guestSchemeDB;user=jeff;password=homeRun';
@@ -111,16 +111,16 @@
 ij(CONNECTION8)> -- Invalid ones:
 connect 'guestSchemeDB;user=Jamie;password=theHooligan';
 ij(CONNECTION9)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION9* - 	jdbc:derby://localhost:1527/guestSchemeDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION5 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION6 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION7 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION8 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION9* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
 * = current connection
 ij(CONNECTION9)> connect 'derbySchemeDB;user=mamta;password=ieScape';
 ij(CONNECTION10)> connect 'derbySchemeDB;user=dan;password=makeItFaster';
@@ -131,19 +131,19 @@
 ij(CONNECTION12)> connect 'derbySchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION12)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION10 - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION11 - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION12* - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION9 - 	jdbc:derby://localhost:1527/guestSchemeDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION10 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION11 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION12* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION5 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION6 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION7 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION8 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION9 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
 * = current connection
 ij(CONNECTION12)> connect 'simpleSchemeDB;user=jeff;password=homeRun';
 ij(CONNECTION13)> connect 'simpleSchemeDB;user=howardR;password=takeItEasy';
@@ -159,22 +159,22 @@
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=francois;password=corsica';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION15)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION10 - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION11 - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION12 - 	jdbc:derby://localhost:1527/derbySchemeDB
-CONNECTION13 - 	jdbc:derby://localhost:1527/simpleSchemeDB
-CONNECTION14 - 	jdbc:derby://localhost:1527/simpleSchemeDB
-CONNECTION15* - 	jdbc:derby://localhost:1527/simpleSchemeDB
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB
-CONNECTION9 - 	jdbc:derby://localhost:1527/guestSchemeDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION10 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION11 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION12 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB
+CONNECTION13 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB
+CONNECTION14 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB
+CONNECTION15* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/simpleSchemeDB
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION5 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION6 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION7 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION8 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
+CONNECTION9 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/guestSchemeDB
 * = current connection
 ij(CONNECTION15)> disconnect all;
 ij> show connections;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsersldap.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsersldap.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsersldap.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsersldap.out Thu Dec 22 09:26:55 2005
@@ -93,9 +93,9 @@
 ij(CONNECTION2)> connect 'derbySchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> --
 ----- 1rst test phase for LDAP
@@ -114,9 +114,9 @@
 connect 'ldapSchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> --
 ----- 2nd test phases for LDAP - Cache the User DN locally
@@ -134,9 +134,9 @@
 ij(CONNECTION2)> execute p5 using 'values(''derby.user.francois'', ''uid=francois,ou=People,o=opensource.apache.com'')';
 Statement executed.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> commit;
 ij(CONNECTION2)> autocommit on;
@@ -157,9 +157,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=rachael;password=rachaelF';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Invalid ones:
 connect 'ldapSchemeDB;user=Jamie;password=theHooligan';
@@ -170,9 +170,9 @@
 connect 'ldapSchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Database shutdown - check user - should fail
 connect 'derbySchemeDB;shutdown=true';
@@ -180,9 +180,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=jamie;password=LetMeIn;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Database shutdown - check user - should succeed
 connect 'derbySchemeDB;user=mamta;password=ieScape;shutdown=true';
@@ -190,9 +190,9 @@
 ij(CONNECTION2)> connect 'ldapSchemeDB;user=mamta;password=yeeHaLdap;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION0 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION1 - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION2* - 	jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/derbySchemeDB;user=martin;password=obfuscateIt
 * = current connection
 ij(CONNECTION2)> -- Derby system shutdown - check user - should fail
 connect ';user=jamie;password=LetMeIn;shutdown=true';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out Thu Dec 22 09:26:55 2005
@@ -123,9 +123,18 @@
 0 rows inserted/updated/deleted
 ij> -- Bug 4694 Test automatic rollback with close of connection
 ----- in ij
-autocommit off;
-ij> create table a (a int);
+connect 'wombat';
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> create table a (a int);
 0 rows inserted/updated/deleted
+ij(CONNECTION1)> select count(*) from a;
+1          
+-----
+0          
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> select count(*) from a;
+ERROR 42X05: Table 'A' does not exist.
 ij> -- Bug 4758 - Store error does not return properly to client
 autocommit off;
 ij> create table t (i int);
@@ -176,4 +185,10 @@
 some clob 
 ij(CONNECTION1)> drop table t1;
 0 rows inserted/updated/deleted
-ij(CONNECTION1)> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> autocommit on;
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out Thu Dec 22 09:26:55 2005
@@ -9,7 +9,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----
@@ -36,7 +36,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----
@@ -64,7 +64,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
 -----

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out Thu Dec 22 09:26:55 2005
@@ -1,9 +1,9 @@
 Checking security mechanism authentication with DriverManager
-T4: jdbc:derby://localhost:20000/wombat;create=true;user=neelima;password=lee;securityMechanism=3
-T1: jdbc:derby://localhost:20000/wombat
-T2: jdbc:derby://localhost:20000/wombat;user=max
-T3: jdbc:derby://localhost:20000/wombat;user=neelima;password=lee
-T6: jdbc:derby://localhost:20000/wombat;user=neelima;securityMechanism=4
-T8: jdbc:derby://localhost:20000/wombat;user=neelima;password=lee;securityMechanism=4
+T4: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;create=true;user=neelima;password=lee;securityMechanism=3
+T1: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat
+T2: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=max
+T3: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee
+T6: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;securityMechanism=4
+T8: jdbc:derby://xxxFILTERED_HOSTNAMExxx:xxxFILTEREDPORTxxx/wombat;user=neelima;password=lee;securityMechanism=4
 SECMEC_USRIDPWD: OK
 Completed testSecMec

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out Thu Dec 22 09:26:55 2005
@@ -1,9 +1,9 @@
 Testing various ij connections and comments in front of selects
-org.apache.derby.tools.ij extin/testclientij.sql 
+org.apache.derby.tools.ij xxxFILTERED_TESTIJSOURCExxx
 ij> driver 'org.apache.derby.jdbc.ClientDriver';
 ij> --Bug 4632  Make the db italian to make sure string selects  are working
-connect 'jdbc:derby://localhost:1527/wombat;create=true;territory=it' USER 'dbadmin' PASSWORD 'dbadmin';
-ij> connect 'jdbc:derby://localhost:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
+connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;territory=it' USER 'dbadmin' PASSWORD 'dbadmin';
+ij> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij(CONNECTION1)> -- this is a comment, a comment in front of a select should not cause an error
 select * from sys.systables where 1=0;
 TABLEID |TABLENAME |& |SCHEMAID |&
@@ -17,43 +17,43 @@
 1 row selected
 ij(CONNECTION1)> -- Try some URL attributes
 disconnect all;
-ij> connect 'jdbc:derby://localhost:1527/junk;create=true' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/junk;create=true' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij> select * from APP.notthere;
 ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
 ij> -- examples from the docs
-connect 'jdbc:derby://localhost:1527/wombat;create=true;user=judy;password=judy';
-ij(CONNECTION1)> connect 'jdbc:derby://localhost:1527/./wombat;user=judy;password=judy';
-ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB';
+connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=judy;password=judy';
+ij(CONNECTION1)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./wombat;user=judy;password=judy';
+ij(CONNECTION2)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/toursDB';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt was made to access a database, toursDB, which was not found.
-ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij(CONNECTION2)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt was made to access a database, toursDB, which was not found.
-ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
-ij(CONNECTION3)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
-ij(CONNECTION4)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
-ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
+ij(CONNECTION2)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'APP' PASSWORD 'APP';
+ij(CONNECTION3)> connect  'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;password=pwd';
+ij(CONNECTION4)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;upgrade=true;user=usr;password=pwd';
+ij(CONNECTION5)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;shutdown=true;user=usr;password=pwd';
 ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'my-db-name' shutdown.
-ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
-ij(CONNECTION6)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
-ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij(CONNECTION5)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION6)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION7)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt was made to access a database, toursDB, which was not found.
-ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
-ij(CONNECTION8)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
-ij(CONNECTION9)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
-ij(CONNECTION10)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
+ij(CONNECTION7)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'APP' PASSWORD 'APP';
+ij(CONNECTION8)> connect  'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;password=pwd';
+ij(CONNECTION9)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;upgrade=true;user=usr;password=pwd';
+ij(CONNECTION10)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;shutdown=true;user=usr;password=pwd';
 ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'my-db-name' shutdown.
 ij(CONNECTION10)> -- Database names with /'s
-connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
-ij(CONNECTION11)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION11)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./my-dbname;create=true;user=usr;password=pwd';
 ij(CONNECTION12)> -- retrieveMessageText Testing
-connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=false';
+connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=false';
 ij(CONNECTION13)> -- Should not get message text
 select * from APP.notthere;
 ERROR 42X05: DERBY SQL error: SQLCODE: -1, SQLSTATE: 42X05, SQLERRMC: APP.NOTTHERE42X05
-ij(CONNECTION13)> connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=true';
+ij(CONNECTION13)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=true';
 ij(CONNECTION14)> -- Should see message text
 select * from APP.notthere;
 ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
 ij(CONNECTION14)> -- just user security mechanism
-connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;retrieveMessageText=true';
-ij(CONNECTION15)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP';
+connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;retrieveMessageText=true';
+ij(CONNECTION15)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'APP';
 ij(CONNECTION16)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out Thu Dec 22 09:26:55 2005
@@ -36,11 +36,11 @@
 ij(CONNECTION2)> connect 'wombat;user=howardR;password=IamBetterAtTennis';
 ij(CONNECTION3)> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4* - 	jdbc:derby://localhost:1527/wombat
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
 * = current connection
 ij(CONNECTION4)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -84,12 +84,12 @@
 ij(CONNECTION5)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION1 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION2 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION3 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION4 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION5* - 	jdbc:derby://localhost:1527/myDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION5* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> --
@@ -127,8 +127,8 @@
 ij(CONNECTION1)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection refused.
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION1* - 	jdbc:derby://localhost:1527/myDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION1* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
 * = current connection
 ij(CONNECTION1)> -- Database shutdown - check user - should succeed
 ----- beetle 5367
@@ -137,8 +137,8 @@
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION1* - 	jdbc:derby://localhost:1527/myDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION1* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
 * = current connection
 ij(CONNECTION1)> -- JBMS System shutdown - check user - should fail
 connect ';user=jamie;password=LetMeIn;shutdown=true';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out Thu Dec 22 09:26:55 2005
@@ -72,12 +72,12 @@
 ij(CONNECTION5)> create table APP.t2(c1 char(30));
 ERROR 25503: DDL is not permitted for a read-only connection, user or database.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION2 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION3 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION4 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION5* - 	jdbc:derby://localhost:1527/wombat
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION5* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -169,13 +169,13 @@
 ij(CONNECTION6)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION6)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION1 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION2 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION3 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION4 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION5 - 	jdbc:derby://localhost:1527/myDB
-CONNECTION6* - 	jdbc:derby://localhost:1527/myDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION2 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION3 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION4 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION5 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
+CONNECTION6* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
 * = current connection
 ij(CONNECTION6)> disconnect all;
 ij> --
@@ -201,7 +201,7 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> connect 'wombat;user=jamie;password=MrNamePlates';
 ij> show connections;
-CONNECTION0* - 	jdbc:derby://localhost:1527/wombat
+CONNECTION0* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
 * = current connection
 ij> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu';
@@ -213,9 +213,9 @@
 ij(CONNECTION2)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION1 - 	jdbc:derby://localhost:1527/wombat
-CONNECTION2* - 	jdbc:derby://localhost:1527/myDB
+CONNECTION0 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION1 - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat
+CONNECTION2* - 	jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB
 * = current connection
 ij(CONNECTION2)> disconnect all;
 ij> show connections;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out Thu Dec 22 09:26:55 2005
@@ -30661,4 +30661,15 @@
 	Ordered null semantics on the following columns: 
 				qualifiers:
 None
+ij> -- cleanup
+drop table TENKTUP1;
+0 rows inserted/updated/deleted
+ij> drop table TENKTUP2;
+0 rows inserted/updated/deleted
+ij> drop table ONEKTUP;
+0 rows inserted/updated/deleted
+ij> drop table BPRIME;
+0 rows inserted/updated/deleted
+ij> drop procedure WISCINSERT;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xaSimplePositive.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xaSimplePositive.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xaSimplePositive.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xaSimplePositive.out Thu Dec 22 09:26:55 2005
@@ -189,6 +189,8 @@
 4          
 77         
 5          
+ij(XA)> drop table APP.foo;
+0 rows inserted/updated/deleted
 ij(XA)> xa_end xa_success 5;
 ij(XA)> xa_prepare 5;
 ij(XA)> xa_commit xa_2Phase 5;
@@ -223,6 +225,14 @@
 I |B              
 -----
 1 |one            
+ij(XA)> drop procedure DRS;
+0 rows inserted/updated/deleted
+ij(XA)> drop table t1;
+0 rows inserted/updated/deleted
+ij(XA)> drop view APP.global_xacttable;
+0 rows inserted/updated/deleted
+ij(XA)> drop schema sku restrict;
+0 rows inserted/updated/deleted
 ij(XA)> xa_end xa_success 6;
 ij(XA)> xa_commit xa_1Phase 6;
-ij(XA)> 
\ No newline at end of file
+ij(XA)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBTest.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBTest.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBTest.out Thu Dec 22 09:26:55 2005
@@ -3871,3 +3871,4 @@
 insert into blobCheck (bl ) values ( X'a78a' )
 	ERROR 42821: Columns of type 'BLOB' cannot hold values of type 'CHAR () FOR BIT DATA'. 
 insert into blobCheck (bl ) values (cast (X'a78a' as blob(80)) )
+drop table blobCheck

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bestrowidentifier.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bestrowidentifier.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bestrowidentifier.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bestrowidentifier.out Thu Dec 22 09:26:55 2005
@@ -173,4 +173,7 @@
 SCOPE |COLUMN_NAME                                                                                                                     |DATA_&|TYPE_NAME                                                                                                                       |COLUMN_SIZE|BUFFER_LEN&|DECIM&|PSEUD&
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> rollback work;
+ij> drop procedure getBestRowID;
+0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out Thu Dec 22 09:26:55 2005
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -545,17 +545,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting short.txt length = 56
+===> inserting littleclob.txt length = 10000
+===> inserting empty.txt length = 0
+===> inserting searchclob.txt length = 5000
+===> inserting aclob.txt length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDriver.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDriver.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDriver.out Thu Dec 22 09:26:55 2005
@@ -2,8 +2,8 @@
 driver.getMajorVersion() = EXPECTED VERSION
 driver.getMinorVersion() = EXPECTED VERSION
 checking acceptsURL(jdbc:derby:wombat;create=true)
-checking acceptsURL(jdbc:derby://localhost:1527/wombat;create=true)
-checking acceptsURL(jdbc:derby:net://localhost:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
 checking acceptsURL(jdbc:db2j:wombat;create=true)
 testEmbeddedAttributes()
 Connection info for connect(jdbc:derby:testcreatedb1, {create=true})

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out Thu Dec 22 09:26:55 2005
@@ -55,4 +55,6 @@
 XA connected as EDWARD
 XA connected as FRANCES
 EXPECTED SHUTDOWN Derby system shutdown.
+EXPECTED SHUTDOWN Derby system shutdown.
+EXPECTED SHUTDOWN Derby system shutdown.
 Completed dataSourcePermissions

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Thu Dec 22 09:26:55 2005
@@ -5302,7 +5302,7 @@
  java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]
  	where the source URL is the full URL, including the connection protocol
  	and any connection attributes that might apply.  For example, use
- 	'jdbc:derby:myDB', or 'jdbc:derby:net://localhost:1527/myDB:user=usr;'. 
+ 	'jdbc:derby:myDB', or 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/myDB:user=usr;'. 
  	options include: 
  	-z <schemaName> to specify a schema to which the DDL generation
  	 should be limited.  Only database objects with that schema will have

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out Thu Dec 22 09:26:55 2005
@@ -492,6 +492,8 @@
 0 rows inserted/updated/deleted
 ij> drop table t2;
 0 rows inserted/updated/deleted
+ij> drop table t3;
+0 rows inserted/updated/deleted
 ij> -- bug 5643
 -- JCC throws NPE when trying to execute a cursor after the resultset is closed
 autocommit off;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out Thu Dec 22 09:26:55 2005
@@ -7,7 +7,7 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 Properties with tracing on
 ----- listing properties --
@@ -20,7 +20,7 @@
 derby.drda.logConnections=true
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 Properties with tracing on
 ----- listing properties --
@@ -32,5 +32,5 @@
 derby.drda.logConnections=true
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorExternalSortJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorExternalSortJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorExternalSortJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorExternalSortJDBC30.out Thu Dec 22 09:26:55 2005
@@ -342,4 +342,5 @@
 0 rows inserted/updated/deleted
 ij> drop table foo;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Thu Dec 22 09:26:55 2005
@@ -312,4 +312,6 @@
 ERROR 24000: Invalid cursor state - no current row.
 ij> -- clean up.
 close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJDBC30.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJDBC30.out Thu Dec 22 09:26:55 2005
@@ -1572,4 +1572,15 @@
 No current row
 ij> commit;
 ij> close test12;
+ij> drop table foo;
+0 rows inserted/updated/deleted
+ij> drop table t1;
+0 rows inserted/updated/deleted
+ij> drop table t2;
+0 rows inserted/updated/deleted
+ij> drop function padstring;
+0 rows inserted/updated/deleted
+ij> drop procedure wait_for_post_commit;
+0 rows inserted/updated/deleted
+ij> commit;
 ij> exit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/checkDriver.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/checkDriver.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/checkDriver.out Thu Dec 22 09:26:55 2005
@@ -2,8 +2,8 @@
 driver.getMajorVersion() = EXPECTED VERSION
 driver.getMinorVersion() = EXPECTED VERSION
 checking acceptsURL(jdbc:derby:wombat;create=true)
-checking acceptsURL(jdbc:derby://localhost:1527/wombat;create=true)
-checking acceptsURL(jdbc:derby:net://localhost:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
 checking acceptsURL(jdbc:db2j:wombat;create=true)
 testEmbeddedAttributes()
 Connection info for connect(jdbc:derby:testcreatedb1, {create=true})

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/checkDriver.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/checkDriver.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/checkDriver.out Thu Dec 22 09:26:55 2005
@@ -2,8 +2,8 @@
 driver.getMajorVersion() = EXPECTED VERSION
 driver.getMinorVersion() = EXPECTED VERSION
 checking acceptsURL(jdbc:derby:wombat;create=true)
-checking acceptsURL(jdbc:derby://localhost:1527/wombat;create=true)
-checking acceptsURL(jdbc:derby:net://localhost:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
+checking acceptsURL(jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true)
 checking acceptsURL(jdbc:db2j:wombat;create=true)
 testEmbeddedAttributes()
 Connection info for connect(jdbc:derby:testcreatedb1, {create=true})

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/maxthreads.out Thu Dec 22 09:26:55 2005
@@ -2,7 +2,7 @@
 org.apache.derby.drda.NetworkServerControl maxthreads 0 
 Max threads changed to 0.
 PASS - max threads value, 0 is correct
-org.apache.derby.drda.NetworkServerControl maxthreads -1 -h localhost -p 1527 
+org.apache.derby.drda.NetworkServerControl maxthreads -1 -h xxxFILTERED_HOSTNAMExxx -p 1527 
 Max threads changed to 0.
 PASS - max threads value, 0 is correct
 org.apache.derby.drda.NetworkServerControl maxthreads -12 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out Thu Dec 22 09:26:55 2005
@@ -976,4 +976,5 @@
 0 rows inserted/updated/deleted
 ij> drop table temp1;
 0 rows inserted/updated/deleted
+ij> commit;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/simpleScroll.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/simpleScroll.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/simpleScroll.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/simpleScroll.out Thu Dec 22 09:26:55 2005
@@ -144,6 +144,8 @@
 -----
 String 1                                                        
 NULL                                                            
+ij> drop table t;
+0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> drop table t2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out Thu Dec 22 09:26:55 2005
@@ -123,9 +123,18 @@
 0 rows inserted/updated/deleted
 ij> -- Bug 4694 Test automatic rollback with close of connection
 -- in ij
-autocommit off;
-ij> create table a (a int);
+connect 'wombat';
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> create table a (a int);
 0 rows inserted/updated/deleted
+ij(CONNECTION1)> select count(*) from a;
+1          
+-----------
+0          
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> select count(*) from a;
+ERROR 42X05: Table 'A' does not exist.
 ij> -- Bug 4758 - Store error does not return properly to client
 autocommit off;
 ij> create table t (i int);
@@ -176,4 +185,10 @@
 some clob 
 ij(CONNECTION1)> drop table t1;
 0 rows inserted/updated/deleted
-ij(CONNECTION1)> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> autocommit on;
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out Thu Dec 22 09:26:55 2005
@@ -18,8 +18,8 @@
 First shutdown server started on default port by the test harness
 org.apache.derby.drda.NetworkServerControl shutdown -p 1527 
 Shutdown successful.
--Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive -Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads -Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl start 
--- listing properties --
+-----Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive -Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads -Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl start 
+----- listing properties --
 derby.drda.maxThreads=0
 derby.drda.keepAlive=true
 derby.drda.minThreads=0
@@ -27,14 +27,14 @@
 derby.drda.logConnections=false
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 org.apache.derby.drda.NetworkServerControl trace on -p 1527 
 Trace turned on for all sessions.
 Trace turned on for all sessions.
 org.apache.derby.drda.NetworkServerControl logconnections on -p 1527 
 Log Connections changed to on.
--- listing properties --
+----- listing properties --
 derby.drda.maxThreads=0
 derby.drda.keepAlive=true
 derby.drda.minThreads=0
@@ -42,7 +42,7 @@
 derby.drda.logConnections=true
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=true
 org.apache.derby.drda.NetworkServerControl trace off -p 1527 
 Trace turned off for all sessions.
@@ -55,7 +55,7 @@
 derby.drda.logConnections=true
 derby.drda.timeSlice=0
 derby.drda.startNetworkServer=false
-derby.drda.host=localhost
+derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 org.apache.derby.drda.NetworkServerControl shutdown -p 1527 
 Shutdown successful.
@@ -68,10 +68,10 @@
 ping [-h <host>][-p <portnumber>]
 sysinfo [-h <host>][-p <portnumber>]
 runtimeinfo [-h <host>][-p <portnumber>]
-logconnections {on|off}[-h <host>][-p <portnumber>]
+logconnections {on |off}[-h <host>][-p <portnumber>]
 maxthreads <max>[-h <host>][-p <portnumber>]
 timeslice <milliseconds>[-h <host>][-p <portnumber>]
-trace {on|off} [-s <session id>][-h <host>][-p <portnumber>]
+trace {on |off} [-s <session id>][-h <host>][-p <portnumber>]
 tracedirectory <traceDirectory>[-h <host>][-p <portnumber>]
 org.apache.derby.drda.NetworkServerControl unknowncmd 
 Command unknowncmd is unknown.
@@ -82,10 +82,10 @@
 ping [-h <host>][-p <portnumber>]
 sysinfo [-h <host>][-p <portnumber>]
 runtimeinfo [-h <host>][-p <portnumber>]
-logconnections {on|off}[-h <host>][-p <portnumber>]
+logconnections {on |off}[-h <host>][-p <portnumber>]
 maxthreads <max>[-h <host>][-p <portnumber>]
 timeslice <milliseconds>[-h <host>][-p <portnumber>]
-trace {on|off} [-s <session id>][-h <host>][-p <portnumber>]
+trace {on |off} [-s <session id>][-h <host>][-p <portnumber>]
 tracedirectory <traceDirectory>[-h <host>][-p <portnumber>]
 org.apache.derby.drda.NetworkServerControl ping arg1 
 Invalid number of arguments for command ping.
@@ -96,9 +96,9 @@
 ping [-h <host>][-p <portnumber>]
 sysinfo [-h <host>][-p <portnumber>]
 runtimeinfo [-h <host>][-p <portnumber>]
-logconnections {on|off}[-h <host>][-p <portnumber>]
+logconnections {on |off}[-h <host>][-p <portnumber>]
 maxthreads <max>[-h <host>][-p <portnumber>]
 timeslice <milliseconds>[-h <host>][-p <portnumber>]
-trace {on|off} [-s <session id>][-h <host>][-p <portnumber>]
+trace {on |off} [-s <session id>][-h <host>][-p <portnumber>]
 tracedirectory <traceDirectory>[-h <host>][-p <portnumber>]
 End test

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out Thu Dec 22 09:26:55 2005
@@ -288,3 +288,4 @@
 PASSED
 Test for missing SQLSTT in EXCSQLSET - PKGNAMCT is ignored
 PASSED
+PASSED

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out Thu Dec 22 09:26:55 2005
@@ -1,18 +1,18 @@
 Testing testconnection
-org.apache.derby.drda.NetworkServerControl ping 
-Connection obtained for host: localhost, port number 1527.
-org.apache.derby.drda.NetworkServerControl ping -h localhost -p 1527 
-Connection obtained for host: localhost, port number 1527.
+org.apache.derby.drda.NetworkServerControl ping...
+Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
+org.apache.derby.drda.NetworkServerControl ping -h xxxFILTERED_HOSTNAMExxx -p 1527 
+Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
 org.apache.derby.drda.NetworkServerControl ping -h notthere -p 1527 
 Unable to find host: notthere.
 org.apache.derby.drda.NetworkServerControl ping -h ihave-inmyname.com -p 1527 
 Unable to find host: ihave-inmyname.com.
-org.apache.derby.drda.NetworkServerControl ping -h localhost 
-Connection obtained for host: localhost, port number 1527.
-org.apache.derby.drda.NetworkServerControl ping -h localhost -p 9393 
-Could not connect to Derby Network Server on host localhost, port 9393.
-org.apache.derby.drda.NetworkServerControl ping -p 1527 
-Connection obtained for host: localhost, port number 1527.
-org.apache.derby.drda.NetworkServerControl ping -p 9393 
-Could not connect to Derby Network Server on host localhost, port 9393.
+org.apache.derby.drda.NetworkServerControl ping -h xxxFILTERED_HOSTNAMExxx 
+Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
+org.apache.derby.drda.NetworkServerControl ping -h xxxFILTERED_HOSTNAMExxx -p 9393 
+Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393.
+org.apache.derby.drda.NetworkServerControl ping...
+Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
+org.apache.derby.drda.NetworkServerControl ping...
+Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393.
 End test

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testij.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testij.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testij.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testij.out Thu Dec 22 09:26:55 2005
@@ -1,9 +1,9 @@
 Testing various ij connections and comments in front of selects
-org.apache.derby.tools.ij extin/testij.sql 
+org.apache.derby.tools.ij xxxFILTERED_TESTIJSOURCExxx
 ij> driver 'com.ibm.db2.jcc.DB2Driver';
 ij> --Bug 4632  Make the db italian to make sure string selects  are working
-connect 'jdbc:derby:net://localhost:1527/wombat;create=true;territory=it:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadmin';
-ij> connect 'jdbc:derby:net://localhost:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
+connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;territory=it:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadmin';
+ij> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij(CONNECTION1)> -- this is a comment, a comment in front of a select should not cause an error
 select * from sys.systables where 1=0;
 TABLEID |TABLENAME |& |SCHEMAID |&
@@ -17,25 +17,25 @@
 1 row selected
 ij(CONNECTION1)> -- Try some URL attributes
 disconnect all;
-ij> connect 'jdbc:derby:net://localhost:1527/junk;create=true:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/junk;create=true:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij> select * from APP.notthere;
 ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
 ij> -- examples from the docs
-connect 'jdbc:derby:net://localhost:1527/wombat;create=true:user=judy;password=judy;retrieveMessagesFromServerOnGetMessage=true;';
-ij(CONNECTION1)> connect 'jdbc:derby:net://localhost:1527/"./wombat":user=judy;password=judy;retrieveMessagesFromServerOnGetMessage=true;';
-ij(CONNECTION2)> connect 'jdbc:derby:net://localhost:1527/toursDB:retrieveMessagesFromServerOnGetMessage=true;';
+connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true:user=judy;password=judy;retrieveMessagesFromServerOnGetMessage=true;';
+ij(CONNECTION1)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/"./wombat":user=judy;password=judy;retrieveMessagesFromServerOnGetMessage=true;';
+ij(CONNECTION2)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/toursDB:retrieveMessagesFromServerOnGetMessage=true;';
 ERROR (no SQLState): null userid not supported
-ij(CONNECTION2)> connect 'jdbc:derby:net://localhost:1527/toursDB:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij(CONNECTION2)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/toursDB:retrieveMessagesFromServerOnGetMessage=true;' USER 'dbadmin' PASSWORD 'dbadbmin';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt was made to access a database, toursDB, which was not found.
-ij(CONNECTION2)> connect 'jdbc:derby:net://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
-ij(CONNECTION3)> connect  'jdbc:derby:net://localhost:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
-ij(CONNECTION4)> connect 'jdbc:derby:net://localhost:1527/my-db-name;upgrade=true:user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
-ij(CONNECTION5)> connect 'jdbc:derby:net://localhost:1527/my-db-name;shutdown=true:user=usr;password=pwd;'
+ij(CONNECTION2)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'APP' PASSWORD 'APP';
+ij(CONNECTION3)> connect  'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
+ij(CONNECTION4)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;upgrade=true:user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
+ij(CONNECTION5)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;shutdown=true:user=usr;password=pwd;'
 ----- Quoted db and attributes
-connect 'jdbc:derby:net://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;';
+connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/"./my-dbname;create=true":user=usr;password=pwd;';
 ERROR 08006: DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'my-db-name' shutdown.
-ij(CONNECTION5)> connect 'jdbc:derby:net://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
+ij(CONNECTION5)> connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/"./my-dbname;create=true":user=usr;password=pwd;retrieveMessagesFromServerOnGetMessage=true;';
 ij(CONNECTION6)> -- with no user
-connect 'jdbc:derby:net://localhost:1527/wombat;create=true:retrieveMessagesFromServerOnGetMessage=true;';
+connect 'jdbc:derby:net://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true:retrieveMessagesFromServerOnGetMessage=true;';
 ERROR (no SQLState): null userid not supported
 ij(CONNECTION6)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/timeslice.out Thu Dec 22 09:26:55 2005
@@ -2,7 +2,7 @@
 org.apache.derby.drda.NetworkServerControl timeslice 0 
 Time slice changed to 0.
 PASS - time slice value, 0 is correct
-org.apache.derby.drda.NetworkServerControl timeslice -1 -h localhost -p 1527 
+org.apache.derby.drda.NetworkServerControl timeslice -1 -h xxxFILTERED_HOSTNAMExxx -p 1527 
 Time slice changed to 0.
 PASS - time slice value, 0 is correct
 org.apache.derby.drda.NetworkServerControl timeslice -12 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out Thu Dec 22 09:26:55 2005
@@ -30661,4 +30661,15 @@
 	Ordered null semantics on the following columns: 
 				qualifiers:
 None
+ij> -- cleanup
+drop table TENKTUP1;
+0 rows inserted/updated/deleted
+ij> drop table TENKTUP2;
+0 rows inserted/updated/deleted
+ij> drop table ONEKTUP;
+0 rows inserted/updated/deleted
+ij> drop table BPRIME;
+0 rows inserted/updated/deleted
+ij> drop procedure WISCINSERT;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out Thu Dec 22 09:26:55 2005
@@ -189,6 +189,8 @@
 4          
 77         
 5          
+ij(XA)> drop table APP.foo;
+0 rows inserted/updated/deleted
 ij(XA)> xa_end xa_success 5;
 ij(XA)> xa_prepare 5;
 ij(XA)> xa_commit xa_2Phase 5;
@@ -225,6 +227,14 @@
 I          |B              
 ---------------------------
 1          |one            
+ij(XA)> drop procedure DRS;
+0 rows inserted/updated/deleted
+ij(XA)> drop table t1;
+0 rows inserted/updated/deleted
+ij(XA)> drop view APP.global_xacttable;
+0 rows inserted/updated/deleted
+ij(XA)> drop schema sku restrict;
+0 rows inserted/updated/deleted
 ij(XA)> xa_end xa_success 6;
 ij(XA)> xa_commit xa_1Phase 6;
-ij(XA)> 
\ No newline at end of file
+ij(XA)> 

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude?rev=358591&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude Thu Dec 22 09:26:55 2005
@@ -0,0 +1,56 @@
+# this file holds tests that cannot be successfully run with DerbyNetClient framework
+# with a remote server. Tests in this file will be skipped in addition to those in 
+# DerbyNetClient.exclude when the property -DhostName is set to something else than the localhost
+#
+# excluding test   - because...
+# store/bootLock.java - this test uses local connections to make sure 
+#     a database cannot be loaded by 2 different instances.
+# jdbcapi/secureUsers,secureUsers1, users and users2.sql 
+#     because they expect the server to have been started with special derby.properties
+#     this test can be made to work by changing the properties from system properties
+#     i.e. set in a derby.properties file - to be database properties - i.e. set using
+#     SYSCS_SET_ procedure.
+# derbynet/dblook_test_net because it tries to search derby.log, which is on
+#     the server machine, and it assumes files in a location not consistent with running with 
+#     useprocess=false 
+# derbynet/getCurrentProperties for it exercises NetworkServerControl statements
+#     that are only supported on localhost
+# derbynet/NSinSameJVM - tries to start the server
+# derbynet/DataSourcePermissions_net - tries to use NetworkServerControl statements
+# derbynet/maxthreads - tries to use NetworkServerControl statements
+# derbynet/runtimeinfo - tries to use NetworkServerControl statements
+# derbynet/sysinfo - tries to use NetworkServerControl statements
+# derbynet/testProperties - tries to use NetworkServerControl statements
+# derbynet/timeslice - tries to use NetworkServerControl statements
+# derbynet/DerbyNetAutoStart - tries to start networkserver
+# derbynet/DerbyNetNewServer - tries to start networkserver and uses local connections to the db.
+# tools/ieptests - names files in extin dir, which is in a different location when run with
+#     useprocess=false
+# tools/importExport - tries to confirm correct export by file-comparing the exported files,
+#	which may be on a different machine and thus not found.
+# lang/wisconsin - optimization is quite different when running remote server.
+# lang/syscat - test is to sensitive to other tests leaving stuff behind
+# junitTests/derbyNet/CompatibilityTest.java - tries to start and shutdown the server, which will 
+#	give securitymanager errors.
+# 
+store/bootLock.java
+jdbcapi/secureUsers.sql
+jdbcapi/secureUsers1.sql
+jdbcapi/users.sql
+jdbcapi/users2.sql
+derbynet/dblook_test_net.java
+derbynet/getCurrentProperties.java
+derbynet/NSinSameJVM.java
+derbynet/DataSourcePermissions_net.java
+derbynet/maxthreads.java
+derbynet/runtimeinfo.java
+derbynet/sysinfo.java
+derbynet/testProperties.java
+derbynet/timeslice.java
+derbynet/DerbyNetAutoStart.java
+derbynet/DerbyNetNewServer.java
+tools/ieptests.sql
+tools/importExport.java
+lang/wisconsin.sql
+lang/syscat.sql
+junitTests/derbyNet/CompatibilityTest.java

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude?rev=358591&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude Thu Dec 22 09:26:55 2005
@@ -0,0 +1,56 @@
+# this file holds tests that cannot be successfully run with DerbyNet framework
+# with a remote server. Tests in this file will be skipped in addition to those in 
+# DerbyNet.exclude when the property -DhostName is set to something else than the localhost
+#
+# excluding test   - because...
+# store/bootLock.java - this test uses local connections to make sure 
+#     a database cannot be loaded by 2 different instances.
+# jdbcapi/secureUsers,secureUsers1, users and users2.sql 
+#     because they expect the server to have been started with special derby.properties
+#     this test can be made to work by changing the properties from system properties
+#     i.e. set in a derby.properties file - to be database properties - i.e. set using
+#     SYSCS_SET_ procedure.
+# derbynet/dblook_test_net because it tries to search derby.log, which is on
+#     the server machine, and it assumes files in a location not consistent with running with 
+#     useprocess=false 
+# derbynet/getCurrentProperties for it exercises NetworkServerControl statements
+#     that are only supported on localhost
+# derbynet/NSinSameJVM - tries to start the server
+# derbynet/DataSourcePermissions_net - tries to use NetworkServerControl statements
+# derbynet/maxthreads - tries to use NetworkServerControl statements
+# derbynet/runtimeinfo - tries to use NetworkServerControl statements
+# derbynet/sysinfo - tries to use NetworkServerControl statements
+# derbynet/testProperties - tries to use NetworkServerControl statements
+# derbynet/timeslice - tries to use NetworkServerControl statements
+# derbynet/DerbyNetAutoStart - tries to start networkserver
+# derbynet/DerbyNetNewServer - tries to start networkserver and uses local connections to the db.
+# tools/ieptests - names files in extin dir, which is in a different location when run with
+#     useprocess=false
+# tools/importExport - tries to confirm correct export by file-comparing the exported files,
+#	which may be on a different machine and thus not found.
+# lang/wisconsin - optimization is quite different when running remote server.
+# lang/syscat - test is too sensitive to other tests leaving behind stuff
+# junitTests/derbyNet/CompatibilityTest.java - tries to start and shutdown the server, which will
+# 	give securitymanager errors.
+# 
+store/bootLock.java
+jdbcapi/secureUsers.sql
+jdbcapi/secureUsers1.sql
+jdbcapi/users.sql
+jdbcapi/users2.sql
+derbynet/dblook_test_net.java
+derbynet/getCurrentProperties.java
+derbynet/NSinSameJVM.java
+derbynet/DataSourcePermissions_net.java
+derbynet/maxthreads.java
+derbynet/runtimeinfo.java
+derbynet/sysinfo.java
+derbynet/testProperties.java
+derbynet/timeslice.java
+derbynet/DerbyNetAutoStart.java
+derbynet/DerbyNetNewServer.java
+tools/ieptests.sql
+tools/importExport.java
+lang/wisconsin.sql
+lang/syscat.sql
+junitTests/derbyNet/CompatibilityTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall Thu Dec 22 09:26:55 2005
@@ -26,7 +26,6 @@
 jdbcapi/odbc_metadata.java
 lang/optimizerOverrides.sql
 jdbcapi/parameterMetaDataJdbc30.java
-jdbcapi/savepointJdbc30.java
 lang/big.sql
 lang/bug5054.java
 lang/ConcurrentImplicitCreateSchema.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStart.java Thu Dec 22 09:26:55 2005
@@ -72,6 +72,7 @@
     private static Connection embeddedConn;
     private static int testNumber = 0;
     private static int portNumber;
+    private static String hostName;
     private static String homeDir;
     private static String databaseName;
     private static Properties baseProperties = new Properties();
@@ -113,6 +114,7 @@
 
 			ij.getPropertyArg(args);
             homeDir = System.getProperty( "derby.system.home", ".");
+            hostName = TestUtil.getHostName();
             
             for( int i = 0; i < args.length; i++)
             {
@@ -134,7 +136,7 @@
                     if( portNumber <= 0)
                         portNumber = NetworkServerControl.DEFAULT_PORTNUMBER;
                     
-                    NetworkServerControl server = new NetworkServerControl(InetAddress.getByName("localhost"),portNumber);
+                    NetworkServerControl server = new NetworkServerControl(InetAddress.getByName(hostName),portNumber);
                     server.start(null);
 					// Wait for server to come up 
 					for (int j = 0; j < 60; j++)
@@ -316,7 +318,7 @@
 
         Process serverProcess = Runtime.getRuntime().exec( cmd);
         // Wait for to start
-        String dbUrl = TestUtil.getJdbcUrlPrefix("localhost",
+        String dbUrl = TestUtil.getJdbcUrlPrefix(hostName,
 												 Integer.parseInt(portStr)) +
 			"database1";
         Connection drdaConn = null;
@@ -450,7 +452,7 @@
         try
         {
             NetworkServerControl server =
-				new NetworkServerControl(InetAddress.getByName("localhost"),
+				new NetworkServerControl(InetAddress.getByName(hostName),
 									 portNumber);
 			server.shutdown();
             Thread.sleep(5000);
@@ -540,7 +542,7 @@
                 try
                 {
                     drdaConn = DriverManager.getConnection(
-														   TestUtil.getJdbcUrlPrefix("localhost",portNumber) + databaseName,
+														   TestUtil.getJdbcUrlPrefix(hostName,portNumber) + databaseName,
 														   authenticationProperties);
                     break;
                 }
@@ -658,7 +660,7 @@
                 }
                 catch( InterruptedException ie){};
                 drdaConn = DriverManager.getConnection(
-													   TestUtil.getJdbcUrlPrefix("localhost", portNumber) +  databaseName,
+													   TestUtil.getJdbcUrlPrefix(hostName, portNumber) +  databaseName,
                                                         authenticationProperties);
                 passed = false;
                 System.out.println( "Was able to connect to the network server after Derby shut down.");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java Thu Dec 22 09:26:55 2005
@@ -77,7 +77,8 @@
 			System.out.println("FAIL Network Server did not start");
 			return;
 		}
-		String jdbcUrlPrefix = TestUtil.getJdbcUrlPrefix("localhost", NETWORKSERVER_PORT);
+		String hostName = TestUtil.getHostName();
+		String jdbcUrlPrefix = TestUtil.getJdbcUrlPrefix(hostName, NETWORKSERVER_PORT);
 
         String url = jdbcUrlPrefix + databaseFileName;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java Thu Dec 22 09:26:55 2005
@@ -33,6 +33,7 @@
 import java.sql.DriverManager;
 import java.sql.Connection;
 import org.apache.derby.tools.ij;
+import org.apache.derbyTesting.functionTests.util.TestUtil;
 /**
 	This test tests the JDBC CallableStatement.
 */
@@ -50,7 +51,8 @@
 
 			// This also tests quoted pathname in database name portion of URL, beetle 4781.
 			String protocol = System.getProperty("ij.protocol");
-			System.setProperty("ij.database", protocol + "//localhost/\"" + System.getProperty("derby.system.home") + java.io.File.separator + "wombat;create=true\"");
+			String hostName = TestUtil.getHostName();
+			System.setProperty("ij.database", protocol + "//" + hostName + "/\"" + System.getProperty("derby.system.home") + java.io.File.separator + "wombat;create=true\"");
 			ij.getPropertyArg(args); 
 			Connection conn = ij.startJBMS();
 			if (conn == null)
@@ -228,6 +230,9 @@
 			// Temporarily take out testbatch until jcc bug is fixed (5827)
 			// testBatch(conn);
 
+                        cleanUp(stmt);
+			stmt.close();
+			conn.close();
 			System.out.println("CallableStatement Test Ends");
         }
 		catch (Exception e)
@@ -693,6 +698,17 @@
 			  e.printStackTrace();
 		  }
 	  
+	}
+
+
+	// test update of table in batch
+	public static void cleanUp (Statement stmt) throws SQLException 
+	{
+		String[] testObjects = { "table longvarbinary_tab", "table num_tab",
+			"procedure method1", "function method2",
+			"function method4", 
+			"procedure longvarbinary_in"}; 	
+		TestUtil.cleanUpTest(stmt, testObjects);
 	}
 
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java Thu Dec 22 09:26:55 2005
@@ -48,6 +48,7 @@
 			// bug 6021
 			// testIllegalDBCreate();
 			testIllegalPropertySet(conn);
+			cleanUp(conn);
 		}
 		catch (Exception e)
 		{
@@ -71,9 +72,18 @@
 			//    We seem to be able to create the database.
 			// Ideally this test should attempt to create the database
 			// ../wombat;create=true and get the security exception.
-			String databaseURL = TestUtil.getJdbcUrlPrefix() + "localhost/" + 
-				"\"D:/wombat;create=true\"";
-			System.out.println(databaseURL);
+			String hostName = TestUtil.getHostName();
+			String databaseURL;
+			if (hostName.equals("localhost"))
+			{
+				databaseURL = TestUtil.getJdbcUrlPrefix() + hostName + 
+				"/\"D:/wombat;create=true\"";
+			}
+			else
+			{
+				databaseURL = TestUtil.getJdbcUrlPrefix() + hostName + "wombat";
+			}
+			//System.out.println(databaseURL);
 			java.util.Properties properties = new java.util.Properties();
 			properties.put ("user", "cs");
 			properties.put ("password", "cs");
@@ -114,4 +124,15 @@
 	{
 		System.setProperty("notAllowed", "somevalue");
 	}
+
+	public static void cleanUp(Connection conn) throws SQLException
+	{
+		Statement stmt = conn.createStatement();
+		try {
+			stmt.executeUpdate("drop procedure setIllegalPropertyProc");
+		} catch (SQLException se) {
+			JDBCTestDisplayUtil.ShowCommonSQLException(System.out, se);
+		}
+	}
+
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant?rev=358591&r1=358590&r2=358591&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant Thu Dec 22 09:26:55 2005
@@ -24,6 +24,7 @@
 testProtocol_app.properties
 testProtocol_derby.properties
 testSecMec_app.properties
+testSecMec_sed.properties
 timeslice_app.properties
 protocol.tests
 excsat_accsecrd1.inc



Mime
View raw message