|
From: Vance K. <va...@us...> - 2007-01-24 06:53:07
|
User: vancek
Date: 07/01/23 22:53:08
Modified: samples/timetracker-ejb3/app/src/main/application/META-INF
timetracker-login-config.xml
samples/timetracker-ejb3/mda/src/main/uml timetracker.xmi
Added: samples/timetracker-ejb3 sql.txt
Log:
update schema User-UserRoles
Revision Changes Path
1.2 +2 -3 plugins/samples/timetracker-ejb3/app/src/main/application/META-INF/timetracker-login-config.xml
Index: timetracker-login-config.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/timetracker-ejb3/app/src/main/application/META-INF/timetracker-login-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- timetracker-login-config.xml 24 Jan 2007 04:33:38 -0000 1.1
+++ timetracker-login-config.xml 24 Jan 2007 06:53:07 -0000 1.2
@@ -14,12 +14,11 @@
select u.password as 'Password' from users u where binary u.username =?
</module-option>
<module-option name="rolesQuery">
- select distinct r.role as 'Roles', 'Roles' as 'RoleGroups' from users u left join users_user_role as ur on u.id = ur.users_id left join user_role as r on r.id = ur.roles_id where binary u.username =?
+ select distinct ur.role as 'Roles', 'Roles' as 'RoleGroups' from users u left join user_role as ur on u.id = ur.user where binary u.username =?
</module-option>
- <!-- uncomment to enable MD5 and BASE64 hash encoding
+ <!-- uncomment to enable MD5 and BASE64 hash encoding -->
<module-option name="hashAlgorithm">MD5</module-option>
<module-option name="hashEncoding">BASE64</module-option>
- -->
</login-module>
</authentication>
</application-policy>
1.2 +6 -6 plugins/samples/timetracker-ejb3/mda/src/main/uml/timetracker.xmi
Index: timetracker.xmi
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/timetracker-ejb3/mda/src/main/uml/timetracker.xmi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- timetracker.xmi 24 Jan 2007 04:33:36 -0000 1.1
+++ timetracker.xmi 24 Jan 2007 06:53:07 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- <!DOCTYPE XMI SYSTEM "uml14xmi12.dtd"> -->
-<XMI xmi.version='1.2' timestamp='Wed Jan 24 13:07:05 GMT+08:00 2007' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Wed Jan 24 15:14:57 GMT+08:00 2007' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -778,7 +778,7 @@
</UML:Class>
<UML:Association xmi.id='_9_5_1_8c50279_1169562351546_551356_632' isRoot='false' isLeaf='false' isAbstract='false'>
<UML:Association.connection>
- <UML:AssociationEnd xmi.id='_9_5_1_8c50279_1169562351546_772011_630' name='user' visibility='public' isNavigable='false' ordering='unordered' aggregation='none' targetScope='instance' changeability='changeable' association='_9_5_1_8c50279_1169562351546_551356_632' participant='_9_5_1_8c50279_1169288267218_362608_214'/>
+ <UML:AssociationEnd xmi.id='_9_5_1_8c50279_1169562351546_772011_630' name='user' visibility='public' isNavigable='true' ordering='unordered' aggregation='none' targetScope='instance' changeability='changeable' association='_9_5_1_8c50279_1169562351546_551356_632' participant='_9_5_1_8c50279_1169288267218_362608_214'/>
<UML:AssociationEnd xmi.id='_9_5_1_8c50279_1169562351546_940963_631' name='roles' visibility='public' isNavigable='true' ordering='unordered' aggregation='none' targetScope='instance' changeability='changeable' association='_9_5_1_8c50279_1169562351546_551356_632' participant='_9_5_1_8c50279_1169562315843_550874_612'>
<UML:AssociationEnd.multiplicity>
<UML:Multiplicity xmi.id='_9_5_1_8c50279_1169610631000_262917_910'>
@@ -1875,10 +1875,10 @@
<zoomFactor xmi.value='1.0'/>
<diagramOpened xmi.value='true'/>
<diagramWindowBounds>0, 0, 936, 849</diagramWindowBounds>
- <diagramScrollPositionX xmi.value='575'/>
+ <diagramScrollPositionX xmi.value='522'/>
<diagramScrollPositionY xmi.value='0'/>
<maximized xmi.value='true'/>
- <active xmi.value='false'/>
+ <active xmi.value='true'/>
<mdOwnedViews>
<mdElement elementClass='ClassView' xmi.id='_9_5_1_8c50279_1169288267218_291755_215'>
<elementID xmi.idref='_9_5_1_8c50279_1169288267218_362608_214'/>
@@ -2264,7 +2264,7 @@
<diagramScrollPositionX xmi.value='0'/>
<diagramScrollPositionY xmi.value='0'/>
<maximized xmi.value='true'/>
- <active xmi.value='true'/>
+ <active xmi.value='false'/>
<mdOwnedViews>
<mdElement elementClass='UseCaseView' xmi.id='_9_5_1_8c50279_1169289715765_476802_469'>
<elementID xmi.idref='_9_5_1_8c50279_1169289715765_707040_468'/>
@@ -3324,7 +3324,7 @@
<mdElement elementClass='StringProperty'>
<propertyID>INFO_PROPERTY</propertyID>
<propertyDescriptionID>INFO_PROPERTY_DESCRIPTION</propertyDescriptionID>
- <value>18 2d 42 2e 31 6e 45 2f a 54 5 60 71 50 a3 6b e4 4b 7d ea 49 37 68 2c 1f 42 d 52 25 27 b7 21 18 91 a5 a9 6 ce fe 50 ff 7d f7 b7 a1 ab 60 b9 9e a7 1b 8a 22 9d 93 c7 5f 98 84 65 e1 e3 f6 3c 54 fd 28 bb a1 2b f6 5a b8 cb d6 e5 9d </value>
+ <value>18 2d 42 2e 31 6e 45 2f a 54 5 60 71 50 a3 6b e4 4b 7d ea 49 37 68 2a 1f 43 e 52 20 25 b7 21 18 91 a5 a9 6 ce fe 50 ff 7d f7 b7 a1 ab 60 b9 9e a7 1b 8a 22 9d 93 c7 5f 98 84 65 e1 e3 f6 3c 54 fd 28 bb a1 2b f6 5a b8 cb d6 e5 9d </value>
<multiline xmi.value='false'/>
</mdElement>
<mdElement elementClass='ChoiceProperty'>
1.1 plugins/samples/timetracker-ejb3/sql.txt
Index: sql.txt
===================================================================
insert into users (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (1, 'nbhatia', '756slLjeNViurJBGI5JeqA==', 'Naresh', 'Bhatia', 'nb...@no... email address is being protected from spam bots, you need Javascript enabled to view it', 1, '2006/01/01 09:00', null);
insert into users (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (2, 'lcoude', '756slLjeNViurJBGI5JeqA==', 'Louis', 'Coude', 'lc...@no... email address is being protected from spam bots, you need Javascript enabled to view it', 1, '2006/01/01 09:00', null);
insert into users (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (3, 'ecrutchfield', '756slLjeNViurJBGI5JeqA==', 'Eric', 'Crutchfield', 'ecr...@no... email address is being protected from spam bots, you need Javascript enabled to view it', 1, '2006/01/01 09:00', null);
insert into users (ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, IS_ACTIVE, CREATION_DATE, COMMENT) values (4, 'cmicali', '756slLjeNViurJBGI5JeqA==', 'Chris', 'Micali', 'cm...@no... email address is being protected from spam bots, you need Javascript enabled to view it', 1, '2006/01/01 09:00', null);
insert into user_role (ID, ROLE, USER) values (1, 'ADMIN', 1);
insert into user_role (ID, ROLE, USER) values (2, 'USER', 1);
insert into user_role (ID, ROLE, USER) values (3, 'USER', 2);
insert into user_role (ID, ROLE, USER) values (4, 'USER', 3);
insert into user_role (ID, ROLE, USER) values (5, 'USER', 4);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (1, 1);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (1, 2);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (2, 2);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (3, 2);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (4, 1);
-- insert into users_user_role (USERS_ID, ROLES_ID) values (4, 2);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 1, 'APPROVED', '2006/05/15', 'Timecard 01', 1, 2);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 2, 'APPROVED', '2006/05/15', 'Timecard 02', 2, 3);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 3, 'APPROVED', '2006/05/15', 'Timecard 03', 3, 4);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 4, 'APPROVED', '2006/05/15', 'Timecard 04', 4, 1);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 5, 'REJECTED', '2006/05/22', 'Timecard 05', 1, 2);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 6, 'REJECTED', '2006/05/22', 'Timecard 06', 2, 3);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 7, 'REJECTED', '2006/05/22', 'Timecard 07', 3, 4);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 8, 'REJECTED', '2006/05/22', 'Timecard 08', 4, 1);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values ( 9, 'SUBMITTED', '2006/05/29', 'Timecard 09', 1, 2);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (10, 'SUBMITTED', '2006/05/29', 'Timecard 10', 2, 3);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (11, 'SUBMITTED', '2006/05/29', 'Timecard 11', 3, 4);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (12, 'SUBMITTED', '2006/05/29', 'Timecard 12', 4, 1);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (13, 'DRAFT', '2006/06/05', 'Timecard 13', null, 2);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (14, 'DRAFT', '2006/06/05', 'Timecard 14', null, 3);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (15, 'DRAFT', '2006/06/05', 'Timecard 15', null, 4);
insert into timecard (ID, STATUS, START_DATE, COMMENTS, APPROVER, SUBMITTER) values (16, 'DRAFT', '2006/06/05', 'Timecard 16', null, 1);
|