db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r290294 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests: master/dcl.out master/jdk15/dcl.out tests/lang/dcl.sql tests/lang/dcl_app.properties
Date Mon, 19 Sep 2005 22:32:42 GMT
Author: djd
Date: Mon Sep 19 15:32:37 2005
New Revision: 290294

URL: http://svn.apache.org/viewcvs?rev=290294&view=rev
Log:
DERBY-537 - Improve dcl test to use extdirs which causes the jar files to
be cleaned up if the test passes and will make for clearer permission granting
once the test passes with a SecurityManager.
Merge from trunk revision 240099.

Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/dcl.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/jdk15/dcl.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl.sql
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_app.properties

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/dcl.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/dcl.out?rev=290294&r1=290293&r2=290294&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/dcl.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/dcl.out
Mon Sep 19 15:32:37 2005
@@ -17,7 +17,7 @@
 ij> -- install the jar, copied there by the magic of supportfiles
 -- in the test harness (dcl_app.properties). The source for
 -- the class is contained within the jar for reference.
-CALL SQLJ.INSTALL_JAR('file:dcl_emc1.jar', 'EMC.MAIL_APP', 0);
+CALL SQLJ.INSTALL_JAR('file:extin/dcl_emc1.jar', 'EMC.MAIL_APP', 0);
 0 rows inserted/updated/deleted
 ij> -- fails because no class not in classpath, jar file not in database classpath.
 CALL EMC.ADDCONTACT(1, 'bill@somecompany.com');
@@ -57,7 +57,7 @@
 ij> -- now change the application to run checks on the e-mail
 -- address to ensure it is valid (in this case by seeing if
 -- simply includes 'spam' in the title.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(4, 'spammer@ripoff.com');
 0 rows inserted/updated/deleted
@@ -85,7 +85,7 @@
 external name 'org.apache.derbyTesting.databaseclassloader.addon.vendor.util.valid'
 language java parameter style java;
 0 rows inserted/updated/deleted
-ij> CALL SQLJ.INSTALL_JAR('file:dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
+ij> CALL SQLJ.INSTALL_JAR('file:extin/dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'EMC.MAIL_APP:"emcAddOn"."MailAddOn"');
 0 rows inserted/updated/deleted
@@ -118,7 +118,7 @@
 -- jarsigner -keystore emcks -storepass ab987c -keypass kpi135 -signedjar dcl_emc2s.jar dcl_emc2.jar
emccto
 --
 --
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2s.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2s.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> VALUES EMC.GETSIGNERS('org.apache.derbyTesting.databaseclassloader.emc');
 1                                                                                       
                                       
@@ -132,14 +132,14 @@
 ij> -- replace with a hacked jar file, emc.class modified to diable
 -- valid e-mail address check but using same signatures.
 -- ie direct replacement of the .class file.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2sm.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2sm.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(99, 'spamking@cracker.org');
 ERROR 42X51: The class 'org.apache.derbyTesting.databaseclassloader.emc' does not exist or
is inaccessible. This can happen if the class is not public.
 ERROR XJ001: Java exception: 'org.apache.derbyTesting.databaseclassloader.emc : Security
exception thrown accessing class org.apache.derbyTesting.databaseclassloader.emc in jar "EMC"."MAIL_APP"
: SHA1 digest error for org/apache/derbyTesting/databaseclassloader/emc.class: java.lang.ClassNotFoundException'.
 ij> -- replace with a hacked jar file, emc.class modified to 
 -- be an invalid jar file (no signing on this jar).
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2l.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2l.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(999, 'spamking2@cracker.org');
 ERROR 42X51: The class 'org.apache.derbyTesting.databaseclassloader.emc' does not exist or
is inaccessible. This can happen if the class is not public.

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/jdk15/dcl.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/jdk15/dcl.out?rev=290294&r1=290293&r2=290294&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/jdk15/dcl.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/jdk15/dcl.out
Mon Sep 19 15:32:37 2005
@@ -17,7 +17,7 @@
 ij> -- install the jar, copied there by the magic of supportfiles
 -- in the test harness (dcl_app.properties). The source for
 -- the class is contained within the jar for reference.
-CALL SQLJ.INSTALL_JAR('file:dcl_emc1.jar', 'EMC.MAIL_APP', 0);
+CALL SQLJ.INSTALL_JAR('file:extin/dcl_emc1.jar', 'EMC.MAIL_APP', 0);
 0 rows inserted/updated/deleted
 ij> -- fails because no class not in classpath, jar file not in database classpath.
 CALL EMC.ADDCONTACT(1, 'bill@somecompany.com');
@@ -57,7 +57,7 @@
 ij> -- now change the application to run checks on the e-mail
 -- address to ensure it is valid (in this case by seeing if
 -- simply includes 'spam' in the title.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(4, 'spammer@ripoff.com');
 0 rows inserted/updated/deleted
@@ -85,7 +85,7 @@
 external name 'org.apache.derbyTesting.databaseclassloader.addon.vendor.util.valid'
 language java parameter style java;
 0 rows inserted/updated/deleted
-ij> CALL SQLJ.INSTALL_JAR('file:dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
+ij> CALL SQLJ.INSTALL_JAR('file:extin/dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'EMC.MAIL_APP:"emcAddOn"."MailAddOn"');
 0 rows inserted/updated/deleted
@@ -118,7 +118,7 @@
 -- jarsigner -keystore emcks -storepass ab987c -keypass kpi135 -signedjar dcl_emc2s.jar dcl_emc2.jar
emccto
 --
 --
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2s.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2s.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> VALUES EMC.GETSIGNERS('org.apache.derbyTesting.databaseclassloader.emc');
 1                                                                                       
                                       
@@ -132,14 +132,14 @@
 ij> -- replace with a hacked jar file, emc.class modified to diable
 -- valid e-mail address check but using same signatures.
 -- ie direct replacement of the .class file.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2sm.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2sm.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(99, 'spamking@cracker.org');
 ERROR 42X51: The class 'org.apache.derbyTesting.databaseclassloader.emc' does not exist or
is inaccessible. This can happen if the class is not public.
 ERROR XJ001: Java exception: 'org.apache.derbyTesting.databaseclassloader.emc : Security
exception thrown accessing class org.apache.derbyTesting.databaseclassloader.emc in jar "EMC"."MAIL_APP"
: SHA1 digest error for org/apache/derbyTesting/databaseclassloader/emc.class: java.lang.ClassNotFoundException'.
 ij> -- replace with a hacked jar file, emc.class modified to 
 -- be an invalid jar file (no signing on this jar).
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2l.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2l.jar', 'EMC.MAIL_APP');
 0 rows inserted/updated/deleted
 ij> CALL EMC.ADDCONTACT(999, 'spamking2@cracker.org');
 ERROR 42X51: The class 'org.apache.derbyTesting.databaseclassloader.emc' does not exist or
is inaccessible. This can happen if the class is not public.

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl.sql?rev=290294&r1=290293&r2=290294&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl.sql
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl.sql
Mon Sep 19 15:32:37 2005
@@ -16,7 +16,7 @@
 -- install the jar, copied there by the magic of supportfiles
 -- in the test harness (dcl_app.properties). The source for
 -- the class is contained within the jar for reference.
-CALL SQLJ.INSTALL_JAR('file:dcl_emc1.jar', 'EMC.MAIL_APP', 0);
+CALL SQLJ.INSTALL_JAR('file:extin/dcl_emc1.jar', 'EMC.MAIL_APP', 0);
 
 -- fails because no class not in classpath, jar file not in database classpath.
 CALL EMC.ADDCONTACT(1, 'bill@somecompany.com');
@@ -42,7 +42,7 @@
 -- now change the application to run checks on the e-mail
 -- address to ensure it is valid (in this case by seeing if
 -- simply includes 'spam' in the title.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2.jar', 'EMC.MAIL_APP');
 
 CALL EMC.ADDCONTACT(4, 'spammer@ripoff.com');
 CALL EMC.ADDCONTACT(5, 'open@source.org');
@@ -61,7 +61,7 @@
 external name 'org.apache.derbyTesting.databaseclassloader.addon.vendor.util.valid'
 language java parameter style java;
 
-CALL SQLJ.INSTALL_JAR('file:dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
+CALL SQLJ.INSTALL_JAR('file:extin/dcl_emcaddon.jar', '"emcAddOn"."MailAddOn"', 0);
 
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'EMC.MAIL_APP:"emcAddOn"."MailAddOn"');
 
@@ -87,7 +87,7 @@
 --
 --
 
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2s.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2s.jar', 'EMC.MAIL_APP');
 VALUES EMC.GETSIGNERS('org.apache.derbyTesting.databaseclassloader.emc');
 
 -- other jar should not be signed
@@ -96,12 +96,12 @@
 -- replace with a hacked jar file, emc.class modified to diable
 -- valid e-mail address check but using same signatures.
 -- ie direct replacement of the .class file.
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2sm.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2sm.jar', 'EMC.MAIL_APP');
 CALL EMC.ADDCONTACT(99, 'spamking@cracker.org');
 
 -- replace with a hacked jar file, emc.class modified to 
 -- be an invalid jar file (no signing on this jar).
-CALL SQLJ.REPLACE_JAR('file:dcl_emc2l.jar', 'EMC.MAIL_APP');
+CALL SQLJ.REPLACE_JAR('file:extin/dcl_emc2l.jar', 'EMC.MAIL_APP');
 CALL EMC.ADDCONTACT(999, 'spamking2@cracker.org');
 
 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_app.properties?rev=290294&r1=290293&r2=290294&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_app.properties
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_app.properties
Mon Sep 19 15:32:37 2005
@@ -1,4 +1,5 @@
 usedefaults=true
 supportfiles=tests/lang/dcl_emc1.jar,tests/lang/dcl_emc2.jar,tests/lang/dcl_emcaddon.jar,tests/lang/dcl_emc2s.jar,tests/lang/dcl_emc2sm.jar,tests/lang/dcl_emc2l.jar
 #Exclude for J2ME/Foundation - test requires java.sql.DriverManager for server side JDBC
-runwithfoundation=false
\ No newline at end of file
+runwithfoundation=false
+useextdirs=true



Mime
View raw message