[jboss-cvs] JBossAS SVN: r108968 - in branches/JBPAPP_5_1/testsuite/src/resources/cc: dblogin/conf and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 28 10:35:30 EDT 2010
Author: pskopek at redhat.com
Date: 2010-10-28 10:35:30 -0400 (Thu, 28 Oct 2010)
New Revision: 108968
Added:
branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/standard.sql
Removed:
branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/db2r9.sql
branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/oracle.sql
Modified:
branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/mysql.sql
branches/JBPAPP_5_1/testsuite/src/resources/cc/dblogin/conf/login-config.xml
Log:
cc: schema change for all DBs
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/db2r9.sql
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/db2r9.sql 2010-10-28 14:35:14 UTC (rev 108967)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/db2r9.sql 2010-10-28 14:35:30 UTC (rev 108968)
@@ -1,23 +0,0 @@
-CREATE TABLE PRINCIPALS (
- PRINCIPALID VARCHAR(20),
- PASSWORD VARCHAR(40)
-);
-
-
-CREATE TABLE ROLES
- ( PRINCIPALID VARCHAR(20),
- ROLE VARCHAR(100),
- ROLEGROUP VARCHAR(100)
- );
-
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','JBossAdmin','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','caller_java','CallerPrincipal');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','Echo','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','HttpInvoker','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('kermit','thefrog','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('jduke','Echo','Roles');
-
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('java','echoman');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('admin','admin');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('kermit','friend');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('jduke','theduke');
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/mysql.sql
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/mysql.sql 2010-10-28 14:35:14 UTC (rev 108967)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/mysql.sql 2010-10-28 14:35:30 UTC (rev 108968)
@@ -1,3 +1,6 @@
+DROP TABLE ROLES;
+DROP TABLE PRINCIPALS;
+
CREATE TABLE PRINCIPALS (
PRINCIPALID VARCHAR(20),
PASSWORD VARCHAR(40)
@@ -6,17 +9,17 @@
CREATE TABLE ROLES
( PRINCIPALID VARCHAR(20),
- ROLE VARCHAR(100),
+ ROLENAME VARCHAR(100),
ROLEGROUP VARCHAR(100)
)
ENGINE = InnoDB;
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','JBossAdmin','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','caller_java','CallerPrincipal');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','Echo','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','HttpInvoker','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('kermit','thefrog','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('jduke','Echo','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('admin','JBossAdmin','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('java','caller_java','CallerPrincipal');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('java','Echo','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('admin','HttpInvoker','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('kermit','thefrog','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('jduke','Echo','Roles');
Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('java','echoman');
Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('admin','admin');
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/oracle.sql
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/oracle.sql 2010-10-28 14:35:14 UTC (rev 108967)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/oracle.sql 2010-10-28 14:35:30 UTC (rev 108968)
@@ -1,27 +0,0 @@
-drop table principals;
-drop table roles;
-
-CREATE TABLE PRINCIPALS (
- PRINCIPALID VARCHAR(20),
- PASSWORD VARCHAR(40)
-);
-
-
-CREATE TABLE ROLES
- ( PRINCIPALID VARCHAR(20),
- ROLE VARCHAR(100),
- ROLEGROUP VARCHAR(100)
- );
-
-
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('java','echoman');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('admin','admin');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('kermit','friend');
-Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('jduke','theduke');
-
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','JBossAdmin','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','caller_java','CallerPrincipal');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('java','Echo','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('admin','HttpInvoker','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('kermit','thefrog','Roles');
-Insert into ROLES (PRINCIPALID,ROLE,ROLEGROUP) values ('jduke','Echo','Roles');
Added: branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/standard.sql
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/standard.sql (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/db/scripts/standard.sql 2010-10-28 14:35:30 UTC (rev 108968)
@@ -0,0 +1,23 @@
+CREATE TABLE PRINCIPALS (
+ PRINCIPALID VARCHAR(20),
+ PASSWORD VARCHAR(40)
+);
+
+
+CREATE TABLE ROLES
+ ( PRINCIPALID VARCHAR(20),
+ ROLENAME VARCHAR(100),
+ ROLEGROUP VARCHAR(100)
+ );
+
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('admin','JBossAdmin','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('java','caller_java','CallerPrincipal');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('java','Echo','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('admin','HttpInvoker','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('kermit','thefrog','Roles');
+Insert into ROLES (PRINCIPALID,ROLENAME,ROLEGROUP) values ('jduke','Echo','Roles');
+
+Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('java','echoman');
+Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('admin','admin');
+Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('kermit','friend');
+Insert into PRINCIPALS (PRINCIPALID,PASSWORD) values ('jduke','theduke');
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/dblogin/conf/login-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/dblogin/conf/login-config.xml 2010-10-28 14:35:14 UTC (rev 108967)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/dblogin/conf/login-config.xml 2010-10-28 14:35:30 UTC (rev 108968)
@@ -75,7 +75,7 @@
<module-option name="principalsQuery">
select PASSWORD from PRINCIPALS where PRINCIPALID=?</module-option>
<module-option name="rolesQuery">
- select ROLE, ROLEGROUP from ROLES where PRINCIPALID=?</module-option>
+ select ROLENAME, ROLEGROUP from ROLES where PRINCIPALID=?</module-option>
</login-module>
</authentication>
</application-policy>
@@ -92,7 +92,7 @@
<module-option name="principalsQuery">
select PASSWORD from PRINCIPALS where PRINCIPALID=?</module-option>
<module-option name="rolesQuery">
- select ROLE, ROLEGROUP from ROLES where PRINCIPALID=?</module-option>
+ select ROLENAME, ROLEGROUP from ROLES where PRINCIPALID=?</module-option>
</login-module>
</authentication>
</application-policy>
More information about the jboss-cvs-commits
mailing list