April 2008 - seam-commits - Jboss List Archives

Seam SVN: r7814 - in branches/Seam_2_0: examples/seamspace/resources/META-INF and 5 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-04-03 22:08:22 -0400 (Thu, 03 Apr 2008) New Revision: 7814 Added: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java Removed: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserAction.java branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserSearch.java branches/Seam_2_0/src/main/org/jboss/seam/identity-management-2.0.xsd branches/Seam_2_0/src/main/org/jboss/seam/security/management/ Modified: branches/Seam_2_0/examples/seamspace/resources/META-INF/security-rules.drl branches/Seam_2_0/examples/seamspace/resources/WEB-INF/components.xml branches/Seam_2_0/examples/seamspace/resources/import.sql branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java branches/Seam_2_0/src/main/org/jboss/seam/security/jaas/SeamLoginModule.java Log: JBSEAM-2818 Modified: branches/Seam_2_0/examples/seamspace/resources/META-INF/security-rules.drl =================================================================== --- branches/Seam_2_0/examples/seamspace/resources/META-INF/security-rules.drl 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/resources/META-INF/security-rules.drl 2008-04-04 02:08:22 UTC (rev 7814) @@ -84,43 +84,3 @@ then check.grant(); end - -rule CreateAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "create", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule ReadAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "read", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule UpdateAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "update", granted == false) - Role(name == "admin") -then - check.grant(); -end - -rule DeleteAccount - no-loop - activation-group "permissions" -when - check: PermissionCheck(name == "seam.account", action == "delete", granted == false) - Role(name == "admin") -then - check.grant(); -end \ No newline at end of file Modified: branches/Seam_2_0/examples/seamspace/resources/WEB-INF/components.xml =================================================================== --- branches/Seam_2_0/examples/seamspace/resources/WEB-INF/components.xml 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/resources/WEB-INF/components.xml 2008-04-04 02:08:22 UTC (rev 7814) @@ -3,7 +3,6 @@ xmlns:core="http://jboss.com/products/seam/core" xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:security="http://jboss.com/products/seam/security" - xmlns:identity-management="http://jboss.com/products/seam/security/management" xmlns:drools="http://jboss.com/products/seam/drools" xmlns:captcha="http://jboss.com/products/seam/captcha" xmlns:web="http://jboss.com/products/seam/web" @@ -13,7 +12,6 @@ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd - http://jboss.com/products/seam/security/management http://jboss.com/products/seam/identity-management-2.0.xsd http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd http://jboss.com/products/seam/captcha http://jboss.com/products/seam/captcha-2.0.xsd"> @@ -24,10 +22,8 @@ concurrent-request-timeout="500" conversation-id-parameter="cid"/> - <security:identity security-rules="#{securityRules}"/> - - <identity-management:jpa-identity-store name="identityStore" account-class="org.jboss.seam.example.seamspace.MemberAccount"/> - + <security:identity security-rules="#{securityRules}" authenticate-method="#{authenticator.authenticate}"/> + <drools:rule-base name="securityRules"> <drools:rule-files> <value>/META-INF/security-rules.drl</value> Modified: branches/Seam_2_0/examples/seamspace/resources/import.sql =================================================================== --- branches/Seam_2_0/examples/seamspace/resources/import.sql 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/resources/import.sql 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,20 +1,15 @@ -insert into Member (memberid, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (1, 'Mr_Smiley', 'Mr', 'Smiley', 'smiley(a)nowhere.com', 'I smile because I care', 0, '1953-03-10', '', '2007-01-02') -insert into Member (memberid, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (2, 'duke', 'duke', 'McDuke', 'duke(a)sun.com', 'I love the smell of coffee', 0, '1995-01-01', '', '2007-01-04') -insert into Member (memberid, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (3, 'shadowman', 'shadow', 'man', 'shadowman(a)redhat.com', 'I''m wearing a hat', 0, '1999-01-01', '', '2007-01-05') -insert into Member (memberid, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (4, 'mona', 'mona', 'lisa', 'monalisa(a)louvre.fr', 'Some describe me as enigmatic', 1, '1503-07-01', '', '2007-01-06') +insert into Member (memberid, username, hashedpassword, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (1, 'demo', 'fe01ce2a7fbac8fafaed7c982a04e229', 'Mr_Smiley', 'Mr', 'Smiley', 'smiley(a)nowhere.com', 'I smile because I care', 0, '1953-03-10', '', '2007-01-02') +insert into Member (memberid, username, hashedpassword, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (2, 'duke', '041cf7cf23d3d372644b707505218fb0', 'duke', 'duke', 'McDuke', 'duke(a)sun.com', 'I love the smell of coffee', 0, '1995-01-01', '', '2007-01-04') +insert into Member (memberid, username, hashedpassword, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (3, 'shadowman', '1bafb3c11c60b0892007c63ac6a321de', 'shadowman', 'shadow', 'man', 'shadowman(a)redhat.com', 'I''m wearing a hat', 0, '1999-01-01', '', '2007-01-05') +insert into Member (memberid, username, hashedpassword, membername, firstname, lastname, email, tagline, gender, dob, location, membersince) values (4, 'mona', '4af5cab77c62eaec5f87b570f2d2b127', 'mona', 'mona', 'lisa', 'monalisa(a)louvre.fr', 'Some describe me as enigmatic', 1, '1503-07-01', '', '2007-01-06') -insert into MemberAccount (accountid, username, enabled, accounttype, member_id) values (1, 'user', 1, 1, null); -insert into MemberAccount (accountid, username, enabled, accounttype, member_id) values (2, 'admin', 1, 1, null); -insert into MemberAccount (accountid, username, passwordhash, enabled, accounttype, member_id) values (3, 'demo', 'ffd49efe97c77941fc149e1ab010fa8d', 1, 0, 1); -insert into MemberAccount (accountid, username, passwordhash, enabled, accounttype, member_id) values (4, 'duke', '97291c29cc69a65890424d0f97db28f2', 1, 0, 2); -insert into MemberAccount (accountid, username, passwordhash, enabled, accounttype, member_id) values (5, 'shadowman', 'd76acda33fcfede62a8a6979df88e690', 1, 0, 3); -insert into MemberAccount (accountid, username, passwordhash, enabled, accounttype, member_id) values (6, 'mona', '0a7adfe58071398e15b5177f4ace8493', 1, 0, 4); +insert into MemberRole (roleid, name) values (1, 'user'); +insert into MemberRole (roleid, name) values (2, 'admin'); -insert into AccountMembership (accountid, memberof) values (2, 1); -insert into AccountMembership (accountid, memberof) values (3, 2); -insert into AccountMembership (accountid, memberof) values (4, 1); -insert into AccountMembership (accountid, memberof) values (5, 1); -insert into AccountMembership (accountid, memberof) values (6, 1); +insert into MemberRoles (member_id, role_id) values (1, 2); +insert into MemberRoles (member_id, role_id) values (2, 1); +insert into MemberRoles (member_id, role_id) values (3, 1); +insert into MemberRoles (member_id, role_id) values (4, 1); insert into MemberImage (imageid, member_id, contentType, data) values (1, 1, 'image/png', '89504E470D0A1A0A0000000D49484452000000AA000000990803000000884651B30000000467414D410000AFC837058AE90000001974455874536F6674776172650041646F626520496D616765526561647971C9653C00000300504C5445F6E555F5E664F8F9D8615D0B020101F3E433DAB920F7E874F8F8C8F8F270F7E984F8F4B8F8F398F8F3A0939218F2C903F8F8E8F8F380F8F4A8F8F168F8F390F8F378F1D615E9D368F8F388F8F160F8F4B05D5A45F7EA93F3F224F3D824F8F9D0F5E325F8F9B8F8F250F8F158E8C703E7E544FFFFFFF8F4C8F8F9C0F4E614DCCD2BF8F9B0E7E653F3F214F8F248E4C323F2DA33F0F100D2CB88E4C2137A782A808080E7E436B0AD6B8E894FF8F8A0EEDB7FF8F9A8E8E564A9A545E3D825F0D100E7D944F0F140D0CFC7E7DA342D2903A9A98BF6EAA3F8F998E5D516CCC9B0F8F140F0F148E3DA52B0AFA8E7D202E1C444CECE45DEC032F0EA00F0DA43908F73D4D16DE7E8D2F8FA90F0EA49F8F038E8E393F0E200F0F138EFDA00E7E300EEC913E6E424E3C856F8F4C0C1BC86FCFDF0F8EB00DDBD0AF8F988F0D209F0F108F8F100F4EAB236332AF0F050C2BE4CF2DB58FEFFFCF0EA40FDFEF7F0F2D8F8F4D0F0F280! F8EA3EE6E6C6F8EB4CF8EB08F0F030F8E24AE5E4A2F8EF2EE8E575E8E6B3F0F078EFE249E7E984F0F088F8F108EFE13EF8F4D8474329F8F980F0F290F0EE70F0EE63F0F8E0F8E13EF0F2E0F0F268F0F2B0F0DA0AF8FA68F0F058F8FA58F0EB09F0F3B8F0F9C8F8FA50E7ED4595977AE7EAE2F8F8F0F8FA48F8FA401915019C9B52F8E208F8F978E5E917F8F970F0F3C8F8F938F2EBC596968EF8E200F0E109F0F098F0F2D0F0F2C0E7EE33E8EE54E8F185F0ECD5F0F8D8ECEE24E8EE71E8ED63F8DA00E8F2C2F0F2A0FBFAE7F8FA60F8D300F8DA0BF0F9E8F0F1E8F7FA29E8EEB3FCFEFDF0F858DAD8ACF0F0A8F8F3F0F8D30AF0F948F0F9C0F0ECE4E8EEA6ECCE23F0F9A8FCFAF0F0F9F0A3A06CF8FA00A09E91FBFEF70F0A09F8F8E0F8FCDFF8FCF0F8F8F8F9FCE8F8FCF8F8F4E0F8F4E8F0F890F0F8D0F0F898F0F888F0F570F0F878F0F868F0F560F0F8B8F0F800F0F8363E3D02E8F400F7FA11DDDF5EE8EED8DDDE37D9D9CB221F15F0F0F0BABBABDBDD94FDFDFEFEFEFFEBCC33F0FC50F0F8B0F0F8408D8D80908890FBFBF7F0F8A0B2AE1FB8BA3EEBCE46E9CD5BF068708C000027E94944415478DAD49D095C9357BAF04958B20BD9308440084B0904100A222188522DB160B16295A0288A2088524344CA52AC088892A2822B2D1AB54A5BD74ED599DA3A63B7D1DEB14E! A7032FA66A6B97A9B4D63AB676C6B9DE56EF73CEFB2679134001BDF37DF380D4F90DEA DFE73CFB5974F3F88F11378FB1FF2182501F19B6184D2693D168FF5FD4CF08B546A7D5EB73728AB1E468351AB5D25A68323EF2306484A888CFF69377DF05F0422BF3B30F05121977D54A46CAD4AB5341AE4E65AC6471157C915C4914D2FE62FF7E54879808B646FFE586231D6113C3C29A9A2636855132695222485898D9CC9588D444A1F1FF21AA11E993A999BDFA785458E2FCC308ACBCBC3CAD1C8BA1BCB2D2332868FE94D4D46BD7A6A6B0B8FC02E68318C383A19A98AA37571C3F82109BCA6B6B838343AAAADC9030B0B8B9D5D6D6B602B0E7A44993264E9CE86696E9ACA67F2BEA4DDBC26B0EACBC1A1576B8A6A6B2B20AF0C4623183C3E2B0A4F0813E59247055556D6B5313D0CE9F3495912CEA19A1218C08F5A79B9833C75C060669A8AA0AF1F313031A97C51272B9128944C1B50B8B858901B7B2B27246ECA4D4494DE6151AA6F1DF6800856AFD179B126B7263824342FC182C1697AB5028F8200A457AFA018140C0E74B2480AAA080198CDAFAFAAA5ACFA08829A991E606F908EC6044A8C6C202052BAA2331062954CCE1482124A58B2891CBE5A2741162C5023A9671855C16074CA11699AE2772B430337FD89A1D01AAB150CD179A37D5971BFCC034A552215771E04D20E4F1542A1E8F575050B075EB3F376EFCE8A38F1039202B24106F916E198C656ECB5A63E74! 7BC9C9AC850149C33FEDFA21A4FA8F52D9B320D864D7E2CAE502601752E91CB97204E159BADC45251111E1EAE561784871714F09600AE822F5120534866312028B4D6B64E9C7867991B4BC4040FBBF97F827A13DBE8AAE31D1DE586108654C6170844721E1081B0D96AB69249CA1AA5D2C15CC0E3C945D82014E90A6CB50CB765CB66CC884D9DB48C2BEA313D3254D8616AF584F68BB2C3873337B5B0C0D32165F2546AA4C9354CBAD840956C351680256905E948B7246DED8C496767DC59C6550F39740D0BD5C4E49B3B0E5F497B8F23E3233B0485224DF6D8C5091448552A20456650C05369343A64B9142CD8C18C198181917756EA08D3C3472DD473CC61619921EDB0F422B0CE82F08A8A35177A7C9010048199312A1B0B56EA871F6EDBB70F5B2ED832C0A60B8055C6C21E561B14E81B3929659DDAF49051C1F1A320B11BFC386B6507D2E54BC044D7ACB970E1A24F6767276665123D172ED050D978FD0FED43A805E8A7A0586406C02A447961597D6B5050606A64D46AA5E9A1A21AADFA6386CCE010B1542611E0A5672B7B488DFAD8967F0D928A0AA58D16FB1B5A7E64AD60AF28E4222380E02564B5B4B066B436C506A5A64EE4CA4D0F13D5AAFDAAACACCC0F481502E4F580C3ECA1833A504958C0A583CA4941A87ACCBA8AD5E2565F0F812035752A9777FBA1A19A880! 3C78E746CDAC041114A8E40C181887BA3B20743C56AE50A1B5829600448AF915393455 6E3C3412D545F3A1ED5F1DE06A91015F505C8EDC18FACCEA4242A4DA96CD7D5C7A4800A4D0DC08211AC34BBD53735C5A6463E9522B86F20180AAAD1AA5B71A4A3E3BDAF841250290F40C148AD202E4A6552A47663ED872AA250B5A83690281AB82D0C3082F249A99191299282DB0F8C5AA8D40A11E9DE6214F3514E420BDFDBDB6BA540095B4C2541696E5550E0B4FE544103AC5429038A45F5F724A860C008D4B7478E8ACDE77601D4A586CCCD400AEE04A068E13B9158298D1254F01F3A2A2E12157C015F281543E69AD11A943A2572E2E8825EE34851FF8A7EE5093E27AC3C66F3DEB5FC0F0A2A2AC048ADBD98F4CF7FFE3DA95382E8B1E57E27501BAA9D5423A2B1A6A32F9FCB567050290B790BB241E481AD85234535FD157EC85B0C31C17E1CA144C753123D84D5DADBDB498A8F5342453995F2A8F0704744A559AA4EA415690534D17E7E492694A2340B55ACAF6FEA538A7BF9D63D51DF353E62524ACC86603F944AE505CC1E2B22ED2503BF8FD519D49EFED934549E9D14D5005AAD0D351DA955FBF9BA7560AE52D06B6B6CA0EF94C8AB7CEB88DDCAA4BC6C2E8BF1E370D3C1A194E04E74549FFBA016B8A26A1DA8A4B97EFE395F815C0BAA9756CF4008B0A345A611A21A89CF8F676E0FE1C8043898621B75A0BA9232A970EA40E539913A50A966262707A280024CC00F! B1C6064E99326D6541E1C8500BB5C73BCE6C6E17F2450515B0FA9491FA386BB51F29890A75AA13AA8E4445B07C3BAA04E22B4401B11F84AC26B081C83B50C08E04B550732CAAE31FED6BF9221E9B69EDFDF4D3F3E7FBA3320746553B506D4AB5A1EAED1D221299700F87034DA25B7D6B60E0D9C8A912A669F8A826CD97473ACE7CBD562B023B257A7B8114B362CC8BF0E14CEA28FF86804A61CA8A8BD7AE5D2B944A39805ADB1A783A3F726AFA8961A31A89B5656967DEFB82AFE1852BB1523F25512FDA954A76002E5D0A955081D5851422004AFF7ABD83548648D70A85528E991105A881F9F991A335A69BC34335296586BCCC903D393A35CA5088D4D5528983CB99C48DA7ADCB8937989F7DA83C148E528093EBDB8B5414F7C9565BE210A858B0484138E61670AD19B181F967A70D6CAE2EA8B429E809BDB83C2F582CD3AAD888944475B252623964AAE56397FECBBA7C16C1FC1D7B1B0D954EAAA132942BAA0C2A41076A8BD95C5F3BE3CED9D3F963B84AE370B46A524BABAA6242A41211C4536B67EF7984EAEC50D0A27CBFDEEAEF6179723D2896B90DAD3CDB29F4D3122A8EFB22CAF9158818969FAED5960DE67A68B9037DF3CFDE51140E03D548F01906684F8402502A9451E7B14B394729D0E9F7BFE97DD5C3E3FA2756EB412662C54EA576562A46B5E5285B9C225185! 5C072AB01A507005B54E5F166E1C3A6AA1A6C5501E02995F04E9B4B7F3FC00A8B0F8EB ADEB7B6F747B78585EB52EFF1D53696BFD784EA436542D15FB257C72366403B5A38AABAA5A51703DBBE8E7D9D621A1E2BF1091B3292F4D2C940878EC1E1F1C5191F3BBE894580EA83F347B805EFFD5433C6B1B51A85C487524A9969A0FDA2C5528A4914AF77238E290AA4ACF58600D8DBC2BBF3954AD9A342D99B782A51201AA513ACFDBC2940395C0C204BD768205747B581E27BEFF0CA3AA5483A2920B5F5C2C9339BCDF8EBA97D3CEA8329437C59EF5CD8ABF33FBDCBD511D06625D77246DFB5B504EF12AD6F8748247F50E004A1C8418D0639DD50C26E0B1F409621F5E7E84AAA15B2AC45304AAD592594A02E9D449AB78F5F7022AC72F04A106FA9E0C8D1C5D601C22AAE658C78EF616BE08052AA84F7B517BE2E8A5AC881385FEEF97F780B93E761D6DD5F9FF406C53B20FA9551BD51A0D1A613AC5548C0A75BF40A7FBFC804E335BC05FB1B685868A45EC17526540E5A06FFC34857568A885FAE31DDBF7700572354A5314A8D54AD729CA51B3ACD6F5EB213CDC58EA6101D6279063A9792A15429593A80E52C8523A8540F3DCC25DEEEE4F3FFA9C40BF768F0B2966AD6D42AC6322193CE3506CD5A85C7524D30F2A3F2AFA53A4D61E1FBB43E1646AB53EF12F7FFFA5CDCD4B9109782CFD84493C7F48BD71A386522BADEFC3A80A9D6A61B3057DEFE4E65DDAE2142754B11! 86200781634DBB16721B6720B87826A151C2F7B4FCC47D5345DA9D61E6752A6F546B347B76DAF16C5AC170F32C3F16C0AB3DAFA3E448A52BF5EA05AD867FBFEC9BB246B6D2E8549DBC57B5B3688FDAA0C4DC8B3A6788DE699EE8F6A52AF8ACA7C4B2AE0152891A59E3F6F63B5A352F5D427CD24A203F769827988CD2351E5AEA85AD5A3FEF03DF817747B34CFCEA1A1EE1503EB1708B5CA505F0FCDCBA2E90AC2785F546B8EB9A36CAF4CA0C6CB0F71EA533AAA9DF48DE54BED94DD1EE49F7FFDE90AE5A18D83A00AE4FEB435983CB381A6544EBB582CDEB0C12F041CABBE2930B064D11846BAE9BE2940792C330D62AA4885961FA7A94FF180C26A5B7E8CFAC61BCB6F3C3E76AC7FF3D2A5D76D0016D0EB3EC85614AAC8195534CEE2615B06F8922492D1508154FCD5D780EA6730247AB695E47BDD492EBC1F6AA1EE481A38155FA76242A222532A0A5854870A0D3689BA7C790FB1E6D90B3DCFFEF0FE8D4F9EC6CC281724853FCF93BBA2625315F95BF0F253D22C90491DA60AEBDFBE01A1BA951912837CDB4AE2C72CB3DE07D5A8FE3271E75B29EB541BD9BFA172FFF997FED0D9EB3C9E224714E4FE4405DA9F40E5DFFBEF2FFC3829E9513519FA351AAA4A15680F48F412BDF651E733139647650E8DB68BFDDEF2030909090E8EF10456DFACD0E97264ACB707473569CD873! 3C45C81EA1D66EF1F9F1CEBFFDF8FA1A47AD1C74A9BF951ACB4490A359F60B3972C295 0DBEA7EB2A00254BD44B24EAF48EAB61B2A3282EE717CC7DA8B11E75B146AB96790EF94ACD0318ADBF460DF1FB5501F9597C69188366E63BEE4DF0D0BB6F4BF5F3ADFBBDE3EA07041653BA1AAD94A352FDD814A157F5A40D5CD6EF6A0A37A78EC9238A1BE6547455A9D9295356634714F0330122BA2766472243A35F3FB66D25FBA3FF93B425DDFD36FF0E318FB535DCA92251BE5F225B666CA3E4AD34AF47CCD8F931D8BDF8D8C364926759052CB0FA458ABF3DBB2B2F2A7390D30FAA1424DD59159265568D8C4275414F2587AA3F70FBD50E8F747653B76280A70E7A746DB82FD50F5395A81E8D16E3AAA0742E57058B4F547A448A931699E4141BE255953A63B652C57542364AA0E4388F0808AFD7DB3FDF77DF5BC0F0DD5D14DD348312ADEBE947F400E2828543ED47EEB24FA03CF7DDCED4CEAB14B46B75458FF90CD58A93195E541C8AFF2E397297F1A1CD5A46E88CA0C16E7BCA952FE61290E2DD7E1C7AB1721AA5EB82F2A9B6275460569E0F3D3D393BAE9B60A1FE3644EEB8F4849D48CBABAF96DBE2525F9D3C1026E0E865AA85915B6BD7D8FFE4D35D1EB6FFB9DBB5FEDF4B960754CA7075A7F357D3C4992EAC81695AFD737E8214A2775BB062B899352914B6D47A43119954128B296788F519C78E4A7818B40E32385FC948E1D66A156A37EE1A5276D79F3FA0FBDBF! B15A8959F6413AE553D4184D5DE0984E3B2A3F11B5C58EAAE9755AFE6CDEC72EB63A79B69044F5F373B8542648466E651D1800425DA01CCC008C46AB24AA63BB58A6DB788838FF03558D788CEDEC5D0F4A25683AA58D7CD56A1AA8F38822DD860A05A06A5CB7073DB0762728A40ED210EC523131409A96919BEB191441A26A8C838E2CD4C223E5C110AAB6FE8EF8F4FC63FE285A5D1FFB52AF0FEAF409D7DD693AEA00D31434EDB5CDD1F407340BBB693E854C552FE5F4737E121569151940FE34BE69305493AAA5232D44C8D7B03F7B01FAD4C75E05D6B1FFE5034A454309D7996FB87D8E36E034C53E4995481AF4EB44B3FB3CE8163079E5658E1D35C4867A26332D2D23C3A6D5FC31B470E58A2A3703AA4CB0914D587FFFE7CE4FCF836B8DEDEDF4C1A8CB07402537FC074525C713EB7264FA063E0A01B46A25E1F217AEA83148AB69C800EA00D517A1D24A1617D442D1F1F2186855FEF40EA0F6BED489A280FFED4E88AA3D4C07AAD28EEA389BD07F9AE218FA026A4E8344B7D042AF6D77151F17F7473D93798B440D3A0916101A7F7770544154798C5826DAF8CE0BD6DF5B7B3B5F5A8A9CAA132AEBF54C82795F54B90BAA6DE893232B9649F4E9FE1647A44A98B9E78858DC0F35ED565A5A6E0642C52120F40E315804202451E5C162AE46B58FE85DFFFB3F747602AAFF7F! 5D5C7FA1A767CD9A81B627703A752695EB6C731FDB7C4A0F3D7FB1AC41F7BC9DD592F4 DCE77B8FB4D34971F08FB995762B2FB7AB0E0C00E500EF45D389412A2BA3461A66F0934A043CA50FDEA000AD7637775EB46FF75628D1076DBFDF354ED9767C1D864ACD7C4124FAD949166C00CDE366E748DBE9A465C16586B22AC38E8C6BE55D010101757511BE274F8256A7CF2E1C18D5A46B3718F0A4AAE2E21F51ED0FC9D563E9DFF17C9AD9D37FB7AFDF26FA12397D6BD23EF0C7A442D96A9DEE63F7C97DCDE366EA73F66C309BC56206AD9ECACC0C36245EC9CCCBEB3A551710D116B1DBBBC43B7ECC6C621054ED061A2AA8F5CF807A7D161D55790FD425B4982AE0F7475D9103BDA062365756BC67438AF96B3F3F86D856F993A83BF20E6F7FEBBDB08E989D01735F8B383D2CD44E94B01EB3A1BA287580FDFE7EA48EF5170A65C50DAB5F6F6890154B41A35FBF2536D3332A8A53E5897967A29E1A3F6AFCAFE53BE764854E98E0ED3D26793054BDD9100CA822848AFCFEEFFE605A4F5EA412AAE350C2885085B29C9CE215ABA47BDB916C3033C4CEA8699BD3366FDAD507E63CD93DF254D1DC880910589395F740E560D40B3844F9A0EA6AAC1DD599B4DF263A6D179DEFB2FE78E603A02BD6AEDD7315946A361F3773C47452404DDC7E6494858A6541D15959A0D6C151738E3BA1FAFC752C9AF10D865A30F07EBFC8D9A71CA82B5614AF5DB96AAD740F47CCE16CE0EC712! 8350685D4B4C4F66726E36102945DBFD4B59106A01E18B530078A95BD08957D01321441A0497FF7F53FFAF4B876A834D47B28D59954283DF6E5DA632D6BA5D216F39E3D624694935233D2D262362590C9ECBA47F7A8405F52ABAA9B03A34AA290ADF2452AE505E8FB5F207A6FA05FFB848F750D41ACA9703A3F45D57E05BC7E47135C94EA20FD0284C3C1CD3FADA2A20C1564B3D99DAA13BBBBDD2B8310EAA2C10CA03007A1CA6CA86F10D6C7E02F08C66A5DC37CC5D1A050658AEB26BAA69F52157452A1948351A986DA964EC9E507D0BCB49876777B89981014814280D7E8C1508BE9A804A0BE84FC6AE92CA8AB9EBD2FAAEEDE4A15DAE7A8B6D41F624FA819081582EA28AA96E9B68CAA8B980BB6EA957C5F5436B3A7877881B0F622BFF278D24A9AAA0D55ED5CA6D04614FD2CD5BE91669B4FB58BDB6D650A454AA2E6E5E55DD97EB58F6275CFDF3D670ED26A327B6054AB332A41BCD0F924EE587C888304731FFB5EA8BAFBA2E22FF6593AB0DA490115486B026EED49C0152D0A00738AE66254E5105081F48D177A1F5B8A2CE007E6B344B8D3094ADA569A9C36A2100D98FD49A50A855C210DD59651915233F230EAE1E360ACDD7D7DEEBF7846CF29CA220DC03860C7EA8ABADCFAC7BFE316FB45029DA01C16AAA41FAAD449A9B4E5B7A176EDFCD502A4BFA6469FFA6E5ED! 6DCD0FBDBAAD06E00CBAD3EC858BB3DFC6711FB680995DCF453F5DBEFA7D5540E5099C 3525903E8142BB52B2F1750E7678EEA8630B5FDD45FB2E71415CDDD8F51072D57A20C55212C8940C546136B1F6BCF85F54FE250F7E41B4CF63636B9874EDF4477EA509D399D35CAA119A9CDFD81B3AC0CBAA92B353575B9359E79354750A7386AFE3771A5D5BBDBDE4661D54B3118AA2EA5BE2A84211368D44AC2A7F3C21A6239F104CECACD2FA00DFF7BEFF7F727E5923BBE529683943EA3B0A1E676D5D4E482DCFA05FE2CCBAFDF2D2EADAEDE7D12A17A7BCD660ED605A4D45756892502CD87A0559F0BB3A0F59B454ED99E243EDBB6ED3EFBFDFD952AECB78BE692A71069DACE1D79E55D753535FF70873FA8AFE3BBC571D5D573E6BE0DA4F15EE983740146D52A84CAC55A257AAC6B7AD6302F8C2527F7DF13BFDB76BFFD7EBA47C964F45314F4E577CC28C8663AAD3CA63CA36BFED1C3C761FDBB471DFE76F1E2EA2D805AE20D5A5D621A0455DD10E659259609742A650F3AF6BB1CBCEB89A598F5C5EFF1D9847BECF76BFB8529E140A84E839F331919187547D7FC53B7C65BBA3D263F15306F0BC81C94AB42E3A729076B039592B044D02A5FAB41A86B7A7E032DB5F55FB8DCB9FE38B1EDDEFBFD5A814B392D1C54A9F6E47F2B63275454319E3BF3F2765C434E9570E5DBB82D5B22B26DA817066BAE99024065C80095D9A354327F83C67ED61F96E220D0FCECB67BEFF76B! F9F753AA1329CEFEB73240D276D65C39BCE34C02DACFFCE55476292895445D94BF60B091C5BB26795462A59F50A2D754002AF12C5171F0E0724AAD1E370EDE7BBF5F3B408FD28FD451A66C870F841A9391D8752A60FEE6A7D0AE967B5D51766911851ABA68CC8241675646E5F144831B4B26D129994A2535A5B8F803B6D6EE66E521257B2B5BD56FBF5FE0DA4C0D86EA670B539BCAB0209F02D49A80E897CF5C45EE6FF9E5D4DCA2D2D2B8EC39A456BDB8E7061DB05B8F85190C52A14417CE24AFD18019ACB1BE4ACE449E561E52B3DF51FDA9FF7EBFE3A40FDF394B0D4C4A43455AED7AB9EB70C778F427B8474617815AE3905227784F58345D31E8D0F291C215516106B1542628A86023ADA21685C99CE58F4BB3EB8F33F7A9D9E86882EB7EFF1050D1869FDDF9112612849A917BF4D4D133BFF6A1DAEF97AE39A5A573E200B50D85AAF805A2C150DF859E1550191C9980C7B6A32A0F128F918DE4D227986C363AF0E1B2DF6F23D5BBD653B4FD7EA7804AA1A691A8353B3B9E72C74A4D3C95F597D2ECB8ECEC3925DE60AB5E33D5C641518D9A63D7CA21B5F2D1D95A1BEA67C4F7FF229B9EE66789F7B7F6DFEFA750F5FA7EEE6F476DA7B44A7A14897A2B0F0F5373CB83CD09B84C1DD5B53FBBB4B4318EF47FEF45D3934F18073DBB6254AF0A4B0CF6E3F245BCF00A8C0A617F! DFC183B3A8ED16FFF795CA77FAA1F29D510720E5D09C1F82D47B58A757F26EA5E5E6D6 E56E372775A3D32F7DA9A7E635966683905175D1F425B7073F666324D685251A5C50C15CDFB871DD8237FCFD9F2D50F5DBEF1F022AA9555B3C2D3B83945A73250F4A9580DC1990A6D07992512F37663716656FF9761EA9D5F83BCCC17603FF4A0E83AF5586B014E8CC32690088F533E6F21BD4B983E647953CD7F57718C000962A75DA9DA6AA54A4D4BC2B355772EBEAEA70958AAABF2B718D8D73B2E31AE7D9A2EAE87337EF81FA88F58B6B95552C2E57AF2A40EA64E20B54E115AF54DCB0ED373C7E88ADFA001DF1D46A6DA7A7052EC31419AD45B5E77EDCABFA859405076F37844134ED4283F4A35DD77EE9C6EDB47B4744517563E3E2B8B83973779F0C0D9DB0689ADC742FAD3E6292D47B5631582C894E85EF50E2CB5EE1F0F1AC6D77F0FAC2E7D550F78B04DAFFA150F92E3D0AAA53B9745452A5246A704C624CB0A132F768DDCEBA9D5DF337FF6AC12EDB9778AAA8A8A871F162E45427013574D102A773AC4EA8EF6283D531122BDD185C894883D50AA8AF6054E513B65DF2EB8F2B79CF69340211757A9A3FE0DCC7D19F501E45C6AAE098AA8CEDDBD1156C58FBA0EDEDA3F0EF0A3D6A576351512990C66517CD3D791A50A727171AEF7D2044299BD80A6A55E06B75CA0A506AB8F295F0F043CA7D8FDBCED3343FAE66FFE947DB496FFD40633F29CDF9DBC5E8580238D46! 6726FA232A3B2127554B9A906BF51D73D4897EACA8E2B2A8D03C9CE7E0D525556E8A2694B4CF73B66239AEA09D6AAC0D7D5C84329EC2505EC258794C48BD7A9CD9CEB4FEF63BFF3276CAEF8983712011D554AEBFB40A9B48309C05AEE990B71DFB3BCEAADA9EEDDE4886A54EE965288FD24EAEEB9732740A4BACBBCFFE125565379157A8542CE2359C3D95BD5EC021E7BDB672F4EB66DE6FBBFBF4DFD4F0A55824ECFF2D3F9039372C4B6FD8990CD642FBD236367578D674670D4332429E834F5BB6C52A738A962FF9FA6B87DF37E47C2CE290C89E5E81ABD6809C91ACE2E50ABE1F37925662565E98BDB3692A8F8902779D54BD67FF9D1C1349BF891B3B40CE8FBF2B66F9E3ADEE281775C2CEE8721F6CF2BA248E7B4B54DC85AE4759777FFD36B461123D153CCE24A04F8B62AB47D6CF5C68D3CD556F53B6AE5E38EF35FFE7F83D0AAC517FD30EC8001152B959A5231C4D854336EEDDC79F8BDF667126C5B83EE5DA7B2B38BFED248A1CE2D393D21347EFAA3177FBA2FEA4D421616E6C60213A02E7FA3B60F55D4D0556DDDBAD07EB0C76372D2F36ACDEC035ABD449693236B28465712D0F509A74405A0B0F666B319E22AA3AA2A66C78E1DB7B6771CF962BC6D77D8D2D711BDB8148AD438ECFEB8A89A10EAE5E254839CB4348952A0BC02B5F2D12DE0021B2A16F5D68563BB6! DBBBA16FF8FDF57A974073ED7E75C5EBDA2780516A1935ED1618F4D9B4220526DDA54E F161C53595E6ED8F4F5D55F132C944E2DEE8947B7141551A8403AE7644949FE22AFE4577EBA3984F3AB4C4954981B34030A60E5915D3FC2E4A9E41FA8C064C7D1CE2D2E4D58A8D668D75DCEC9293E06BA85FF38400115A914BCA92CB32C78F3E6ED19B9199BDBF7AEBA9AD0673B6CD4DDF7CBCE80C510FBC150BF2151E79684FAC67B2D4877BD1E32F0B170936EE5D47A37066245AE85DB7E40DD28177DF08146B595FDB8EDFC05F6AF8485CF6974EB5E7FFDF5D50D4880942BC5AF8490C3A9CD219BB16C3264A4C56CDE9BF24C529F635BD87DEACE79DF940269751CD22AAEA930EA6C6248A782A1BE6AA80FABAA02D7C2B79679142ACAA650546DE46D7C22C1E2413B0EDAFCF18F1FE9F49FA391FAEA06590E6D8E4A4EFCCAA2A2369919511D6FED59F98CFB64C7B94CCBA8A853D18DB0F8800A76BA05934E28F106A5F6BF863DD8617B514A13AE0470C42251FF864FFBA291BFE639D52B9FF4398EA2200FF31FF79CE64D11A4AF75DCD5A05564A5B6911F8AFFE23D6B8552E1CC517D16C7AFB2B83F95990A9AC42E1517575ABA259B5653DF1C22AAB182D5E4099500A0A653A8BCBF913D152AFB342AF99227F02E343964463F2CCDFEE316FE28D069F539E85C2AA7BDBD9D3AEC09159554C89D397E57DF640BED4C605F42C7D1E8EFD0781207A9D2A2EA2DA8510D0D05D4690A! D3D02F8648A6267A5621567425186BF543D50768F9E53A0D3A412357172C6CB67878381D9EB2F425248D7B7436BEA92E5C4B4D2C64B28699E313DC275BBA699CDD1E7DBFFEE3E5EFBE9907E9F43BF0288C5A847CCA1B0A15AFBB153787AA55C8AE978FA456B62E63488B256FE2774A541F6EA56A69F22AA248B4759B937BD9B69C2C93FDFD1392767D3C7EDCC7E3762525F9BB374FB6D0BF8D3C6435EADAAD97179399F41BFC01CE3F6F7F1B74D4D0FDDFAD18CE25A6C28F8E5F4B6CAD65985735E8D1F31A1A95FA6F24AAFD82E79B1B55EF274D763A9166B3876EDAF96B5B58A27D575F4264C7A9E86FE34A31E8B7DFD882FFDC9212DC52259FBF399CFB56CAD7AF4E0AAA724B61ADC8811A4B839EA2A06B15E5FC033A8DEAC78F9B9DF4752F21FF2296C9A39E0AFE47CDCB5B1A17DB504170F047738AD078AFD1E9A6615DB82BFCE78A899E9EF528C1CAA01AE09177289CBA29EDA5D5AB3FD2FD38CE7DB26520B0817EDE3DD97D7C7D484C5740F4962D8D5B16236DE2E5C7B39F93132640F107D17FCDCD61A11AAD1A46FDA449F50CD64A21BAC62CD7E944F67713C80665B55EABBFA4D7EA3E9ABD30C9DF39780D483EB92F61FC5351C13BEA8EBE1CDD185D3D07A12EC63E1557BA65FFFEB6D3135045B52079E0E783EE7539D4AA654C9C545FC55886328168097ABAC63E4FC3! A850553534404A6DC8D1EBB43F8EDBD5D76719D00E502C85E0307E668ADFD765693501 01D18D8D1173AAA31793A8A89C2A02D292B74FA38A7A36F3E6F0AFDC5A0529133D5B6B97A14C802EC98B68CF51E02B7E02AD645D31AA52D616E7E45C7AF37F9E5B382EC1BDCF6271BA8161B1F4B98FFAF5AAF9EB4DDB77EC4CCBCB3BD5151111702A7A4B3519A470DD9FFDDA7EBCFDEF1D3F6D80EB4B43B9C8CCE44E9D14DB8A330148BAB356C96A5A9253BCEACB55202B5614E75CBA7CE9D281D9AB1F1D377E57524242425252D2AE5DE366CE5C756CC386E0CC5B69878F8246038E469C8A8EA86EACDEDD8851172FAECE2E7AEDB5B9E49062FA82F4774774E7FA26A19878D613B1E2B7B504A27411FE24515D36A685C2155FAEFA72C59797E1F3F20AD9E575AF7F79ECABAFBEFCEA8BAFCCE64D86AACCAAF25B57AED45C01D8E8882D5BB62CAE2649B75457BFF6DA9CB9AFFD7642E8E9455EA3E5E7467AE9BE8035313608589162F9E9F88227A555DA7CC23EF6E170BEE0D0C614EF6141CD5F157ED0EC56DE953C8C6AB351845A1D510D6D1FEE51A19F1A30A20EEDD98DDBF2959352A11A80EA15BDB5C417902768495474C7CF7679166DFCD04769A84C316FB29D4BCDC05D7F571AD66A7434E54CDF9496562352B4FA592469C503BC10522858762D28A8B2CA6D192A5F25E8CE9CC0F9EA240857662F52ED4728ECBB1308B5B2120DA772F36A6C4AC52A2D2D6DACAEDE1D81953! A370BDAA99482DB37478E7A93A9989A3A29A8B516B10A65946629535DE7B83B0D0AB5F77EF6A16FB05B885B485515B9FC9575E8B41FA9D4C5B662AA7AF7EEDD27116A567CFCF499A2113FBB811F0633A9210C04C67AD6BA315A56715743630036ABA050D7AD73907238B6D6DF861A5C85AD34A40A0F547273EB024E1D8D8E8EFE962A53E2A0F8DFBDFBB7BFFD2D4A52F15E91CFA4171A1F0015BD0A58C15D163B05C52CC64A564B03F9C61E46BD74E9D2E5CBC532C7C01F38F7D2B6FCF0F1296AC31F16BF068C20C066A7C8A18A204861D2ACD04563EEDCE5163EF8C33B4AC9B249939A5AEBDD520056C85550A439924BE45304F6A68FBE3F05B818358624A550A3031A4BFF42AE7E7575F61C207DFBEDB7A198F29A962C62FEF4E0CF19190BE5C91353DB82EA97A1A8C5422F150269710E5E7B8C483B432166D8372882494C24680FBDAEE6E8D1E8C5A0D6461034469F370FA5A8B7BD4F43D7AFB8EFBB81437C24AA50B47262EA7CCFDADA5AE45CC08AA613329A99726CDECF4143143F3B6AA61D14A3824F21CE4628F8A1E8DBDF968548BD17C5DF492E78488F44A13BF8AC89918181ADAD6E5011AC6A20071332050EFFF695670DB0897E2B8D3C928E04152A688E829AE93920BB21F0A3419AD70285AAF0A1BD12662244C9137FCE0F84A01595D2D202391F2D790399AAA4F65! B73039CF3BF959647911E4581EA5B0C5A04A914652844EAE5355AC11CC2137C4345359 A4EF01477CE9E4D8DADF49CE8C64861B500D4AA55A8C973A855ECBCE3439E9F855A2AB70640036A0290A19275D46B18D4DB1B55D2D3466B86F456E0305EB433128A657722A704050595A358C0309BCDA05D21582B8B0AAA78EC43230D8ED991792B039306D405603B8DC3BB52A0D2096F232B8596EFA995835728237E27D0D823624D4D9DD2B63B088A58B77A831BB0B6403CA0C23F57BA971C4F23D4EDC1F6235428F423D080886A88A4E04CFBDBDADA26204E6FC85077930B86F8FEE2B05E5F3416AAB85323A7F80605C6B6B6D6D6BBB99951ECA22629A055A7AB3358A924298AFC50F94557431EDD8F494B266052AF6977D395437D8975786F5A1A0B0901EBCECF67037D03CFC6B656CDA8A71E0506BE0DE20DF42A2538B88CD429891A5117111D1101E9BE0DFBD28409A731E9DD64F98921BF193BDC474D8D850502EE8C9FCF9E0D0C8A8D8D6D6D025A904DA4F8F931EC5B93E4A9340A3428222202D40984BF7D1BA551EFFCF8F8313FDF495E123E8C375847F054AC8948E7DEFD79CCD97CDFA0A0D8C0D8D87A30857A039210A0260B29AA9ACAADACF304370CDA1FB1BF6DFFDCB9E8A0375AF9D0F8455ED31770353DB787F376F4881EE035F5A48F5E30E6AC2F4850906713487D7D3DFAEA568B9E87AEA58ABECA204F0C1A848CB30D8AE7B92429ACFCF405C94BD6986E0EEB! 4F1D012A1A7C99948A94896723A74C99E21B084ED6143BA3A9B515CCA1094B6BAB67ABA727E284FFF364D0C9365FF02310D02A9A9D7A81DBA7FBDC1EAE8246FA02B389D0485853EF449E9D9235657F6020D8019619E47F3C01117D0682DE03DBD075A41274140502FEA2F8E977C09946F2C8F9033C176F62A673199013B2E6B6B5F90622390B9481A4A406228DFB96A00F2490404371F33C2D39BDC20426FAEEBBFF3E54FC2EA388CB98181939E5EC94FCFCD3F9A70116A218522510624892131D43098D8F8FC72B5F31D257E31FF0B97853A1559D9E7C17426D7EBE777E49BE6F7E49C9695FEF7CEF126FF8249D088750707908F7AF3CC87BF10FE1117E9355FD918CB5ECCECF6320DC8EC91F939F0FCCDEF0351FAB1294E935E6CE32165FAE3CF7D3833CC3FF30FEBD00A3D174EE62F82BE9E977172C98366DFAF4E963904090F79A3E7DDAB405A3472BD2D544E103FFEB060F03D5BE31C756C9450A8542865E0246CFC44BF8682F8938E14849C6FF4F508DF85F3A28F4F139015278EEDCB91327CEB9E8F28151FF73FEC590FF18F95F0106009BB82CA79ADF6F600000000049454E44AE426082'); Deleted: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,19 +0,0 @@ -package org.jboss.seam.example.seamspace; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.security.Identity; -import org.jboss.seam.security.RuleBasedIdentity; -import org.jboss.seam.security.management.JpaIdentityStore; - -@Name("authenticationEvents") -public class AuthenticationEvents -{ - @Observer(JpaIdentityStore.EVENT_ACCOUNT_AUTHENTICATED) - public void loginSuccessful(MemberAccount account) - { - Contexts.getSessionContext().set("authenticatedMember", account.getMember()); - ((RuleBasedIdentity) Identity.instance()).getSecurityContext().insert(account.getMember()); - } -} Added: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java (rev 0) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -0,0 +1,70 @@ +package org.jboss.seam.example.seamspace; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.security.Identity; + +/** + * Authenticator bean - authenticates the user against the database + * + * @author Shane Bryzak + */ +@Name("authenticator") +public class Authenticator +{ + @In + private EntityManager entityManager; + + @In + private Identity identity; + + public boolean authenticate() + { + try + { + Member member = (Member) entityManager.createQuery( + "from Member where username = :username") + .setParameter("username", identity.getUsername()) + .getSingleResult(); + + if ( !compareHash( member.getHashedPassword(), identity.getPassword() ) ) + { + return false; + } + + Contexts.getSessionContext().set("authenticatedMember", member); + + for ( MemberRole mr : member.getRoles() ) + { + identity.addRole(mr.getName()); + } + + return true; + } + catch (NoResultException ex) + { + return false; + } + } + + private boolean compareHash(String hash, String password) + { + if (hash == null || password == null) + { + return false; + } + + String newHash = Hash.instance().hash(password); + if (newHash == null) + { + return false; + } + + return hash.equalsIgnoreCase(newHash); + } + +} Modified: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -11,6 +11,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; @@ -56,6 +58,9 @@ }; private Integer memberId; + private String username; + + private String hashedPassword; private String memberName; private String firstName; private String lastName; @@ -68,6 +73,7 @@ private String location; private Date memberSince; + private Set<MemberRole> roles; private Set<MemberImage> images; private Set<MemberFriend> friends; @@ -81,6 +87,29 @@ { this.memberId = memberId; } + + @NotNull + @Length(min = 4, max = 20) + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + @NotNull + public String getHashedPassword() + { + return hashedPassword; + } + + public void setHashedPassword(String hashedPassword) + { + this.hashedPassword = hashedPassword; + } @NotNull @Length(min = 3, max = 40) @@ -133,6 +162,18 @@ this.email = email; } + @ManyToMany + @JoinTable(name = "MemberRoles", joinColumns = @JoinColumn(name = "MEMBER_ID"), inverseJoinColumns = @JoinColumn(name = "ROLE_ID")) + public Set<MemberRole> getRoles() + { + return roles; + } + + public void setRoles(Set<MemberRole> roles) + { + this.roles = roles; + } + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "PICTURE_ID") public MemberImage getPicture() @@ -238,4 +279,4 @@ int age = ny - by + (nm > bm || (nm == bm && nd >= bd) ? 0 : -1); return String.format("%d years old", age); } -} +} \ No newline at end of file Deleted: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,122 +0,0 @@ -package org.jboss.seam.example.seamspace; - -import java.io.Serializable; -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.validator.NotNull; -import org.jboss.seam.security.management.UserAccount; - -@Entity -@Table(uniqueConstraints = @UniqueConstraint(columnNames = "username")) -public class MemberAccount extends UserAccount implements Serializable -{ - private static final long serialVersionUID = 6368734442192368866L; - - private Integer accountId; - private String username; - private String passwordHash; - private boolean enabled; - private AccountType accountType; - private Set<UserAccount> memberships; - private Member member; - - @Id @GeneratedValue - public Integer getAccountId() - { - return accountId; - } - - public void setAccountId(Integer accountId) - { - this.accountId = accountId; - } - - @NotNull - @Override - public String getUsername() - { - return username; - } - - @Override - public void setUsername(String username) - { - this.username = username; - } - - @Override - public String getPasswordHash() - { - return passwordHash; - } - - @Override - public void setPasswordHash(String passwordHash) - { - this.passwordHash = passwordHash; - } - - @Override - public AccountType getAccountType() - { - return accountType; - } - - @Override - public void setAccountType(AccountType accountType) - { - this.accountType = accountType; - } - - @Override - public boolean isEnabled() - { - return enabled; - } - - - @Override - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } - - @ManyToMany(targetEntity = MemberAccount.class) - @JoinTable(name = "AccountMembership", - joinColumns = @JoinColumn(name = "AccountId"), - inverseJoinColumns = @JoinColumn(name = "MemberOf") - ) - @Override - public Set<UserAccount> getMemberships() - { - return memberships; - } - - @Override - public void setMemberships(Set<UserAccount> memberships) - { - this.memberships = memberships; - } - - @OneToOne - @JoinColumn(name = "MEMBER_ID") - public Member getMember() - { - return member; - } - - public void setMember(Member member) - { - this.member = member; - } -} Added: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java (rev 0) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -0,0 +1,44 @@ +package org.jboss.seam.example.seamspace; + +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.Id; + +import org.jboss.seam.annotations.Name; + +/** + * Represents a security role. + * + * @author Shane Bryzak + */ +@Entity +@Name("memberRole") +public class MemberRole implements Serializable +{ + private static final long serialVersionUID = 9177366120789064801L; + + private Integer roleId; + + private String name; + + @Id + public Integer getRoleId() + { + return roleId; + } + + public void setRoleId(Integer roleId) + { + this.roleId = roleId; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } +} Modified: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -3,8 +3,10 @@ import static org.jboss.seam.ScopeType.CONVERSATION; import java.util.Date; +import java.util.HashSet; import javax.ejb.Remove; +import javax.ejb.Stateful; import javax.persistence.EntityManager; import org.jboss.seam.annotations.Begin; @@ -13,14 +15,10 @@ import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.security.Identity; -import org.jboss.seam.security.RunAsOperation; -import org.jboss.seam.security.management.IdentityManager; -import org.jboss.seam.security.management.JpaIdentityStore; @Scope(CONVERSATION) @Name("register") @@ -34,19 +32,12 @@ @In private Identity identity; - - @In - private IdentityManager identityManager; - - private MemberAccount newAccount; - - private String username; - + /** * Password confirmation */ private String password; - private String confirm; + private String confirm; private String gender; @@ -70,53 +61,27 @@ if (!verified) { FacesMessages.instance().addToControl("confirmPassword", "Passwords do not match"); - } - } - - @Observer(JpaIdentityStore.EVENT_ACCOUNT_CREATED) - public void accountCreated(MemberAccount account) - { - // The user *may* have been created from the user manager screen. In that - // case, create a dummy Member record just for the purpose of demonstrating the - // identity management API - if (newMember == null) - { - newMember = new Member(); - newMember.setMemberName(account.getUsername()); - newMember.setGender(Member.Gender.male); - newMember.setFirstName("John"); - newMember.setLastName("Doe"); - newMember.setEmail(account.getUsername() + "@nowhere.com"); - newMember.setDob(new Date()); - newMember.setMemberSince(new Date()); - entityManager.persist(newMember); } - - account.setMember(newMember); - this.newAccount = account; + + newMember.setHashedPassword(Hash.instance().hash(password)); + } @End public void uploadPicture() - { - newMember.setMemberSince(new Date()); - entityManager.persist(newMember); + { + newMember.setMemberSince(new Date()); + newMember.setRoles(new HashSet<MemberRole>()); - new RunAsOperation() { - @Override - public String[] getRoles() { - return new String[] { "admin" }; - } - - public void execute() { - identityManager.createAccount(username, password); - identityManager.grantRole(username, "user"); - } - }.run(); - - newAccount.setMember(newMember); - newAccount = entityManager.merge(newAccount); + MemberRole userRole = (MemberRole) entityManager.createQuery( + "from MemberRole where name = 'user'") + .getSingleResult(); + + newMember.getRoles().add(userRole); + + entityManager.persist(newMember); + if (picture != null && picture.length > 0) { MemberImage img = new MemberImage(); @@ -130,21 +95,11 @@ } // Login the user - identity.setUsername(username); + identity.setUsername(newMember.getUsername()); identity.setPassword(password); identity.login(); } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - + public String getPassword() { return password; @@ -202,4 +157,4 @@ @Destroy @Remove public void destroy() {} -} +} \ No newline at end of file Deleted: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserAction.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserAction.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserAction.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,172 +0,0 @@ -package org.jboss.seam.example.seamspace; - -import static org.jboss.seam.ScopeType.CONVERSATION; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.security.management.IdentityManager; - -@Name("userAction") -@Scope(CONVERSATION) -public class UserAction -{ - private String username; - private String password; - private String confirm; - private List<String> roles; - private boolean enabled; - - @In IdentityManager identityManager; - - @Begin - public void createUser() - { - roles = new ArrayList<String>(); - } - - @Begin - public void editUser(String username) - { - this.username = username; - roles = identityManager.getGrantedRoles(username); - enabled = identityManager.isEnabled(username); - } - - public String save() - { - if (identityManager.accountExists(username)) - { - return saveExistingUser(); - } - else - { - return saveNewUser(); - } - } - - private String saveNewUser() - { - if (!password.equals(confirm)) - { - FacesMessages.instance().addToControl("password", "Passwords do not match"); - return "failure"; - } - - boolean success = identityManager.createAccount(username, password); - - if (success) - { - for (String role : roles) - { - identityManager.grantRole(username, role); - } - - if (!enabled) - { - identityManager.disableAccount(username); - } - - Conversation.instance().end(); - } - - return "success"; - } - - private String saveExistingUser() - { - // Check if a new password has been entered - if (password != null && !"".equals(password)) - { - if (!password.equals(confirm)) - { - FacesMessages.instance().addToControl("password", "Passwords do not match"); - return "failure"; - } - else - { - identityManager.changePassword(username, password); - } - } - - List<String> grantedRoles = identityManager.getGrantedRoles(username); - - for (String role : grantedRoles) - { - if (!roles.contains(role)) identityManager.revokeRole(username, role); - } - - for (String role : roles) - { - if (!grantedRoles.contains(role)) identityManager.grantRole(username, role); - } - - if (enabled) - { - identityManager.enableAccount(username); - } - else - { - identityManager.disableAccount(username); - } - - Conversation.instance().end(); - return "success"; - } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getConfirm() - { - return confirm; - } - - public void setConfirm(String confirm) - { - this.confirm = confirm; - } - - public List<String> getRoles() - { - return roles; - } - - public void setRoles(List<String> roles) - { - this.roles = roles; - } - - public boolean isEnabled() - { - return enabled; - } - - public void setEnabled(boolean enabled) - { - this.enabled = enabled; - } -} Deleted: branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserSearch.java =================================================================== --- branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserSearch.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/examples/seamspace/src/org/jboss/seam/example/seamspace/UserSearch.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,51 +0,0 @@ -package org.jboss.seam.example.seamspace; - -import static org.jboss.seam.ScopeType.SESSION; - -import java.io.Serializable; -import java.util.List; - -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.datamodel.DataModel; -import org.jboss.seam.annotations.datamodel.DataModelSelection; -import org.jboss.seam.security.management.IdentityManager; - -@Name("userSearch") -@Scope(SESSION) -public class UserSearch implements Serializable -{ - private static final long serialVersionUID = 8592034786339372510L; - - @DataModel - List<String> users; - - @DataModelSelection - String selectedUser; - - @In IdentityManager identityManager; - - public void loadUsers() - { - users = identityManager.listUsers(); - } - - public String getUserRoles(String username) - { - List<String> roles = identityManager.getGrantedRoles(username); - StringBuilder sb = new StringBuilder(); - - for (String role : roles) - { - sb.append((sb.length() > 0 ? ", " : "") + role); - } - - return sb.toString(); - } - - public String getSelectedUser() - { - return selectedUser; - } -} \ No newline at end of file Deleted: branches/Seam_2_0/src/main/org/jboss/seam/identity-management-2.0.xsd =================================================================== --- branches/Seam_2_0/src/main/org/jboss/seam/identity-management-2.0.xsd 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/src/main/org/jboss/seam/identity-management-2.0.xsd 2008-04-04 02:08:22 UTC (rev 7814) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/security/management" xmlns:identity-management="http://jboss.com/products/seam/security/management" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.0.xsd"/> - - <xs:element name="jpa-identity-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.jpa-identity-store"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.jpa-identity-store"> - <xs:attribute name="account-class" /> - </xs:attributeGroup> - -</xs:schema> Modified: branches/Seam_2_0/src/main/org/jboss/seam/security/jaas/SeamLoginModule.java =================================================================== --- branches/Seam_2_0/src/main/org/jboss/seam/security/jaas/SeamLoginModule.java 2008-04-03 21:36:37 UTC (rev 7813) +++ branches/Seam_2_0/src/main/org/jboss/seam/security/jaas/SeamLoginModule.java 2008-04-04 02:08:22 UTC (rev 7814) @@ -115,40 +115,9 @@ } } - // Otherwise if identity management is enabled, use it. - IdentityManager identityManager = IdentityManager.instance(); - if (identityManager != null && identityManager.getIdentityStore() != null) - { - Identity identity = Identity.instance(); - - try - { - boolean success = identityManager.authenticate(username, identity.getPassword()); - - if (success) - { - for (String role : identityManager.getImpliedRoles(username)) - { - identity.addRole(role); - } - } - - return success; - } - catch (Exception ex) - { - log.error("Error invoking login method", ex); - LoginException le = new LoginException(ex.getMessage()); - le.initCause(ex); - throw le; - } - } - else - { - log.error("No authentication method defined - " + - "please define authenticate-method for <security:identity/> in components.xml"); - throw new LoginException("No authentication method defined"); - } + log.error("No authentication method defined - " + + "please define authenticate-method for <security:identity/> in components.xml"); + throw new LoginException("No authentication method defined"); }

17 years, 8 months

1
0
0 / 0

Seam SVN: r7813 - in branches/Seam_2_0/doc/Seam_Reference_Guide/en: images and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-04-03 17:36:37 -0400 (Thu, 03 Apr 2008) New Revision: 7813 Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Getting_Started_With_JBoss_Tools.xml branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_1.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_2.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_1.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_2.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_0.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_1.png branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/tools/ Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/master.xml Log: Start work on getting started with jboss tools guide Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Getting_Started_With_JBoss_Tools.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en/Getting_Started_With_JBoss_Tools.xml (rev 0) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/Getting_Started_With_JBoss_Tools.xml 2008-04-03 21:36:37 UTC (rev 7813) @@ -0,0 +1,499 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + +<chapter id="gettingstartedwithjbosstools"> + <title>Getting started with Seam, using JBoss Tools</title> + + <para> + JBoss Tools is a collection of Eclipse plugins. JBoss Tools a project + creation wizard for Seam, Content Assist for the Unified Expression + Language (EL) in both facelets and Java code, a graphical editor for jPDL, + a graphical editor for Seam configuration files, support for running Seam + integration tests from within Eclipse, and much more. + </para> + + <para> + In short, if you are an Eclipse user, then you'll want JBoss Tools! + </para> + + <para> + JBoss Tools, as with seam-gen, works best with JBoss AS, but it's possible + with a few tweaks to get your app running on other application servers. + The changes are much like those described for seam-gen later in this + reference manual. + </para> + + <section> + <title>Before you start</title> + + <para> + Make sure you have JDK 5, JBoss AS 4.2, Eclipse 3.3, the JBoss Tools + plugins (at least Seam Tools, the Visual Page Editor, jBPM Tools and + JBoss AS Tools) and the TestNG plugin for Eclipse correctly installed + before starting. + </para> + + <para>TODO - detail where the update sites are.</para> + + </section> + + <section> + <title>Setting up a new Eclipse project</title> + + <para>Start up Eclipse and select the Seam Perspective.</para> + + <para>Go to File -> New Seam Web Project.</para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_web_project_0.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_web_project_0.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + First, enter a name for your new project. For this tutorial, we're + going to use + <literal>helloworld</literal> + . + </para> + + + <para> + Now, we need to tell JBoss Tools about JBoss AS. This is a two stage + process, first we need to define a runtime, make sure you select JBoss + AS 4.2: + </para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_server_runtime_1.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_server_runtime_1.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + Enter a name for the runtime, and locate it on your hard drive: + </para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_server_runtime_2.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_server_runtime_2.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + Next, we need to define a server JBoss Tools can deploy the project to. + Make sure to again select JBoss AS 4.2, and also the runtime you just + defined: + </para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_server_1.png" align="center" + scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_server_1.png" align="center" /> + </imageobject> + </mediaobject> + + <para>On the next screen give the server a name, and hit finish:</para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_server_2.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_server_2.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + Make sure the runtime and server you just created are selected, select + <emphasis>Dynamic Web Project with Seam 2.0 (technology preview)</emphasis> + and hit next: + </para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_web_project_1.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_web_project_1.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + The next 3 screens allow you to further customize your new project, but + for us the defaults are fine. So just hit next until you reach the + final screen. + </para> + + <para> + The first step here is to tell JBoss Tools about the Seam download you + want to use. <emphasis>Add</emphasis> a new + <emphasis>Seam Runtime</emphasis> - make sure to give it a name, and + select <emphasis>2.0</emphasis> as the version: + </para> + + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/new_seam_runtime.png" + align="center" scalefit="1" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/new_seam_runtime.png" + align="center" /> + </imageobject> + </mediaobject> + + <para> + Next, select your database type. You'll need to tell JBoss Tools about + the database. + </para> + + <para> + JBoss has sophisticated support for hot re-deployment of WARs and EARs. + Unfortunately, due to bugs in the JVM, repeated redeployment of an + EAR—which is common during development—eventually causes the JVM to run + out of perm gen space. For this reason, we recommend running JBoss in a + JVM with a large perm gen space at development time. If you're running + JBoss from JBoss IDE, you can configure this in the server launch + configuration, under "VM arguments". We suggest the following values: + </para> + + <programlisting> + -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 + </programlisting> + + <para> + If you don't have so much memory available, the following is our + minimum recommendation: + </para> + + <programlisting> + -Xms256m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256 + </programlisting> + + <para> + If you're running JBoss from the command line, you can configure the + JVM options in + <literal>bin/run.conf</literal> + . + </para> + + <para> + If you don't want to bother with this stuff now, you don't have to—come + back to it later, when you get your first + <literal>OutOfMemoryException</literal> + . + </para> + + <para> + The most important choice you need to make is between EAR deployment + and WAR deployment of your project. EAR projects support EJB 3.0 and + require Java EE 5. WAR projects do not support EJB 3.0, but may be + deployed to a J2EE environment. The packaging of a WAR is also simpler + to understand. If you installed an EJB3-ready application server like + JBoss, choose + <literal>ear</literal> + . Otherwise, choose + <literal>war</literal> + . We'll assume that you've chosen an EAR deployment for the rest of the + tutorial, but you can follow exactly the same steps for a WAR + deployment. + </para> + + <para> + If you are working with an existing data model, make sure you tell + seam-gen that the tables already exist in the database. + </para> + + <para> + This copies the Seam jars, dependent jars and the JDBC driver jar to a + new Eclipse project, and generates all needed resources and + configuration files, a facelets template file and stylesheet, along + with Eclipse metadata and an Ant build script. The Eclipse project will + be automatically deployed to an exploded directory structure in JBoss + AS as soon as you add the project using + <literal> + New -> Project... -> General -> Project -> Next + </literal> + , typing the + <literal>Project name</literal> + ( + <literal>helloworld</literal> + in this case), and then clicking + <literal>Finish</literal> + . Do not select + <literal>Java Project</literal> + from the New Project wizard. + </para> + + <para> + Go to + <literal>http://localhost:8080/helloworld</literal> + to see a welcome page. This is a facelets page, + <literal>view/home.xhtml</literal> + , using the template + <literal>view/layout/template.xhtml</literal> + . You can edit this page, or the template, in eclipse, and see the + results + <emphasis>immediately</emphasis> + , by clicking refresh in your browser. + </para> + + <para> + Don't get scared by the XML configuration documents that were generated + into the project directory. They are mostly standard Java EE stuff, the + stuff you need to create once and then never look at again, and they + are 90% the same between all Seam projects. (They are so easy to write + that even seam-gen can do it.) + </para> + + <para> + The generated project includes three database and persistence + configurations. The + <literal>persistence-test.xml</literal> + and + <literal>import-test.sql</literal> + files are used when running the TestNG unit tests against HSQLDB. The + database schema and the test data in + <literal>import-test.sql</literal> + is always exported to the database before running tests. The + <literal>myproject-dev-ds.xml</literal> + , + <literal>persistence-dev.xml</literal> + and + <literal>import-dev.sql</literal> + files are for use when deploying the application to your development + database. The schema might be exported automatically at deployment, + depending upon whether you told seam-gen that you are working with an + existing database. The + <literal>myproject-prod-ds.xml</literal> + , + <literal>persistence-prod.xml</literal> + and + <literal>import-prod.sql</literal> + files are for use when deploying the application to your production + database. The schema is not exported automatically at deployment. + </para> + </section> + + <section> + <title>Creating a new action</title> + + <para> + If you're used to traditional action-style web frameworks, you're + probably wondering how you can create a simple web page with a + stateless action method in Java. If you type: + </para> + + <para> + Now go to + <literal>http://localhost:8080/helloworld/ping.seam</literal> + and click the button. You can see the code behind this action by + looking in the project + <literal>src</literal> + directory. Put a breakpoint in the + <literal>ping()</literal> + method, and click the button again. + </para> + + <para> + Finally, locate the + <literal>PingTest.xml</literal> + file in the test package and run the integration tests using the TestNG + plugin for Eclipse. Alternatively, run the tests using + <literal>seam test</literal> + or the + <literal>test</literal> + target of the generated build. + </para> + </section> + + <section> + <title>Creating a form with an action</title> + + <para>The next step is to create a form. Type:</para> + + + <para> + Restart the application again, and go to + <literal>http://localhost:8080/helloworld/hello.seam</literal> + . Then take a look at the generated code. Run the test. Try adding some + new fields to the form and Seam component (remember to restart the + deployment each time you change the Java code). + </para> + </section> + + <section> + <title>Generating an application from an existing database</title> + + <para> + Manually create some tables in your database. (If you need to switch to + a different database, just run + <literal>seam setup</literal> + again.) Now type: + </para> + + + <para> + Restart the deployment, and go to + <literal>http://localhost:8080/helloworld</literal> + . You can browse the database, edit existing objects, and create new + objects. If you look at the generated code, you'll probably be amazed + how simple it is! Seam was designed so that data access code is easy to + write by hand, even for people who don't want to cheat by using + seam-gen. + </para> + </section> + + <section> + <title>Generating an application from existing JPA/EJB3 entities</title> + + <para> + Place your existing, valid entity classes inside the + <literal>src/model</literal> + . Now type + </para> + + <para> + Restart the deployment, and go to + <literal>http://localhost:8080/helloworld</literal> + . + </para> + </section> + + <section> + <title>Seam and incremental hot deployment</title> + + <para> + When you deploy your Seam application as an exploded directory, you'll + get some support for incremental hot deployment at development time. + You need to enable debug mode in both Seam and Facelets, by adding this + line to + <literal>components.xml</literal> + : + </para> + + <programlisting role="XML"><![CDATA[<core:init debug="true">]]></programlisting> + + <para> + Now, the following files may be redeployed without requiring a full + restart of the web application: + </para> + + <itemizedlist> + <listitem> + <para>any facelets page</para> + </listitem> + + <listitem> + <para> + any + <literal>pages.xml</literal> + file + </para> + </listitem> + </itemizedlist> + + <para> + But if we want to change any Java code, we still need to do a full + restart of the application. (In JBoss this may be accomplished by + touching the top level deployment descriptor: + <literal>application.xml</literal> + for an EAR deployment, or + <literal>web.xml</literal> + for a WAR deployment.) + </para> + + <para> + But if you really want a fast edit/compile/test cycle, Seam supports + incremental redeployment of JavaBean components. To make use of this + functionality, you must deploy the JavaBean components into the + <literal>WEB-INF/dev</literal> + directory, so that they will be loaded by a special Seam classloader, + instead of by the WAR or EAR classloader. + </para> + + <para>You need to be aware of the following limitations:</para> + + <itemizedlist> + <listitem> + <para> + the components must be JavaBean components, they cannot be EJB3 + beans (we are working on fixing this limitation) + </para> + </listitem> + + <listitem> + <para>entities can never be hot-deloyed</para> + </listitem> + + <listitem> + <para> + components deployed via + <literal>components.xml</literal> + may not be hot-deployed + </para> + </listitem> + + <listitem> + <para> + the hot-deployable components will not be visible to any classes + deployed outside of + <literal>WEB-INF/dev</literal> + </para> + </listitem> + + <listitem> + <para> + Seam debug mode must be enabled and + <literal>jboss-seam-debug.jar</literal> + must be in + <literal>WEB-INF/lib</literal> + </para> + </listitem> + + <listitem> + <para>You must have the Seam filter installed in web.xml</para> + </listitem> + + <listitem> + <para> + You may see errors if the system is placed under any load and + debug is enabled. + </para> + </listitem> + + </itemizedlist> + + <para> + If you create a WAR project using seam-gen, incremental hot deployment + is available out of the box for classes in the + <literal>src/action</literal> + source directory. However, seam-gen does not support incremental hot + deployment for EAR projects. + </para> + </section> + +</chapter> Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Getting_Started_With_JBoss_Tools.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_1.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_2.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_1.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_2.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_server_runtime_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_0.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_0.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_1.png =================================================================== (Binary files differ) Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/en/images/new_web_project_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/master.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en/master.xml 2008-04-03 15:14:41 UTC (rev 7812) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/master.xml 2008-04-03 21:36:37 UTC (rev 7813) @@ -6,6 +6,7 @@ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href= "Gettingstarted.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href= "Getting_Started_With_JBoss_Tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href= "Concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href= "Xml.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href= "Events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

17 years, 8 months

1
0
0 / 0

Seam SVN: r7812 - tags.

by seam-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2008-04-03 11:14:41 -0400 (Thu, 03 Apr 2008) New Revision: 7812 Added: tags/JBoss_Seam_2_0_2_CR1/ Log: Updated tag for 2.0.2.CR1 Copied: tags/JBoss_Seam_2_0_2_CR1 (from rev 7811, branches/Seam_2_0)

17 years, 8 months

1
0
0 / 0

Seam SVN: r7811 - tags.

by seam-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2008-04-03 11:14:08 -0400 (Thu, 03 Apr 2008) New Revision: 7811 Removed: tags/JBoss_Seam_2_0_2_CR1/ Log: removing old tag prior to applying updated tag

17 years, 8 months

1
0
0 / 0

Seam SVN: r7810 - branches/Seam_2_0.

by seam-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2008-04-03 11:06:48 -0400 (Thu, 03 Apr 2008) New Revision: 7810 Modified: branches/Seam_2_0/release-process.txt Log: updated release process Modified: branches/Seam_2_0/release-process.txt =================================================================== --- branches/Seam_2_0/release-process.txt 2008-04-03 13:15:04 UTC (rev 7809) +++ branches/Seam_2_0/release-process.txt 2008-04-03 15:06:48 UTC (rev 7810) @@ -171,11 +171,18 @@ CONSTRAINT `owner` FOREIGN KEY (`ownerUsername`) REFERENCES `person` (`username`) ) ENGINE=InnoDB -* run "seam setup create-project generate-entities explode" - - test the app, at least the list and edit pages for Person -* run "seam new-action new-form restart" - - test both generated pages - - run the unit tests in eclipse using the TestNG plugin +* seam-gen EAR + - run "seam setup create-project generate-entities explode" + - test the app, at least the list and edit pages for Person + - run "seam new-action new-form restart" + - test both generated pages + - run the unit tests in eclipse using the TestNG plugin +* seam-gen WAR + - run "seam setup create-project generate-entities explode" + - test the app, at least the list and edit pages for Person + - run "seam new-action new-form restart" + - test both generated pages + - run the unit tests in eclipse using the TestNG plugin * Create a new war project in JBDS - Reverse engineer entities from MySQL - Test generated pages (check hot deployment of Seam components, html)

17 years, 8 months

1
0
0 / 0

Seam SVN: r7809 - in trunk/examples/seamspace: src/org/jboss/seam/example/seamspace and 1 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-04-03 09:15:04 -0400 (Thu, 03 Apr 2008) New Revision: 7809 Modified: trunk/examples/seamspace/resources/WEB-INF/components.xml trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml Log: fix build, tests Modified: trunk/examples/seamspace/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-04-03 11:41:20 UTC (rev 7808) +++ trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-04-03 13:15:04 UTC (rev 7809) @@ -28,20 +28,23 @@ <identity-management:jpa-identity-store account-class="org.jboss.seam.example.seamspace.MemberAccount"/> - <identity-management:identity-manager identity-store="#{jpaIdentityStore}"/> +  -  + enabled-attribute="enabled" + /> <security:jpa-permission-store name="accountPermissionStore" permission-class="org.jboss.seam.example.seamspace.Permission"/> Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2008-04-03 11:41:20 UTC (rev 7808) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2008-04-03 13:15:04 UTC (rev 7809) @@ -8,7 +8,7 @@ @Name("authenticationEvents") public class AuthenticationEvents { - @Observer(JpaIdentityStore.EVENT_ACCOUNT_AUTHENTICATED) + @Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED) public void loginSuccessful(MemberAccount account) { Contexts.getSessionContext().set("authenticatedMember", account.getMember()); Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java 2008-04-03 11:41:20 UTC (rev 7808) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberAccount.java 2008-04-03 13:15:04 UTC (rev 7809) @@ -14,11 +14,10 @@ import javax.persistence.UniqueConstraint; import org.hibernate.validator.NotNull; -import org.jboss.seam.security.management.UserAccount; @Entity @Table(uniqueConstraints = @UniqueConstraint(columnNames = "username")) -public class MemberAccount extends UserAccount implements Serializable +public class MemberAccount implements Serializable { private static final long serialVersionUID = 6368734442192368866L; @@ -26,8 +25,7 @@ private String username; private String passwordHash; private boolean enabled; - private AccountType accountType; - private Set<UserAccount> memberships; + private Set<MemberAccount> memberships; private Member member; @Id @GeneratedValue @@ -42,50 +40,33 @@ } @NotNull - @Override public String getUsername() { return username; } - @Override public void setUsername(String username) { this.username = username; } - @Override + public String getPasswordHash() { return passwordHash; } - @Override public void setPasswordHash(String passwordHash) { this.passwordHash = passwordHash; - } + } - @Override - public AccountType getAccountType() - { - return accountType; - } - - @Override - public void setAccountType(AccountType accountType) - { - this.accountType = accountType; - } - - @Override public boolean isEnabled() { return enabled; } - @Override public void setEnabled(boolean enabled) { this.enabled = enabled; @@ -96,14 +77,12 @@ joinColumns = @JoinColumn(name = "AccountId"), inverseJoinColumns = @JoinColumn(name = "MemberOf") ) - @Override - public Set<UserAccount> getMemberships() + public Set<MemberAccount> getMemberships() { return memberships; } - @Override - public void setMemberships(Set<UserAccount> memberships) + public void setMemberships(Set<MemberAccount> memberships) { this.memberships = memberships; } Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-04-03 11:41:20 UTC (rev 7808) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-04-03 13:15:04 UTC (rev 7809) @@ -74,7 +74,7 @@ } } - @Observer(JpaIdentityStore.EVENT_ACCOUNT_CREATED) + @Observer(JpaIdentityStore.EVENT_USER_CREATED) public void accountCreated(MemberAccount account) { // The user *may* have been created from the user manager screen. In that Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml 2008-04-03 11:41:20 UTC (rev 7808) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/testng.xml 2008-04-03 13:15:04 UTC (rev 7809) @@ -2,7 +2,7 @@ <suite name="SeamSpace" verbose="2" parallel="false"> - <test name="SeamSpace: Register"> +  </suite> \ No newline at end of file

17 years, 8 months

1
0
0 / 0

Seam SVN: r7808 - trunk/src/main/org/jboss/seam/security/management.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-04-03 07:41:20 -0400 (Thu, 03 Apr 2008) New Revision: 7808 Removed: trunk/src/main/org/jboss/seam/security/management/UserAccount.java Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java trunk/src/main/org/jboss/seam/security/management/IdentityStore.java trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java Log: first pass of identity management changes Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-04-03 11:34:45 UTC (rev 7807) +++ trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-04-03 11:41:20 UTC (rev 7808) @@ -1,6 +1,6 @@ package org.jboss.seam.security.management; -import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.ScopeType.EVENT; import static org.jboss.seam.annotations.Install.BUILT_IN; import java.io.Serializable; @@ -9,11 +9,11 @@ import java.util.List; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; @@ -24,9 +24,10 @@ * * @author Shane Bryzak */ -@Scope(APPLICATION) +@Scope(EVENT) @Name("org.jboss.seam.security.management.identityManager") @Install(precedence = BUILT_IN) +@BypassInterceptors public class IdentityManager implements Serializable { public static final String ACCOUNT_PERMISSION_NAME = "seam.account"; @@ -49,6 +50,12 @@ protected void initIdentityStore() { + // Default to JpaIdentityStore + if (identityStore == null) + { + identityStore = (IdentityStore) Component.getInstance(JpaIdentityStore.class, true); + } + if (roleIdentityStore == null && identityStore != null) { roleIdentityStore = identityStore; @@ -63,13 +70,13 @@ public static IdentityManager instance() { - if ( !Contexts.isApplicationContextActive() ) + if ( !Contexts.isEventContextActive() ) { - throw new IllegalStateException("No active application context"); + throw new IllegalStateException("No active event context"); } IdentityManager instance = (IdentityManager) Component.getInstance( - IdentityManager.class, ScopeType.APPLICATION); + IdentityManager.class, EVENT); if (instance == null) { Modified: trunk/src/main/org/jboss/seam/security/management/IdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/IdentityStore.java 2008-04-03 11:34:45 UTC (rev 7807) +++ trunk/src/main/org/jboss/seam/security/management/IdentityStore.java 2008-04-03 11:41:20 UTC (rev 7808) @@ -1,6 +1,10 @@ package org.jboss.seam.security.management; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * The identity store does the actual work of persisting user accounts in a @@ -10,51 +14,57 @@ */ public interface IdentityStore { + public enum Feature { createUser, deleteUser, enableUser, disableUser, changePassword, + createRole, deleteRole, grantRole, revokeRole } + public class FeatureSet - { - public static final int FEATURE_CREATE_USER = 1; - public static final int FEATURE_DELETE_USER = 2; - public static final int FEATURE_ENABLE_USER = 4; - public static final int FEATURE_DISABLE_USER = 8; - public static final int FEATURE_CHANGE_PASSWORD = 16; + { + private Set<Feature> features; + + public FeatureSet() + { + this(null); + } - public static final int FEATURE_CREATE_ROLE = 32; - public static final int FEATURE_DELETE_ROLE = 64; - public static final int FEATURE_GRANT_ROLE = 128; - public static final int FEATURE_REVOKE_ROLE = 256; + public FeatureSet(Set<Feature> features) + { + if (features != null) + { + this.features = features; + } + else + { + this.features = new HashSet<Feature>(); + } + } - public static final int FEATURE_ALL_USER = FEATURE_CREATE_USER | - FEATURE_DELETE_USER | - FEATURE_ENABLE_USER | - FEATURE_DISABLE_USER | - FEATURE_CHANGE_PASSWORD; + public Set<Feature> getFeatures() + { + return features; + } - public static final int FEATURE_ALL_ROLE = FEATURE_CREATE_ROLE | - FEATURE_DELETE_ROLE | - FEATURE_GRANT_ROLE | - FEATURE_REVOKE_ROLE; - - public static final int FEATURE_ALL = FEATURE_ALL_USER | FEATURE_ALL_ROLE; + public boolean supports(Feature feature) + { + return features.contains(feature); + } - private int features; - - public FeatureSet(int features) + public void addFeature(Feature feature) { - this.features = features; + features.add(feature); } - public int getFeatures() + public void removeFeature(Feature feature) { - return features; + features.remove(feature); } - public boolean supports(int feature) + public void enableAll() { - return (features & feature) == feature; + for (Feature f : Feature.values()) addFeature(f); } } - boolean supportsFeature(int feature); + boolean supportsFeature(Feature feature); boolean createUser(String username, String password); boolean createUser(String username, String password, String firstname, String lastname); Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-04-03 11:34:45 UTC (rev 7807) +++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-04-03 11:41:20 UTC (rev 7808) @@ -4,12 +4,13 @@ import static org.jboss.seam.annotations.Install.BUILT_IN; import java.io.Serializable; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.HashMap; +import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import javax.persistence.EntityManager; @@ -21,12 +22,21 @@ import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.annotations.security.management.RoleGroups; +import org.jboss.seam.annotations.security.management.RoleName; +import org.jboss.seam.annotations.security.management.UserEnabled; +import org.jboss.seam.annotations.security.management.UserFirstName; +import org.jboss.seam.annotations.security.management.UserLastName; +import org.jboss.seam.annotations.security.management.UserPassword; +import org.jboss.seam.annotations.security.management.UserPrincipal; +import org.jboss.seam.annotations.security.management.UserRoles; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; import org.jboss.seam.core.Expressions; import org.jboss.seam.core.Expressions.ValueExpression; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; import org.jboss.seam.security.Identity; -import org.jboss.seam.security.management.UserAccount.AccountType; /** * The default identity store implementation, uses JPA as its persistence mechanism. @@ -41,136 +51,273 @@ { public static final String AUTHENTICATED_USER = "org.jboss.seam.security.management.authenticatedUser"; - public static final String EVENT_ACCOUNT_CREATED = "org.jboss.seam.security.management.accountCreated"; - public static final String EVENT_ACCOUNT_AUTHENTICATED = "org.jboss.seam.security.management.accountAuthenticated"; + public static final String EVENT_USER_CREATED = "org.jboss.seam.security.management.userCreated"; + public static final String EVENT_PRE_PERSIST_USER = "org.jboss.seam.security.management.prePersistUser"; + public static final String EVENT_USER_AUTHENTICATED = "org.jboss.seam.security.management.userAuthenticated"; - protected FeatureSet featureSet = new FeatureSet(FeatureSet.FEATURE_ALL); + private static final LogProvider log = Logging.getLogProvider(JpaIdentityStore.class); + protected FeatureSet featureSet; + private ValueExpression<EntityManager> entityManager; - private Class<? extends UserAccount> accountClass; + private Class userClass; + private Class roleClass; - private Map<String,Set<String>> roleCache; - - private Field firstNameField; - private Field lastNameField; - - private String firstNameFieldName; - private String lastNameFieldName; - - public String getFirstNameField() + protected final class BeanProperty { - return firstNameFieldName; + private Field propertyField; + private Method propertyGetter; + private Method propertySetter; + private Class<? extends Annotation> annotation; + private String name; + private Class propertyClass; + + private boolean isFieldProperty; + + public BeanProperty(Field propertyField, Class<? extends Annotation> annotation) + { + this.propertyField = propertyField; + isFieldProperty = true; + this.annotation = annotation; + this.name = propertyField.getName(); + this.propertyClass = propertyField.getDeclaringClass(); + } + + public BeanProperty(Method propertyMethod, Class<? extends Annotation> annotation) + { + if (!(propertyMethod.getName().startsWith("get") || (propertyMethod.getName().startsWith("is")))) + { + throw new IllegalArgumentException("Bean property method name " + propertyMethod.getClass().getName() + + "." + propertyMethod.getName() + "() must start with \"get\" or \"is\"."); + } + + if (propertyMethod.getReturnType().equals(void.class) || propertyMethod.getParameterTypes().length > 0) + { + throw new IllegalArgumentException("Bean property method " + propertyMethod.getClass().getName() + + "." + propertyMethod.getName() + "() must return a value and take no parameters"); + } + + this.propertyGetter = propertyMethod; + this.propertyClass = propertyMethod.getReturnType(); + + String methodName = propertyMethod.getName(); + + this.name = methodName.startsWith("get") ? + (methodName.substring(3,1).toLowerCase() + methodName.substring(4)) : + (methodName.substring(2,1).toLowerCase() + methodName.substring(3)); + + String setterName = propertyMethod.getName().startsWith("get") ? + ("set" + methodName.substring(3)) : ("set" + methodName.substring(2)); + + try + { + propertySetter = propertyMethod.getClass().getMethod(setterName, new Class[] {propertyMethod.getReturnType()}); + } + catch (NoSuchMethodException ex) + { + throw new IllegalArgumentException("Bean property method " + propertyMethod.getClass().getName() + + "." + propertyMethod.getName() + "() must have a corresponding setter method."); + } + + isFieldProperty = false; + this.annotation = annotation; + } + + public void setValue(Object bean, Object value) + { + if (isFieldProperty) + { + boolean accessible = propertyField.isAccessible(); + try + { + propertyField.setAccessible(true); + propertyField.set(bean, value); + } + catch (IllegalAccessException ex) + { + throw new RuntimeException("Exception setting bean property", ex); + } + finally + { + propertyField.setAccessible(accessible); + } + } + else + { + try + { + propertySetter.invoke(bean, value); + } + catch (Exception ex) + { + throw new RuntimeException("Exception setting bean property", ex); + } + } + } + + public Object getValue(Object bean) + { + if (isFieldProperty) + { + boolean accessible = propertyField.isAccessible(); + try + { + propertyField.setAccessible(true); + return propertyField.get(bean); + } + catch (IllegalAccessException ex) + { + throw new RuntimeException("Exception getting bean property", ex); + } + finally + { + propertyField.setAccessible(accessible); + } + } + else + { + try + { + return propertyGetter.invoke(bean); + } + catch (Exception ex) + { + throw new RuntimeException("Exception getting bean property", ex); + } + } + } + + public Class<? extends Annotation> getAnnotation() + { + return annotation; + } + + public String getName() + { + return name; + } + + public Class getPropertyClass() + { + return propertyClass; + } } - public void setFirstNameField(String firstNameFieldName) - { - this.firstNameFieldName = firstNameFieldName; - } + private BeanProperty userPrincipalProperty; + private BeanProperty userPasswordProperty; + private BeanProperty userRolesProperty; + private BeanProperty userEnabledProperty; + private BeanProperty userFirstNameProperty; + private BeanProperty userLastNameProperty; + private BeanProperty roleNameProperty; + private BeanProperty roleGroupsProperty; - public String getLastNameField() - { - return lastNameFieldName; - } + private String passwordHash; - public void setLastNameField(String lastNameFieldName) + public Set<Feature> getFeatures() { - this.lastNameFieldName = lastNameFieldName; - } - - public int getFeatures() - { return featureSet.getFeatures(); } - public void setFeatures(int features) + public void setFeatures(Set<Feature> features) { featureSet = new FeatureSet(features); } - public boolean supportsFeature(int feature) + public boolean supportsFeature(Feature feature) { return featureSet.supports(feature); } @Create public void init() - { - if (entityManager == null) + { + if (userClass == null) { - entityManager = Expressions.instance().createValueExpression("#{entityManager}", EntityManager.class); + log.debug("No userClass set, JpaIdentityStore will be unavailable."); + return; } - loadRoles(); - - if (getFirstNameField() != null) + if (roleClass == null) { - try - { - firstNameField = accountClass.getField(getFirstNameField()); - } - catch (NoSuchFieldException ex) - { - throw new RuntimeException("First name field " + getFirstNameField() + " does not exist " + - "in account class " + accountClass.getName(), ex); - } + log.debug("No roleClass set, JpaIdentityStore will be unavailable."); + return; } - if (getLastNameField() != null) + if (featureSet == null) { - try - { - lastNameField = accountClass.getField(getLastNameField()); - } - catch (NoSuchFieldException ex) - { - throw new RuntimeException("Last name field " + getLastNameField() + " does not exist " + - "in account class " + accountClass.getName(), ex); - } + featureSet = new FeatureSet(); + featureSet.enableAll(); } + + if (entityManager == null) + { + entityManager = Expressions.instance().createValueExpression("#{entityManager}", EntityManager.class); + } + + initProperties(); } - protected void loadRoles() + private void initProperties() { - List<? extends UserAccount> roles = lookupEntityManager().createQuery( - "from " + accountClass.getName() + " where enabled = true and accountType = :accountType") - .setParameter("accountType", UserAccount.AccountType.role) - .getResultList(); + userPrincipalProperty = scanForProperty(userClass, UserPrincipal.class); + userPasswordProperty = scanForProperty(userClass, UserPassword.class); + userRolesProperty = scanForProperty(userClass, UserRoles.class); + userEnabledProperty = scanForProperty(userClass, UserEnabled.class); + userFirstNameProperty = scanForProperty(userClass, UserFirstName.class); + userLastNameProperty = scanForProperty(userClass, UserLastName.class); - roleCache = new HashMap<String,Set<String>>(); + roleNameProperty = scanForProperty(roleClass, RoleName.class); + roleGroupsProperty = scanForProperty(roleClass, RoleGroups.class); - for (UserAccount role : roles) + if (userPrincipalProperty == null) { - Set<String> memberships = new HashSet<String>(); - for (UserAccount m : role.getMemberships()) - { - memberships.add(m.getUsername()); - } - roleCache.put(role.getUsername(), memberships); + throw new RuntimeException("Invalid userClass " + userClass.getName() + + " - required annotation @UserPrincipal not found on any Field or Method."); + } + + if (userPasswordProperty == null) + { + throw new RuntimeException("Invalid userClass " + userClass.getName() + + " - required annotation @UserPassword not found on any Field or Method."); } + + if (userRolesProperty == null) + { + throw new RuntimeException("Invalid userClass " + userClass.getName() + + " - required annotation @UserRoles not found on any Field or Method."); + } + + if (roleNameProperty == null) + { + throw new RuntimeException("Invalid roleClass " + roleClass.getName() + + " - required annotation @RoleName not found on any Field or Method."); + } } - private void setFieldValue(Field field, Object instance, Object value) throws Exception + private BeanProperty scanForProperty(Class cls, Class<? extends Annotation> annotation) { - boolean accessible = field.isAccessible(); - try + for (Field f : cls.getFields()) { - field.setAccessible(true); - field.set(instance, value); + if (f.isAnnotationPresent(annotation)) return new BeanProperty(f, annotation); } - finally + + for (Method m : cls.getMethods()) { - field.setAccessible(accessible); + if (m.isAnnotationPresent(annotation)) return new BeanProperty(m, annotation); } + + return null; } public boolean createUser(String username, String password, String firstname, String lastname) { try { - if (accountClass == null) + if (userClass == null) { - throw new IdentityManagementException("Could not create account, accountClass not set"); + throw new IdentityManagementException("Could not create account, userClass not set"); } if (userExists(username)) @@ -178,27 +325,32 @@ throw new IdentityManagementException("Could not create account, already exists"); } - UserAccount account = accountClass.newInstance(); - account.setAccountType(UserAccount.AccountType.user); - account.setUsername(username); + Object user = userClass.newInstance(); + + userPrincipalProperty.setValue(user, username); + + if (userFirstNameProperty != null) userFirstNameProperty.setValue(user, firstname); + if (userLastNameProperty != null) userLastNameProperty.setValue(user, lastname); - if (firstNameField != null) setFieldValue(firstNameField, account, firstname); - if (lastNameField != null) setFieldValue(lastNameField, account, lastname); - if (password == null) { - account.setEnabled(false); + if (userEnabledProperty != null) userEnabledProperty.setValue(user, false); } else { - account.setPasswordHash(PasswordHash.instance().generateSaltedHash(password, getAccountSalt(account))); - account.setEnabled(true); + String passwordValue = passwordHash == null ? password : + PasswordHash.instance().generateSaltedHash(password, getUserAccountSalt(user)); + + userPasswordProperty.setValue(user, passwordValue); + if (userEnabledProperty != null) userEnabledProperty.setValue(user, true); } - persistAccount(account); + if (Events.exists()) Events.instance().raiseEvent(EVENT_PRE_PERSIST_USER, user); - if (Events.exists()) Events.instance().raiseEvent(EVENT_ACCOUNT_CREATED, account); + persistEntity(user); + if (Events.exists()) Events.instance().raiseEvent(EVENT_USER_CREATED, user); + return true; } catch (Exception ex) @@ -214,9 +366,10 @@ } } - protected String getAccountSalt(UserAccount account) + protected String getUserAccountSalt(Object user) { - return account.getUsername(); + // By default, we'll use the user's username as the password salt + return userPrincipalProperty.getValue(user).toString(); } public boolean createUser(String username, String password) @@ -226,61 +379,73 @@ public boolean deleteUser(String name) { - UserAccount account = validateAccount(name); - if (account == null || !account.getAccountType().equals(AccountType.user)) + Object user = lookupUser(name); + if (user == null) { - throw new NoSuchUserException("Could not delete account, no such user '" + name + "'"); + throw new NoSuchUserException("Could not delete, user '" + name + "' does not exist"); } - lookupEntityManager().remove(account); + removeEntity(user); return true; } - public boolean grantRole(String name, String role) + public boolean grantRole(String username, String role) { - UserAccount account = validateAccount(name); - if (account == null) + Object user = lookupUser(username); + if (user == null) { - throw new NoSuchUserException("Could not grant role, no such user or role '" + name + "'"); + throw new NoSuchUserException("Could not grant role, no such user '" + username + "'"); } - UserAccount roleToGrant = validateAccount(role); + Object roleToGrant = lookupRole(role); if (roleToGrant == null) { throw new NoSuchRoleException("Could not grant role, role '" + role + "' does not exist"); } - if (account.getMemberships() == null) + Collection userRoles = (Collection) userRolesProperty.getValue(user); + if (userRoles == null) { - account.setMemberships(new HashSet<UserAccount>()); + // This should either be a Set, or a List... + if (Set.class.isAssignableFrom(userRolesProperty.getPropertyClass())) + { + userRoles = new HashSet(); + } + else if (List.class.isAssignableFrom(userRolesProperty.getPropertyClass())) + { + userRoles = new ArrayList(); + } + + userRolesProperty.setValue(user, userRoles); } - else if (account.getMemberships().contains(roleToGrant)) + else if (((Collection) userRolesProperty.getValue(user)).contains(roleToGrant)) { return false; } - account.getMemberships().add(roleToGrant); - mergeAccount(account); + ((Collection) userRolesProperty.getValue(user)).add(roleToGrant); + mergeEntity(user); return true; } - public boolean revokeRole(String name, String role) + public boolean revokeRole(String username, String role) { - UserAccount account = validateAccount(name); - if (account == null) + Object user = lookupUser(username); + if (user == null) { - throw new NoSuchUserException("Could not revoke role, no such user or role '" + name + "'"); + throw new NoSuchUserException("Could not revoke role, no such user '" + username + "'"); } - UserAccount roleToRevoke = validateAccount(role); + Object roleToRevoke = lookupRole(role); if (roleToRevoke == null) { throw new NoSuchRoleException("Could not revoke role, role '" + role + "' does not exist"); } - boolean success = account.getMemberships().remove(roleToRevoke); - mergeAccount(account); + boolean success = ((Collection) userRolesProperty.getValue(user)).remove(roleToRevoke); + + if (success) mergeEntity(user); return success; } @@ -288,9 +453,9 @@ { try { - if (accountClass == null) + if (roleClass == null) { - throw new IdentityManagementException("Could not create role, accountClass not set"); + throw new IdentityManagementException("Could not create role, roleClass not set"); } if (roleExists(role)) @@ -298,12 +463,10 @@ throw new IdentityManagementException("Could not create role, already exists"); } - UserAccount account = accountClass.newInstance(); - account.setAccountType(UserAccount.AccountType.role); - account.setUsername(role); + Object instance = roleClass.newInstance(); + roleNameProperty.setValue(instance, role); + persistEntity(instance); - persistAccount(account); - return true; } catch (Exception ex) @@ -321,102 +484,111 @@ public boolean deleteRole(String role) { - UserAccount roleToDelete = validateAccount(role); + Object roleToDelete = lookupRole(role); if (roleToDelete == null) { throw new NoSuchRoleException("Could not delete role, role '" + role + "' does not exist"); } - lookupEntityManager().remove(roleToDelete); + removeEntity(roleToDelete); return true; } public boolean enableUser(String name) { - UserAccount account = validateAccount(name); - if (account == null || !account.getAccountType().equals(AccountType.user)) + if (userEnabledProperty == null) { - throw new NoSuchUserException("Could not enable account, user '" + name + "' does not exist"); + log.debug("Can not enable user, no @UserEnabled property configured in userClass " + userClass.getName()); + return false; } + Object user = lookupUser(name); + if (user == null) + { + throw new NoSuchUserException("Could not enable user, user '" + name + "' does not exist"); + } + // If it's already enabled return false - if (account.isEnabled()) + if (((Boolean) userEnabledProperty.getValue(user)) == true) { return false; } - account.setEnabled(true); - mergeAccount(account); - + userEnabledProperty.setValue(user, true); + mergeEntity(user); return true; } public boolean disableUser(String name) { - UserAccount account = validateAccount(name); - if (account == null || !account.getAccountType().equals(AccountType.user)) + if (userEnabledProperty == null) { - throw new NoSuchUserException("Could not disable account, user '" + name + "' does not exist"); + log.debug("Can not disable user, no @UserEnabled property configured in userClass " + userClass.getName()); + return false; } - // If it's already enabled return false - if (!account.isEnabled()) + Object user = lookupUser(name); + if (user == null) { + throw new NoSuchUserException("Could not disable user, user '" + name + "' does not exist"); + } + + // If it's already disabled return false + if (((Boolean) userEnabledProperty.getValue(user)) == false) + { return false; - } + } - account.setEnabled(false); - mergeAccount(account); + userEnabledProperty.setValue(user, false); + mergeEntity(user); return true; } - public boolean changePassword(String name, String password) + public boolean changePassword(String username, String password) { - UserAccount account = validateAccount(name); - if (account == null || !account.getAccountType().equals(AccountType.user)) + Object user = lookupUser(username); + if (user == null) { - throw new NoSuchUserException("Could not change password, user '" + name + "' does not exist"); + throw new NoSuchUserException("Could not change password, user '" + username + "' does not exist"); } - account.setPasswordHash(PasswordHash.instance().generateSaltedHash(password, getAccountSalt(account))); - mergeAccount(account); + userPasswordProperty.setValue(user, PasswordHash.instance().generateSaltedHash(password, getUserAccountSalt(user))); + mergeEntity(user); return true; } public boolean userExists(String name) { - UserAccount account = validateAccount(name); - return account != null && account.getAccountType().equals(AccountType.user); + return lookupUser(name) != null; } public boolean roleExists(String name) { - UserAccount role = validateAccount(name); - return role != null && role.getAccountType().equals(AccountType.role); + return lookupRole(name) != null; } public boolean isUserEnabled(String name) { - UserAccount account = validateAccount(name); - return account != null && account.getAccountType().equals(AccountType.user) - && account.isEnabled(); + Object user = lookupUser(name); + return user != null && (userEnabledProperty == null || (((Boolean) userEnabledProperty.getValue(user))) == true); } public List<String> getGrantedRoles(String name) { - UserAccount account = validateAccount(name); - if (account == null) throw new NoSuchUserException("No such user '" + name + "'"); + Object user = lookupUser(name); + if (user == null) + { + throw new NoSuchUserException("No such user '" + name + "'"); + } - List<String> roles = new ArrayList<String>(); - if (account.getMemberships() != null) + List<String> roles = new ArrayList<String>(); + Collection userRoles = (Collection) userRolesProperty.getValue(user); + if (userRoles != null) { - for (UserAccount membership : account.getMemberships()) + for (Object role : userRoles) { - if (membership.getAccountType().equals(UserAccount.AccountType.role)) - { - roles.add(membership.getUsername()); - } + roles.add((String) roleNameProperty.getValue(role)); } } @@ -425,55 +597,62 @@ public List<String> getImpliedRoles(String name) { - UserAccount account = validateAccount(name); - if (account == null) throw new NoSuchUserException("No such user '" + name + "'"); + Object user = lookupUser(name); + if (user == null) + { + throw new NoSuchUserException("No such user '" + name + "'"); + } Set<String> roles = new HashSet<String>(); - - for (UserAccount membership : account.getMemberships()) + Collection userRoles = (Collection) userRolesProperty.getValue(user); + if (userRoles != null) { - if (membership.getAccountType().equals(UserAccount.AccountType.role)) + for (Object role : userRoles) { - addRoleAndMemberships(membership.getUsername(), roles); + addRoleAndMemberships((String) roleNameProperty.getValue(role), roles); } - } + } return new ArrayList<String>(roles); } private void addRoleAndMemberships(String role, Set<String> roles) { - roles.add(role); - - for (String membership : roleCache.get(role)) - { - if (!roles.contains(membership)) + if (roles.add(role)) + { + Object instance = lookupRole(role); + + Collection groups = (Collection) roleGroupsProperty.getValue(instance); + + if (groups != null) { - addRoleAndMemberships(membership, roles); + for (Object group : groups) + { + addRoleAndMemberships((String) roleNameProperty.getValue(group), roles); + } } - } + } } public boolean authenticate(String username, String password) { - UserAccount account = validateAccount(username); - if (account == null || !account.getAccountType().equals(AccountType.user) - || !account.isEnabled()) + Object user = lookupUser(username); + if (user == null || (userEnabledProperty != null && ((Boolean) userEnabledProperty.getValue(user) == false))) { return false; } - String passwordHash = PasswordHash.instance().generateSaltedHash(password, getAccountSalt(account)); - boolean success = passwordHash.equals(account.getPasswordHash()); + String passwordHash = PasswordHash.instance().generateSaltedHash(password, getUserAccountSalt(user)); + boolean success = passwordHash.equals(userPasswordProperty.getValue(user)); if (success && Events.exists()) { if (Contexts.isEventContextActive()) { - Contexts.getEventContext().set(AUTHENTICATED_USER, account); + Contexts.getEventContext().set(AUTHENTICATED_USER, user); } - Events.instance().raiseEvent(EVENT_ACCOUNT_AUTHENTICATED, account); + Events.instance().raiseEvent(EVENT_USER_AUTHENTICATED, user); } return success; @@ -489,28 +668,17 @@ } } - protected UserAccount validateAccount(String name) + protected Object lookupUser(String username) { try { - UserAccount account = (UserAccount) lookupEntityManager().createQuery( - "from " + accountClass.getName() + " where username = :username") - .setParameter("username", name) + Object user = lookupEntityManager().createQuery( + "select u from " + userClass.getName() + "u where " + userPrincipalProperty.getName() + + " = :username") + .setParameter("username", username) .getSingleResult(); - if (account.getAccountType().equals(AccountType.role) && - !roleCache.containsKey(account.getUsername())) - { - Set<String> memberships = new HashSet<String>(); - for (UserAccount m : account.getMemberships()) - { - memberships.add(m.getUsername()); - } - - roleCache.put(account.getUsername(), memberships); - } - - return account; + return user; } catch (NoResultException ex) { @@ -518,21 +686,36 @@ } } + protected Object lookupRole(String role) + { + try + { + Object value = lookupEntityManager().createQuery( + "select r from " + roleClass.getName() + "r where " + roleNameProperty.getName() + + " = :role") + .setParameter("role", role) + .getSingleResult(); + + return value; + } + catch (NoResultException ex) + { + return null; + } + } + public List<String> listUsers() { return lookupEntityManager().createQuery( - "select username from " + accountClass.getName() + - " where accountType = :accountType") - .setParameter("accountType", AccountType.user) + "select u." + userPrincipalProperty.getName() + " from " + userClass.getName() + " u") .getResultList(); } public List<String> listUsers(String filter) { return lookupEntityManager().createQuery( - "select username from " + accountClass.getName() + - " where accountType = :accountType and lower(username) like :username") - .setParameter("accountType", AccountType.user) + "select u." + userPrincipalProperty.getName() + " from " + userClass.getName() + + "u where lower(" + userPrincipalProperty.getName() + ") like :username") .setParameter("username", "%" + (filter != null ? filter.toLowerCase() : "") + "%") .getResultList(); @@ -541,32 +724,45 @@ public List<String> listRoles() { return lookupEntityManager().createQuery( - "select username from " + accountClass.getName() + - " where accountType = :accountType") - .setParameter("accountType", AccountType.role) + "select r." + roleNameProperty.getName() + " from " + roleClass.getName() + " r") .getResultList(); } - protected void persistAccount(UserAccount account) + protected void persistEntity(Object entity) { - lookupEntityManager().persist(account); + lookupEntityManager().persist(entity); } - protected UserAccount mergeAccount(UserAccount account) + protected Object mergeEntity(Object entity) { - return lookupEntityManager().merge(account); + return lookupEntityManager().merge(entity); } - public Class<? extends UserAccount> getAccountClass() + protected void removeEntity(Object entity) { - return accountClass; + lookupEntityManager().remove(entity); } - public void setAccountClass(Class<? extends UserAccount> accountClass) + public Class getUserClass() { - this.accountClass = accountClass; + return userClass; + } + + public void setUserClass(Class userClass) + { + this.userClass = userClass; } + public Class getRoleClass() + { + return roleClass; + } + + public void setRoleClass(Class roleClass) + { + this.roleClass = roleClass; + } + private EntityManager lookupEntityManager() { return entityManager.getValue(); Modified: trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-04-03 11:34:45 UTC (rev 7807) +++ trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-04-03 11:41:20 UTC (rev 7808) @@ -47,7 +47,7 @@ private static final LogProvider log = Logging.getLogProvider(LdapIdentityStore.class); - protected FeatureSet featureSet = new FeatureSet(FeatureSet.FEATURE_ALL); + protected FeatureSet featureSet = new FeatureSet(); private String serverAddress = "localhost"; @@ -361,17 +361,17 @@ } } - public int getFeatures() + public Set<Feature> getFeatures() { return featureSet.getFeatures(); } - public void setFeatures(int features) + public void setFeatures(Set<Feature> features) { featureSet = new FeatureSet(features); } - public boolean supportsFeature(int feature) + public boolean supportsFeature(Feature feature) { return featureSet.supports(feature); } Deleted: trunk/src/main/org/jboss/seam/security/management/UserAccount.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/UserAccount.java 2008-04-03 11:34:45 UTC (rev 7807) +++ trunk/src/main/org/jboss/seam/security/management/UserAccount.java 2008-04-03 11:41:20 UTC (rev 7808) @@ -1,57 +0,0 @@ -package org.jboss.seam.security.management; - -import java.io.Serializable; -import java.util.Set; - -/** - * Abstract base class for user/role accounts. This class should be extended - * to create a concrete JPA/Hibernate implementation. The user has no access to - * this class via the identity management API. - * - * @author Shane Bryzak - */ -public abstract class UserAccount implements Serializable -{ - public enum AccountType {user, role} - - public abstract String getUsername(); - public abstract void setUsername(String username); - - public abstract String getPasswordHash(); - public abstract void setPasswordHash(String passwordHash); - - public abstract boolean isEnabled(); - public abstract void setEnabled(boolean enabled); - - public abstract AccountType getAccountType(); - public abstract void setAccountType(AccountType accountType); - - public abstract Set<UserAccount> getMemberships(); - public abstract void setMemberships(Set<UserAccount> memberships); - - @Override - public boolean equals(Object value) - { - if (!(value instanceof UserAccount)) - { - return false; - } - - UserAccount other = (UserAccount) value; - - if (other.getUsername() == null && this.getUsername() == null) - { - return hashCode() == other.hashCode(); - } - else - { - return getUsername() == null ? false : getUsername().equals(other.getUsername()); - } - } - - @Override - public int hashCode() - { - return getUsername() != null ? getUsername().hashCode() : super.hashCode(); - } -}

17 years, 8 months

1
0
0 / 0

Seam SVN: r7807 - trunk and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-04-03 07:34:45 -0400 (Thu, 03 Apr 2008) New Revision: 7807 Modified: branches/Seam_2_0/build.xml trunk/build.xml Log: JBSEAM-2815 Modified: branches/Seam_2_0/build.xml =================================================================== --- branches/Seam_2_0/build.xml 2008-04-03 11:17:41 UTC (rev 7806) +++ branches/Seam_2_0/build.xml 2008-04-03 11:34:45 UTC (rev 7807) @@ -53,7 +53,7 @@ <property name="dist.name" value="${name}-${complete.version}" /> <property name="dist.location" value="${basedir}/../" /> - <property name="dist.dir" value="${dist.location}/${dist.name}" /> + <property name="dist.dir" location="${dist.location}/${dist.name}" /> <property name="dist.ui.dir" value="${dist.dir}/ui" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> <property name="dist.api.dir" value="${dist.dir}/doc/api" /> @@ -76,6 +76,12 @@ <property name="dist.build.dir" value="${dist.dir}/build" /> <property name="dist.seamgen.dir" value="${dist.dir}/seam-gen" /> <property name="dist.ui.api.dir" value="${dist.dir}/doc/ui" /> + + <condition property="in.dist.dir"> + <equals arg1="${basedir}" arg2="${dist.dir}"/> + </condition> + + <echo>${basedir} : ${dist.dir}</echo> <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> <property name="webroot.dir" value="${deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" /> @@ -421,7 +427,7 @@  - <target name="cleandist" description="Cleans up the dist directory"> + <target name="cleandist" description="Cleans up the dist directory" unless="in.dist.dir"> <delete dir="${dist.dir}" quiet="${quietclean}" /> </target> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-04-03 11:17:41 UTC (rev 7806) +++ trunk/build.xml 2008-04-03 11:34:45 UTC (rev 7807) @@ -57,7 +57,7 @@ <property name="dist.name" value="${name}-${complete.version}" /> <property name="dist.location" value="${basedir}/../" /> - <property name="dist.dir" value="${dist.location}/${dist.name}" /> + <property name="dist.dir" location="${dist.location}/${dist.name}" /> <property name="dist.ui.dir" value="${dist.dir}/ui" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> <property name="dist.api.dir" value="${dist.dir}/doc/api" /> @@ -85,6 +85,10 @@ <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> <property name="webroot.dir" value="${deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" /> + + <condition property="in.dist.dir"> + <equals arg1="${basedir}" arg2="${dist.dir}"/> + </condition>  @@ -455,7 +459,7 @@  - <target name="cleandist" description="Cleans up the dist directory"> + <target name="cleandist" description="Cleans up the dist directory" unless="in.dist.dir"> <delete dir="${dist.dir}" quiet="${quietclean}" /> </target>

17 years, 8 months

1
0
0 / 0

Seam SVN: r7806 - in trunk/examples/wiki: src/etc and 30 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-04-03 07:17:41 -0400 (Thu, 03 Apr 2008) New Revision: 7806 Added: trunk/examples/wiki/src/etc/META-INF/seam-deployment.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheManager.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheProvider.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/PageFragmentCache.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiPageFragmentCacheRenderer.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersFeedPreferenceValueTemplate.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiMySQL5HibernateDialect.java Removed: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedConnectorPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/jira/JiraConnectorPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CorePreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenuPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirToc/DirTocPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/docPager/DocPagerPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/jiraIssueList/JiraIssueListPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/tags/TagsPreferencesSupport.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferencesSupport.java Modified: trunk/examples/wiki/README.txt trunk/examples/wiki/build.xml trunk/examples/wiki/src/etc/META-INF/components-dev.xml trunk/examples/wiki/src/etc/META-INF/components-prod.xml trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml trunk/examples/wiki/src/etc/WEB-INF/pages.xml trunk/examples/wiki/src/etc/ehcache.xml trunk/examples/wiki/src/etc/i18n/messages_en.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserProfile.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferenceRegistry.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java trunk/examples/wiki/view/docEdit_d.xhtml trunk/examples/wiki/view/includes/commentForm.xhtml trunk/examples/wiki/view/plugins/faqBrowser/faqQuestionForm.xhtml trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml Log: JBSEAM-2729, JBSEAM-2728, JBSEAM-2723 Modified: trunk/examples/wiki/README.txt =================================================================== --- trunk/examples/wiki/README.txt 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/README.txt 2008-04-03 11:17:41 UTC (rev 7806) @@ -43,7 +43,7 @@ with this application. Follow the steps outlined above (edit build.properties, call 'ant upgradehibernate') or copy them manually. -- Install MySQL 5.x +- Install MySQL 5.x and start it - Obtain the correct JDBC driver for your MySQL version and copy it into server/default/lib/ of JBoss AS @@ -67,3 +67,45 @@ NOTE: The Lucene index directory for full-text searching is named "lacewikiIndex" and located in the current directory. This is the current directory from which you started the application server! If you want to change this setting, unpack the WAR and change the META-INF/persistence.xml configuration file. + + +INSTALLATION WITH UNICODE SUPPORT ON MYSQL +========================================================================================== + +If you want to use any non-latin characters, create the MySQL database you want to use (or +drop and recreate the default 'test' database) with the following options: + + CREATE DATABASE test CHARACTER SET utf8 COLLATE utf8_general_ci; + +Your database should at least have the 'character_set_database' variable set to 'utf8': + + mysql> show variables like '%character%'; + +--------------------------+------------------------------------------------------------+ + | Variable_name | Value | + +--------------------------+------------------------------------------------------------+ + | character_set_client | latin1 | + | character_set_connection | latin1 | + | character_set_database | utf8 | + | character_set_filesystem | binary | + | character_set_results | latin1 | + | character_set_server | latin1 | + | character_set_system | utf8 | + | character_sets_dir | /usr/local/mysql-5.0.45-osx10.4-i686/share/mysql/charsets/ | + +--------------------------+------------------------------------------------------------+ + +If you keep the default latin1 encoding, exceptions will be thrown by the application as +soon as you try to store any non-latin character. + +Note that due to URL rewriting rules, stored wiki items (documents, uploaded files) MUST have +at least 3 latin-1 characters in their name! The application will prompt you with a validation +error message when you forget that limitation and enter only non-latin-1 characters in a form. + +The wiki search engine passes search terms as request parameters in the URI. If you require +unicode support for search terms, you need to set an option in Tomcat to enable the correct +decoding of URL-encoded request parameter values to UTF-8. To do that, edit + ${JBOSS_HOME}/server/(default)/deploy/jboss-web.deployer/server.xml +and add + URIEncoding="UTF-8" +to the <connector> declaration. + + Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/build.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -280,6 +280,7 @@ <copy todir="${exploded.war.dir}/WEB-INF/classes/META-INF"> <fileset dir="${src.etc.dir}/META-INF"> <include name="*.taglib.xml"/> + <include name="*.properties"/> </fileset> </copy> <copy tofile="${exploded.war.dir}/WEB-INF/classes/META-INF/persistence.xml" Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -39,11 +39,35 @@  -  <core:init debug="false"/> - <persistence:entity-manager-factory name="wikiEntityManagerFactory" persistence-unit-name="wiki"/> +  + <persistence:entity-manager-factory name="wikiEntityManagerFactory" + persistence-unit-name="wiki" + startupDepends="ehCacheManager"/> + +  + <component name="pageFragmentCache" + class="org.jboss.seam.wiki.core.cache.PageFragmentCache" + startup="true" startupDepends="ehCacheManager" + scope="APPLICATION"/> + +  + <component name="ehCacheManager" + class="org.jboss.seam.wiki.core.cache.EHCacheManager" + startup="true" + scope="APPLICATION"/> + +  + <factory name="basePath" scope="CONVERSATION" auto-create="true" + value="#{facesContext.externalContext.request.scheme}://#{facesContext.externalContext.request.serverName + }:#{facesContext.externalContext.request.serverPort}#{facesContext.externalContext.request.contextPath}"/> + + <factory name="themePathGetRequest" scope="CONVERSATION" auto-create="true" + value="#{servletContexts.request.scheme}://#{servletContexts.request.serverName + }:#{servletContexts.request.serverPort}#{servletContexts.request.contextPath}/themes/#{preferences.get('Wiki').themeName}"/> +  <component name="dbunitImporter" class="org.jboss.seam.wiki.util.DBUnitImporter" scope="APPLICATION" auto-create="true"> <property name="database">mysql</property> @@ -61,13 +85,4 @@ </property> </component> -  - <factory name="basePath" scope="CONVERSATION" auto-create="true" - value="#{facesContext.externalContext.request.scheme}://#{facesContext.externalContext.request.serverName - }:#{facesContext.externalContext.request.serverPort}#{facesContext.externalContext.request.contextPath}"/> - - <factory name="themePathGetRequest" scope="CONVERSATION" auto-create="true" - value="#{servletContexts.request.scheme}://#{servletContexts.request.serverName - }:#{servletContexts.request.serverPort}#{servletContexts.request.contextPath}/themes/#{preferences.get('Wiki').themeName}"/> - </components> Modified: trunk/examples/wiki/src/etc/META-INF/components-prod.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -39,11 +39,26 @@  -  <core:init debug="false"/> - <persistence:entity-manager-factory name="wikiEntityManagerFactory" persistence-unit-name="wiki"/> +  + <persistence:entity-manager-factory name="wikiEntityManagerFactory" + persistence-unit-name="wiki" + startupDepends="ehCacheManager"/> + +  + <component name="pageFragmentCache" + class="org.jboss.seam.wiki.core.cache.PageFragmentCache" + startup="true" startupDepends="ehCacheManager" + scope="APPLICATION"/> + +  + <component name="ehCacheManager" + class="org.jboss.seam.wiki.core.cache.EHCacheManager" + startup="true" + scope="APPLICATION"/> +  <factory name="basePath" scope="CONVERSATION" auto-create="true" value="#{facesContext.externalContext.request.scheme}://#{facesContext.externalContext.request.serverName Modified: trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -9,7 +9,7 @@ <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>java:/wikiDatasource</jta-data-source> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <property name="hibernate.dialect" value="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> @@ -39,8 +39,8 @@ <property name="hibernate.generate_statistics" value="true"/> <property name="hibernate.session_factory_name" value="SessionFactories/lacewikiSF"/> -  - <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> +  + <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.core.cache.EHCacheProvider"/> <property name="hibernate.cache.use_query_cache" value="true"/> <property name="hibernate.cache.use_second_level_cache" value="true"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -9,7 +9,7 @@ <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>java:/wikiDatasource</jta-data-source> <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <property name="hibernate.dialect" value="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> @@ -34,8 +34,8 @@ <property name="hibernate.generate_statistics" value="true"/> <property name="hibernate.session_factory_name" value="SessionFactories/lacewikiSF"/> -  - <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> +  + <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.core.cache.EHCacheProvider"/> <property name="hibernate.cache.use_query_cache" value="true"/> <property name="hibernate.cache.use_second_level_cache" value="true"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -11,7 +11,7 @@ <properties>  <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> @@ -50,10 +50,6 @@ value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostInsertEventListener"/> <property name="hibernate.ejb.event.post-delete" value="org.jboss.seam.wiki.core.nestedset.listener.NestedSetPostDeleteEventListener"/> -  </properties> Added: trunk/examples/wiki/src/etc/META-INF/seam-deployment.properties =================================================================== --- trunk/examples/wiki/src/etc/META-INF/seam-deployment.properties (rev 0) +++ trunk/examples/wiki/src/etc/META-INF/seam-deployment.properties 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1 @@ +org.jboss.seam.deployment.annotationTypes=org.jboss.seam.wiki.preferences.annotations.Preferences \ No newline at end of file Modified: trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,8 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> <application> <locale-config> @@ -13,8 +10,22 @@  <component> - <component-type>org.jboss.seam.wiki.core.ui.UIPlugin</component-type> - <component-class>org.jboss.seam.wiki.core.ui.UIPlugin</component-class> + <component-type>org.jboss.seam.wiki.core.ui.UIPlugin</component-type> + <component-class>org.jboss.seam.wiki.core.ui.UIPlugin</component-class> </component> +  + <render-kit> + <render-kit-id>HTML_BASIC</render-kit-id> + <renderer> + <component-family>org.jboss.seam.ui.Cache</component-family> + <renderer-type> + org.jboss.seam.ui.CacheRenderer + </renderer-type> + <renderer-class> + org.jboss.seam.wiki.core.ui.WikiPageFragmentCacheRenderer + </renderer-class> + </renderer> + </render-kit> + </faces-config> Modified: trunk/examples/wiki/src/etc/WEB-INF/pages.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/WEB-INF/pages.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -380,7 +380,10 @@ <end-conversation/> <http-error error-code="400"> <message severity="ERROR"> - #{messages['lacewiki.msg.FatalError']} (#{wikiInit.adminContact}) + #{messages['lacewiki.msg.FatalError']} (#{wikiInit.adminContact}): + '#{org.jboss.seam.handledException.class.name}, + #{org.jboss.seam.handledException.message} + in #{org.jboss.seam.handledException.stackTrace[0].className}(a)#{org.jboss.seam.handledException.stackTrace[0].lineNumber}' </message> </http-error> </exception> Modified: trunk/examples/wiki/src/etc/ehcache.xml =================================================================== --- trunk/examples/wiki/src/etc/ehcache.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/ehcache.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -82,9 +82,6 @@ timeToIdleSeconds="120" timeToLiveSeconds="120" overflowToDisk="false" - maxElementsOnDisk="10000000" - diskPersistent="false" - diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU" /> @@ -94,13 +91,11 @@ overflowToDisk="false" timeToIdleSeconds="300" timeToLiveSeconds="600" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="org.hibernate.cache.UpdateTimestampsCache" maxElementsInMemory="1000" eternal="true" - diskPersistent="false" overflowToDisk="false"/> <cache name="WikiPreference" @@ -109,7 +104,6 @@ overflowToDisk="false" timeToIdleSeconds="1000" timeToLiveSeconds="6000" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiLinkProtocol" @@ -118,7 +112,6 @@ overflowToDisk="false" timeToIdleSeconds="86400" timeToLiveSeconds="259200" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiFeed" @@ -127,7 +120,6 @@ overflowToDisk="false" timeToIdleSeconds="86400" timeToLiveSeconds="259200" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiFeedEntry" @@ -136,7 +128,6 @@ timeToIdleSeconds="86400" timeToLiveSeconds="259200" overflowToDisk="false" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiFeedEntryCollection" @@ -145,7 +136,6 @@ overflowToDisk="false" timeToIdleSeconds="86400" timeToLiveSeconds="259200" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiUser" @@ -154,7 +144,6 @@ overflowToDisk="false" timeToIdleSeconds="10000" timeToLiveSeconds="60000" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiRole" @@ -163,7 +152,6 @@ overflowToDisk="false" timeToIdleSeconds="10000" timeToLiveSeconds="60000" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> <cache name="WikiUserRoleCollection" @@ -172,7 +160,14 @@ overflowToDisk="false" timeToIdleSeconds="10000" timeToLiveSeconds="60000" - diskPersistent="false" memoryStoreEvictionPolicy="LRU"/> + <cache name="WikiPageFragmentCache" + maxElementsInMemory="500" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="1000" + timeToLiveSeconds="6000" + memoryStoreEvictionPolicy="LRU"/> + </ehcache> \ No newline at end of file Modified: trunk/examples/wiki/src/etc/i18n/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_en.properties 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/etc/i18n/messages_en.properties 2008-04-03 11:17:41 UTC (rev 7806) @@ -672,7 +672,7 @@ lacewiki.msg.ImportOk=Created file '{0}' in current directory. lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Your workspace has been closed. lacewiki.msg.AccessDenied=Access Denied -lacewiki.msg.FatalError=Request failed, please check the application log or contact the administrator! +lacewiki.msg.FatalError=Request failed, please check the application log or contact the administrator lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted. lacewiki.msg.AutomaticallyGeneratedFeed=Aggregated Feed Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedConnectorPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedConnectorPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/feed/FeedConnectorPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.connectors.feed; - -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.annotations.Name; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("feedConnectorPreferencesSupport") -public class FeedConnectorPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(FeedConnectorPreferences.class) ); - }}; - } -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/jira/JiraConnectorPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/jira/JiraConnectorPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/connectors/jira/JiraConnectorPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.connectors.jira; - -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.annotations.Name; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("jiraConnectorPreferencesSupport") -public class JiraConnectorPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(JiraConnectorPreferences.class) ); - }}; - } -} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -45,7 +45,7 @@ private WikiDocument historicalCopy; private Boolean minorRevision; private String formContent; - Set<WikiFile> linkTargets; + private Set<WikiFile> linkTargets; private boolean enabledPreview = false; private boolean pushOnFeeds = false; private boolean pushOnSiteFeed = false; @@ -333,7 +333,7 @@ /* -------------------------- Public Features ------------------------------ */ // TODO: We need to duplicate this here, otherwise it will only validated on persist(): http://jira.jboss.com/jira/browse/JBSEAM-2671 - @Length(min = 0, max = 32768) + @Length(min = 0, max = 32767) public String getFormContent() { // Load the document content and resolve links if (formContent == null) syncInstanceToFormContent(getParentNode()); Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CorePreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CorePreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CorePreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,22 +0,0 @@ -package org.jboss.seam.wiki.core.action.prefs; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.HashSet; -import java.util.Set; - -@Name("corePreferencesSupport") -public class CorePreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(WikiPreferences.class) ); - add( createPreferenceEntity(UserManagementPreferences.class) ); - add( createPreferenceEntity(DocumentEditorPreferences.class) ); - add( createPreferenceEntity(CommentsPreferences.class) ); - }}; - } - -} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -58,7 +58,7 @@ visibility = PreferenceVisibility.SYSTEM, editorIncludeName = "AdaptiveTextInput" ) - @Length(min = 0, max = 1024) + @Length(min = 0, max = 1023) private String homepageDefaultContent; public String getActivationCodeSalt() { Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheManager.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheManager.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheManager.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.core.cache; + +import org.jboss.seam.annotations.*; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.Component; +import org.jboss.seam.ScopeType; +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.log.Logging; +import org.jboss.seam.log.LogProvider; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.management.ManagementService; + +import javax.management.MBeanServer; +import java.lang.management.ManagementFactory; + +/** + * Seam-managed EHCache backend, starts and stops one CacheManager per application. + * + * @author Christian Bauer + */ +@BypassInterceptors +public class EHCacheManager { + + private static final LogProvider log = Logging.getLogProvider(EHCacheManager.class); + + private CacheManager manager; + private boolean registerMonitoring = true; + + public boolean isRegisterMonitoring() { + return registerMonitoring; + } + + public void setRegisterMonitoring(boolean registerMonitoring) { + this.registerMonitoring = registerMonitoring; + } + + @Create + public void initCacheManager() { + log.info("initalizing EHCacheManager from /ehcache.xml"); + manager = CacheManager.create(); + + if (isRegisterMonitoring()) { + // Register statistics MBean of EHCache on the current MBean server + log.info("registering EHCache monitoring MBean"); + MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); + ManagementService.registerMBeans(manager, mBeanServer, false, false, false, true); + } + } + + @Destroy + public void shutdownCacheManager() { + log.info("shutting down EHCacheManager"); + manager.shutdown(); + manager = null; + } + + @Unwrap + public CacheManager getCacheManager() { + return manager; + } + + public static CacheManager instance() { + if (!Contexts.isApplicationContextActive()) { + throw new IllegalStateException("No active application scope"); + } + return (CacheManager)Component.getInstance("ehCacheManager"); + } +} Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheProvider.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheProvider.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/EHCacheProvider.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.core.cache; + +import org.hibernate.cache.*; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Properties; + +import net.sf.ehcache.CacheManager; + +/** + * Cache provider for Hibernate that utilizes Seam-managed EHCache backend. + * + * @author Christian Bauer + */ +public class EHCacheProvider implements CacheProvider { + + private static final Log log = LogFactory.getLog(EHCacheProvider.class); + + protected CacheManager getCacheManager() { + return EHCacheManager.instance(); + } + + public void start(Properties properties) throws CacheException { + // NOOP, started by EHCacheManager Seam component + } + + public void stop() { + // NOOP, destroyed by EHCacheManager Seam component + } + + public Cache buildCache(String name, Properties properties) throws CacheException { + try { + net.sf.ehcache.Cache cache = getCacheManager().getCache(name); + if (cache == null) { + log.warn("Could not find configuration [" + name + "]; using defaults."); + getCacheManager().addCache(name); + cache = getCacheManager().getCache(name); + log.debug("started EHCache region: " + name); + } + return new EhCache(cache); + } + catch (net.sf.ehcache.CacheException e) { + throw new CacheException(e); + } + } + + public long nextTimestamp() { + return Timestamper.next(); + } + + public boolean isMinimalPutsEnabledByDefault() { + return false; + } +} Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/PageFragmentCache.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/PageFragmentCache.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/cache/PageFragmentCache.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.core.cache; + +import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; +import org.jboss.seam.Component; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; + +import java.io.Serializable; + +/** + * Override Seam built-in pojoCache component with EHCache implementation. + * + * @author Christian Bauer + */ + +@BypassInterceptors +public class PageFragmentCache { + + private static final LogProvider log = Logging.getLogProvider(PageFragmentCache.class); + + public static final String CACHE_REGION_NAME = "WikiPageFragmentCache"; + + // This is threadsafe + Cache cache; + + @Create + public void start() throws Exception { + + log.info("starting wiki page fragment cache region"); + try { + CacheManager manager = EHCacheManager.instance(); + + cache = EHCacheManager.instance().getCache(CACHE_REGION_NAME); + if (cache == null) { + log.warn("Could not find configuration [" + CACHE_REGION_NAME + "]; using defaults."); + manager.addCache(CACHE_REGION_NAME); + cache = manager.getCache(CACHE_REGION_NAME); + log.debug("started EHCache region: " + CACHE_REGION_NAME); + } + + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public void put(Serializable key, String content) { + cache.put(new Element(key, content)); + } + + public String get(Serializable key) { + Element result = cache.get(key); + return result != null ? (String)result.getValue() : null; + } + + public void remove(Serializable key) { + cache.remove(key); + } + + public static PageFragmentCache instance() { + if (!Contexts.isApplicationContextActive()) { + throw new IllegalStateException("No active application scope"); + } + return (PageFragmentCache) Component.getInstance(PageFragmentCache.class, ScopeType.APPLICATION); + } + +} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -46,71 +46,6 @@ <dialect-scope name="org.hibernate.dialect.HSQLDialect"/> </database-object> -  -  @@ -119,14 +54,14 @@ alter table WIKI_TAG drop foreign key FK_WIKI_TAG_FILE_ID; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> <create> alter table WIKI_TAG add constraint FK_WIKI_TAG_FILE_ID foreign key (FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -134,14 +69,14 @@ alter table WIKI_FILE_LINK drop foreign key FK_SOURCE_WIKI_FILE_ID; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> <create> alter table WIKI_FILE_LINK add constraint FK_SOURCE_WIKI_FILE_ID foreign key (SOURCE_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -149,128 +84,24 @@ alter table WIKI_FILE_LINK drop foreign key FK_TARGET_WIKI_FILE_ID; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> <create> alter table WIKI_FILE_LINK add constraint FK_TARGET_WIKI_FILE_ID foreign key (TARGET_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade; </create> <drop/> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> -  - <database-object> - <create> create index IDX_PREFERENCE_ENTITY_NAME on PREFERENCE (ENTITY_NAME) </create> <drop> drop index IDX_PREFERENCE_ENTITY_NAME </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -280,7 +111,7 @@ <drop> drop index IDX_PREFERENCE_ENTITY_PROPERTY_NAME </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -290,7 +121,7 @@ <drop> drop index IDX_WIKI_NODE_RATING </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -300,7 +131,7 @@ <drop> drop index IDX_WIKI_NODE_READ_ACCESS_LEVEL </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -310,7 +141,7 @@ <drop> drop index IDX_WIKI_NODE_CREATED_ON </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -320,7 +151,7 @@ <drop> drop index IDX_WIKI_DIRECTORY_NS_LEFT </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -330,7 +161,7 @@ <drop> drop index IDX_WIKI_DIRECTORY_NS_RIGHT </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -340,7 +171,7 @@ <drop> drop index IDX_WIKI_DIRECTORY_NS_THREAD </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -350,7 +181,7 @@ <drop> drop index IDX_WIKI_COMMENT_NS_LEFT </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -360,7 +191,7 @@ <drop> drop index IDX_WIKI_COMMENT_NS_RIGHT </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -370,7 +201,7 @@ <drop> drop index IDX_WIKI_COMMENT_NS_THREAD </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> <database-object> @@ -380,7 +211,7 @@ <drop> drop index IDX_WIKI_DOCUMENT_HEADER_MACROS </drop> - <dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/> + <dialect-scope name="org.jboss.seam.wiki.util.WikiMySQL5HibernateDialect"/> </database-object> </hibernate-mapping> Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -23,16 +23,16 @@ @Column(name = "FEED_ID") private Long id; - @Column(name = "FEED_LINK", nullable = false, length = 1024) + @Column(name = "FEED_LINK", nullable = false, length = 1023) private String link; - @Column(name = "TITLE", nullable = false, length = 1024) + @Column(name = "TITLE", nullable = false, length = 1023) private String title; - @Column(name = "DESCRIPTION", nullable = true, length = 1024) + @Column(name = "DESCRIPTION", nullable = true, length = 1023) private String description; - @Column(name = "AUTHOR", nullable = false, length = 1024) + @Column(name = "AUTHOR", nullable = false, length = 1023) private String author; @Column(name = "PUBLISHED_ON", nullable = false, updatable = false) Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -32,11 +32,11 @@ protected int version = 0; @Column(name = "LINK", nullable = false) - @Length(min = 3, max = 1024) + @Length(min = 3, max = 1023) private String link; @Column(name = "TITLE", nullable = false) - @Length(min = 3, max = 1024) + @Length(min = 3, max = 1023) private String title; @Transient @@ -60,7 +60,7 @@ private String descriptionType; @Column(name = "DESCRIPTION_VALUE", nullable = false) - @Length(min = 1, max = 32768) + @Length(min = 1, max = 32767) private String descriptionValue; public FeedEntry() {} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml 2008-04-03 11:17:41 UTC (rev 7806) @@ -25,7 +25,7 @@ <property name="lastModifiedByUsername" column="LAST_MODIFIED_BY_USERNAME" not-null="false"/>  - <property name="content" column="CONTENT" length="32768"/> + <property name="content" column="CONTENT" length="32767"/> </class> Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -34,7 +34,7 @@ private String prefix; @Column(name = "LINK", nullable = false) - @Length(min = 3, max = 1000) + @Length(min = 3, max = 1023) private String link; public LinkProtocol() {} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserProfile.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserProfile.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserProfile.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -28,11 +28,11 @@ @Column(name = "CREATED_ON", nullable = false, updatable = false) private Date createdOn = new Date(); - @Length(min = 0, max = 1000) + @Length(min = 0, max = 1023) @Column(name = "BIO", nullable = true) private String bio; - @Length(min = 0, max = 1000) + @Length(min = 0, max = 1023) @Column(name = "WEBSITE", nullable = true) private String website; @@ -40,11 +40,11 @@ @Column(name = "LOCATION", nullable = true) private String location; - @Length(min = 0, max = 1000) + @Length(min = 0, max = 1023) @Column(name = "OCCUPATION", nullable = true) private String occupation; - @Length(min = 0, max = 1000) + @Length(min = 0, max = 1023) @Column(name = "SIGNATURE", nullable = true) private String signature; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -16,7 +16,6 @@ @Entity @Table(name = "WIKI_COMMENT") @org.hibernate.annotations.ForeignKey(name = "FK_WIKI_COMMENT_NODE_ID") -//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE) @org.hibernate.search.annotations.Indexed @Searchable(description = "Comments") @@ -43,11 +42,11 @@ private String fromUserEmail; @Column(name = "FROM_USER_HOMEPAGE", nullable = true) - @Length(min = 0, max = 1000) + @Length(min = 0, max = 1023) private String fromUserHomepage; @Column(name = "CONTENT", nullable = false) - @Length(min = 1, max = 32768) + @Length(min = 1, max = 32767) @Basic(fetch = FetchType.LAZY) // Lazy loaded through bytecode instrumentation @org.hibernate.search.annotations.Field(index = org.hibernate.search.annotations.Index.TOKENIZED) private String content; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -31,24 +31,24 @@ private boolean enableCommentsOnFeeds = true; @Column(name = "HEADER", nullable = true) - @Length(min = 0, max = 4000) + @Length(min = 0, max = 1023) private String header; - @Column(name = "HEADER_MACROS", nullable = true, length = 4000) + @Column(name = "HEADER_MACROS", nullable = true, length = 1023) private String headerMacrosString; @Column(name = "CONTENT", nullable = false) - @Length(min = 0, max = 32768) + @Length(min = 0, max = 32767) @Basic(fetch = FetchType.LAZY) // Lazy loaded through bytecode instrumentation @org.hibernate.search.annotations.Field(index = org.hibernate.search.annotations.Index.TOKENIZED) @Searchable(description = "Content") private String content; - @Column(name = "CONTENT_MACROS", nullable = true, length = 4000) + @Column(name = "CONTENT_MACROS", nullable = true, length = 1023) private String contentMacrosString; @Column(name = "FOOTER", nullable = true) - @Length(min = 0, max = 4000) + @Length(min = 0, max = 1023) private String footer; - @Column(name = "FOOTER_MACROS", nullable = true, length = 4000) + @Column(name = "FOOTER_MACROS", nullable = true, length = 1023) private String footerMacrosString; public WikiDocument() { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceValue.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -54,7 +54,7 @@ @Column( name="DOUBLE_VALUE"), @Column( name="TIMESTAMP_VALUE"), @Column( name="BOOLEAN_VALUE"), - @Column( name="STRING_VALUE", length = 1024) + @Column( name="STRING_VALUE", length = 1023) } ) private Object value; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -10,7 +10,6 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; import org.jboss.seam.wiki.core.model.Role; import org.jboss.seam.wiki.core.search.metamodel.SearchRegistry; import org.jboss.seam.wiki.core.search.metamodel.SearchableEntity; @@ -101,66 +100,4 @@ } } - - @Name("treeNodeAdapter") - public static class TreeNodeAdapter { - - /* TODO: Fixme or deleteme - @Factory(value = "writableDirectoryTree", scope = ScopeType.CONVERSATION, autoCreate = true) - public TreeNode loadWritableDirectoryTree() { - Directory wikiroot = (Directory) Component.getInstance("restrictedWikiRoot"); - return new WikiTreeNode(wikiroot, true); - } - @Factory(value = "readableDirectoryTree", scope = ScopeType.CONVERSATION, autoCreate = true) - public TreeNode loadReadableDirectoryTree() { - Directory wikiroot = (Directory) Component.getInstance("restrictedWikiRoot"); - return new WikiTreeNode(wikiroot, false); - } - class WikiTreeNode implements TreeNode { - boolean onlyWritableChildren; - private Node wikiNode; - private Map<Object, TreeNode> childrenMap = new LinkedHashMap<Object,TreeNode>(); - - public WikiTreeNode(Node wikiNode, boolean onlyWritableChildren) { - if (wikiNode != null) { - this.wikiNode = wikiNode; - this.onlyWritableChildren = onlyWritableChildren; - for (Node childNode : wikiNode.getChildren()) { - if (!WikiUtil.isDirectory(childNode)) continue; - if (onlyWritableChildren && !Identity.instance().hasPermission("Node", "edit", childNode)) continue; - childrenMap.put(childNode.getId(), new WikiTreeNode(childNode, onlyWritableChildren)); - } - } - } - public Object getData() { return wikiNode; } - public void setData(Object node) { this.wikiNode = (Node)node; } - - public boolean isLeaf() { - return childrenMap.size() == 0; - } - public Iterator getChildren() { - return childrenMap.entrySet().iterator(); - } - public TreeNode getChild(Object identifier) { - return childrenMap.get( identifier ); - } - public void addChild(Object identifier, TreeNode treeNode) { - childrenMap.put(identifier, treeNode); - } - public void removeChild(Object identifier) { - // Immutable - } - - public TreeNode getParent() { - return new WikiTreeNode(wikiNode.getParent(), onlyWritableChildren); - } - - public void setParent(TreeNode treeNode) { - // Immutable - } - } - */ - - } - } Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiPageFragmentCacheRenderer.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiPageFragmentCacheRenderer.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiPageFragmentCacheRenderer.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.core.ui; + +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; +import org.jboss.seam.ui.component.UICache; +import org.jboss.seam.ui.util.cdk.RendererBase; +import org.jboss.seam.wiki.core.cache.PageFragmentCache; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Serializable; + +/** + * Implementation of <tt><s:cache></tt> renderer based on EHCache. + * + * @author Christian Bauer + */ +public class WikiPageFragmentCacheRenderer extends RendererBase { + + private static final LogProvider log = Logging.getLogProvider(UICache.class); + + @Override + protected Class getComponentClass() { + return UICache.class; + } + + @Override + protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + UICache cache = (UICache) component; + if (cache.isEnabled()) { + String key = cache.getKey(); + String cachedContent = getFromCache(key); + if (cachedContent == null) { + log.debug("rendering from scratch: " + key); + StringWriter stringWriter = new StringWriter(); + ResponseWriter cachingResponseWriter = writer.cloneWithWriter(stringWriter); + context.setResponseWriter(cachingResponseWriter); + renderChildren(context, component); + context.setResponseWriter(writer); + String output = stringWriter.getBuffer().toString(); + writer.write(output); + putInCache(key, output); + } else { + log.debug("rendering from cache: " + key); + writer.write(cachedContent); + } + } else { + log.debug("cached rendering is disabled for: " + cache.getKey()); + renderChildren(context, component); + } + } + + + @Override + public boolean getRendersChildren() { + return true; + } + + public static void putInCache(Serializable key, String content) { + PageFragmentCache.instance().put(key, content); + } + + public static String getFromCache(Serializable key) { + return PageFragmentCache.instance().get(key); + } + +} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiSecurityEvents.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -15,6 +15,8 @@ import javax.faces.application.FacesMessage; /** + * Overrides the "login failed" message and turns it into a WARN (we don't want INFO here). + * * @author Christian Bauer */ @Name("org.jboss.seam.security.facesSecurityEvents") Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +1,24 @@ package org.jboss.seam.wiki.core.ui; -import org.jboss.seam.annotations.remoting.WebRemote; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.ScopeType; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.ui.validator.FormattedTextValidator; -import java.util.Map; -import java.util.HashMap; import java.io.Serializable; import javax.faces.validator.ValidatorException; import javax.faces.application.FacesMessage; /** - * Store UI status of wiki text editor. + * Utility class bound to Wiki text editor UI. * <p> * * @author Christian Bauer */ @Name("wikiTextEditor") -(a)Scope(ScopeType.CONVERSATION) // TODO: Should be PAGE but doesn't work with Seam remoting! +(a)Scope(ScopeType.CONVERSATION) public class WikiTextEditor implements Serializable { public void validate(String textEditorId, String value) { Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,28 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.blogdirectory; - -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.annotations.Name; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("blogPreferencesSupport") -public class BlogPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(BlogPreferences.class) ); - }}; - } - -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenuPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenuPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenuPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,48 +0,0 @@ -package org.jboss.seam.wiki.plugin.dirMenu; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.HashSet; -import java.util.Set; - -@Name("dirMenuPreferencesSupport") -public class DirMenuPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(DirMenuPreferences.class) ); - }}; - } - -/* TODO: Too complicated for now... - - @Name("dirMenuQualityPreferenceValueTemplate") - @Scope(ScopeType.CONVERSATION) - public static class DirMenuQualityTemplate implements PreferenceValueTemplate { - - public List<String> getTemplateValues() { - return Collections.emptyList(); - } - - public String getConverterComponentName() { - return "dirMenuQualityConverter"; - } - } - - @Name("dirMenuQualityConverter") - @org.jboss.seam.annotations.faces.Converter - public static class DirMenuQualityConverter implements Converter, Serializable { - - public Object getAsObject(javax.faces.context.FacesContext facesContext, UIComponent uiComponent, String s) { - return s != null ? DirMenuQuality.valueOf(s) : null; - } - - public String getAsString(javax.faces.context.FacesContext facesContext, UIComponent uiComponent, Object o) { - return o instanceof DirMenuQuality ? ((DirMenuQuality)o).name() : null; - } - - } - */ -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirToc/DirTocPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirToc/DirTocPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirToc/DirTocPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.dirToc; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; - -import java.util.Set; -import java.util.HashSet; - -/** - * @author Christian Bauer - */ -@Name("dirTocPreferencesSupport") -public class DirTocPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(DirTocPreferences.class) ); - }}; - } -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/docPager/DocPagerPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/docPager/DocPagerPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/docPager/DocPagerPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,28 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.docPager; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("docPagerPreferencesSupport") -public class DocPagerPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(DocPagerPreferences.class) ); - }}; - } - -} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferences.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -34,7 +34,7 @@ visibility = {PreferenceVisibility.INSTANCE}, editorIncludeName = "AdaptiveTextInput" ) - @Length(min = 0, max = 4000) + @Length(min = 0, max = 4096) private String urls; @PreferenceProperty( Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedAggregator/FeedAggregatorPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.feedAggregator; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("feedAggregatorPreferencesSupport") -public class FeedAggregatorPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(FeedAggregatorPreferences.class) ); - }}; - } -} Copied: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersFeedPreferenceValueTemplate.java (from rev 7541, trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersPreferencesSupport.java) =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersFeedPreferenceValueTemplate.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersFeedPreferenceValueTemplate.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.plugin.feedTeasers; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.wiki.core.feeds.FeedDAO; +import org.jboss.seam.wiki.core.model.Feed; +import org.jboss.seam.wiki.preferences.PreferenceValueTemplate; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Christian Bauer + */ +@Name("feedTeasersFeedPreferenceValueTemplate") +(a)Scope(ScopeType.CONVERSATION) +public class FeedTeasersFeedPreferenceValueTemplate implements PreferenceValueTemplate, Serializable { + + @In + FeedDAO feedDAO; + + List<String> feedIdentifiers; + + public List<String> getTemplateValues() { + if (feedIdentifiers == null) { + List<Feed> feeds = feedDAO.findAllFeeds(); + for (Feed feed : feeds) { + feedIdentifiers.add(feed.getId().toString()); + } + } + return feedIdentifiers; + } + +} Property changes on: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersFeedPreferenceValueTemplate.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/feedTeasers/FeedTeasersPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.feedTeasers; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.wiki.core.feeds.FeedDAO; -import org.jboss.seam.wiki.core.model.Feed; -import org.jboss.seam.wiki.preferences.PreferenceValueTemplate; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.io.Serializable; - -/** - * @author Christian Bauer - */ -@Name("feedTeasersPreferencesSupport") -public class FeedTeasersPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(FeedTeasersPreferences.class) ); - }}; - } - - @Name("feedTeasersFeedPreferenceValueTemplate") - @Scope(ScopeType.CONVERSATION) - public static class FeedTeasersFeedTemplate implements PreferenceValueTemplate, Serializable { - - @In - FeedDAO feedDAO; - - List<String> feedIdentifiers; - - public List<String> getTemplateValues() { - if (feedIdentifiers == null) { - List<Feed> feeds = feedDAO.findAllFeeds(); - for (Feed feed : feeds) { - feedIdentifiers.add(feed.getId().toString()); - } - } - return feedIdentifiers; - } - - } - -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/flash/FlashPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,19 +0,0 @@ -package org.jboss.seam.wiki.plugin.flash; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; - -import java.util.Set; -import java.util.HashSet; - -@Name("flashPreferencesSupport") -public class FlashPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(FlashPreferences.class) ); - }}; - } - -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,28 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.forum; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.Set; -import java.util.HashSet; - -/** - * @author Christian Bauer - */ -@Name("forumPreferencesSupport") -public class ForumPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(ForumPreferences.class) ); - add( createPreferenceEntity(ForumTopPostersPreferences.class) ); - }}; - } -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/jiraIssueList/JiraIssueListPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/jiraIssueList/JiraIssueListPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/jiraIssueList/JiraIssueListPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.jiraIssueList; - -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.annotations.Name; - -import java.util.HashSet; -import java.util.Set; - -/** - * @author Christian Bauer - */ -@Name("jiraIssueListPreferencesSupport") -public class JiraIssueListPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(JiraIssueListPreferences.class) ); - }}; - } -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/lastmodified/LastModifiedDocumentsPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,19 +0,0 @@ -package org.jboss.seam.wiki.plugin.lastmodified; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; - -import java.util.HashSet; -import java.util.Set; - -@Name("lastModifiedDocumentsPreferencesSupport") -public class LastModifiedDocumentsPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(LastModifiedDocumentsPreferences.class) ); - }}; - } - -} Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/tags/TagsPreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/tags/TagsPreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/tags/TagsPreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,27 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.plugin.tags; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity; -import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport; - -import java.util.Set; -import java.util.HashSet; - -/** - * @author Christian Bauer - */ -@Name("tagsPreferencesSupport") -public class TagsPreferencesSupport extends PreferencesSupport { - - public Set<PreferenceEntity> getPreferenceEntities() { - return new HashSet<PreferenceEntity>() {{ - add( createPreferenceEntity(TagsPreferences.class) ); - }}; - } -} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferenceRegistry.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferenceRegistry.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferenceRegistry.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,13 +1,10 @@ package org.jboss.seam.wiki.preferences.metamodel; import org.jboss.seam.ScopeType; -import org.jboss.seam.wiki.preferences.PreferenceVisibility; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.*; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Events; import org.jboss.seam.log.Log; +import org.jboss.seam.wiki.preferences.PreferenceVisibility; import java.util.*; @@ -18,6 +15,12 @@ @Logger static Log log; + @In( + value="#{deploymentStrategy.annotatedClasses['org.jboss.seam.wiki.preferences.annotations.Preferences']}", + required = false + ) + Set<Class> preferencesClasses; + Set<PreferenceEntity> preferenceEntities = new HashSet<PreferenceEntity>(); Map<String, PreferenceEntity> preferenceEntitiesByName = new HashMap<String, PreferenceEntity>(); @@ -26,36 +29,33 @@ Set<PreferenceEntity> preferenceEntitiesInstance = new HashSet<PreferenceEntity>(); @Observer("Wiki.started") - public void scanForPreferencesSupportComponents() { - + public void create() { log.debug("initializing preferences registry"); - // Fire an event and let all listeners add themself into the given collection - Set<PreferencesSupport> preferencesSupportComponents = new HashSet<PreferencesSupport>(); - Events.instance().raiseEvent("Preferences.addPreferencesSupport", preferencesSupportComponents); + if (preferencesClasses == null) + throw new RuntimeException("Add @Preferences annotation to META-INF/seam-deployment.properties"); - log.debug("found preferences support components: " + preferencesSupportComponents.size()); + for (Class preferencesClass : preferencesClasses) { + PreferenceEntity preferenceEntity = new PreferenceEntity(preferencesClass); - for (PreferencesSupport component : preferencesSupportComponents) { + log.debug("adding '" + preferenceEntity.getEntityName() + "', " + preferenceEntity); - for (PreferenceEntity preferenceEntity : component.getPreferenceEntities()) { - log.debug("adding '" + preferenceEntity.getEntityName() + "', " + preferenceEntity); + if (preferenceEntitiesByName.containsKey(preferenceEntity.getEntityName())) { + throw new RuntimeException("Duplicate preference entity name: " + preferenceEntity.getEntityName()); + } - if (preferenceEntitiesByName.containsKey(preferenceEntity.getEntityName())) { - throw new RuntimeException("Duplicate preference entity name: " + preferenceEntity.getEntityName()); - } + preferenceEntities.add(preferenceEntity); + preferenceEntitiesByName.put(preferenceEntity.getEntityName(), preferenceEntity); - preferenceEntities.add(preferenceEntity); - preferenceEntitiesByName.put(preferenceEntity.getEntityName(), preferenceEntity); + if (preferenceEntity.isSystemPropertiesVisible()) + preferenceEntitiesSystem.add(preferenceEntity); + if (preferenceEntity.isUserPropertiesVisible()) + preferenceEntitiesUser.add(preferenceEntity); + if (preferenceEntity.isInstancePropertiesVisible()) + preferenceEntitiesInstance.add(preferenceEntity); + } - if (preferenceEntity.isSystemPropertiesVisible()) - preferenceEntitiesSystem.add(preferenceEntity); - if (preferenceEntity.isUserPropertiesVisible()) - preferenceEntitiesUser.add(preferenceEntity); - if (preferenceEntity.isInstancePropertiesVisible()) - preferenceEntitiesInstance.add(preferenceEntity); - } - } + } public Set<PreferenceEntity> getPreferenceEntities() { Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferencesSupport.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferencesSupport.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/preferences/metamodel/PreferencesSupport.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.wiki.preferences.metamodel; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; - -import java.util.Set; - -(a)Scope(ScopeType.APPLICATION) -public abstract class PreferencesSupport { - - @Observer("Preferences.addPreferencesSupport") - public void add(Set<PreferencesSupport> preferencesSupportComponents) { - preferencesSupportComponents.add(this); - } - - public abstract Set<PreferenceEntity> getPreferenceEntities(); - - public PreferenceEntity createPreferenceEntity(Class preferenceEntityClass) { - return new PreferenceEntity(preferenceEntityClass); - } - - -} \ No newline at end of file Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiMySQL5HibernateDialect.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiMySQL5HibernateDialect.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiMySQL5HibernateDialect.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.seam.wiki.util; + +import org.hibernate.dialect.MySQL5InnoDBDialect; + +import java.sql.Types; + +/** + * Fix the broken Hibernate defaults for MySQL databases with UTF-8 encoding. + * + * @author Christian Bauer + */ +public class WikiMySQL5HibernateDialect extends MySQL5InnoDBDialect { + + protected void registerVarcharTypes() { + registerColumnType( Types.VARCHAR, "longtext" ); + registerColumnType( Types.VARCHAR, 16777215, "mediumtext" ); + + // It's pretty safe to assume that anything with more than 1024 characters (minus length byte) should probably be + // a TEXT, not a VARCHAR which would have the "maximum row size" limit of 65KB. + // I mean, where is the limit? If you have 20 of these VARCHAR fields on a table, and your character set is + // UTF8, you are over the limit. Less than 20 or so should be OK. Just another fine example of how MySQL + // protects its users from seeing its ugly internal implementation details. + registerColumnType( Types.VARCHAR, 1023, "varchar($l)" ); + } +} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-04-03 11:17:41 UTC (rev 7806) @@ -10,6 +10,7 @@ import org.jboss.seam.security.Identity; import org.jboss.seam.wiki.core.action.prefs.WikiPreferences; import org.jboss.seam.wiki.core.model.*; +import org.jboss.seam.wiki.core.engine.WikiMacro; import org.jboss.seam.wiki.preferences.Preferences; import javax.faces.context.FacesContext; @@ -292,7 +293,8 @@ } public static String formatDate(Date date) { - SimpleDateFormat fmt = new SimpleDateFormat("MMM dd, yyyy hh:mm aaa"); + // TODO: Exceptional date formatting here... + SimpleDateFormat fmt = new SimpleDateFormat("MMM dd, yyyy HH:mm"); return fmt.format(date); } @@ -335,4 +337,12 @@ return msgId.toString(); } + public static String macroCacheKey(WikiDocument currentDocument, WikiMacro macro) { + Hash hash = (Hash)Component.getInstance(Hash.class); + + StringBuilder builder = new StringBuilder(); + builder.append(currentDocument.getId()).append(macro.hashCode()).append(macro.getParams().hashCode()); + return macro.getName() + "-" + hash.hash(builder.toString()); + } + } Modified: trunk/examples/wiki/view/docEdit_d.xhtml =================================================================== --- trunk/examples/wiki/view/docEdit_d.xhtml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/view/docEdit_d.xhtml 2008-04-03 11:17:41 UTC (rev 7806) @@ -180,7 +180,7 @@ <ui:param name="textEditorColumns" value="#{preferences.get('DocEditor').regularEditAreaColumns}"/> <ui:param name="textEditorRows" value="#{preferences.get('DocEditor').regularEditAreaRows}"/> <ui:param name="valueBinding" value="#{documentHome.formContent}"/> - <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueMaxLength" value="32767"/> <ui:param name="valueRequired" value="true"/> </ui:include> Modified: trunk/examples/wiki/view/includes/commentForm.xhtml =================================================================== --- trunk/examples/wiki/view/includes/commentForm.xhtml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/view/includes/commentForm.xhtml 2008-04-03 11:17:41 UTC (rev 7806) @@ -87,7 +87,7 @@ <ui:param name="namingContainer" value="commentForm"/> <ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/> <ui:param name="valueBinding" value="#{commentHome.instance.content}"/> - <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueMaxLength" value="32767"/> <ui:param name="valueRequired" value="true"/> <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '60' : '48'}"/> <ui:param name="textEditorRows" value="10"/> Modified: trunk/examples/wiki/view/plugins/faqBrowser/faqQuestionForm.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/faqBrowser/faqQuestionForm.xhtml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/view/plugins/faqBrowser/faqQuestionForm.xhtml 2008-04-03 11:17:41 UTC (rev 7806) @@ -33,7 +33,7 @@ <ui:param name="namingContainer" value="faqBrowserPlugin\\\\:faqQuestionForm"/> <ui:param name="label" value="#{messages['faqBrowser.label.QuestionText']}"/> <ui:param name="valueBinding" value="#{faqQuestionHome.formContent}"/> - <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueMaxLength" value="32767"/> <ui:param name="valueRequired" value="true"/> <ui:param name="textEditorColumns" value="60"/> <ui:param name="textEditorRows" value="20"/> Modified: trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-04-03 11:17:41 UTC (rev 7806) @@ -80,7 +80,7 @@ <ui:param name="namingContainer" value="forumRepliesPlugin\\\\:replyForm"/> <ui:param name="label" value="#{messages['forum.label.replyForm.Message']}"/> <ui:param name="valueBinding" value="#{replyHome.instance.content}"/> - <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueMaxLength" value="32767"/> <ui:param name="valueRequired" value="true"/> <ui:param name="textEditorColumns" value="#{replyHome.instance.ownedByRegularUser ? '65' : '55'}"/> <ui:param name="textEditorRows" value="20"/> Modified: trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml 2008-04-03 09:16:30 UTC (rev 7805) +++ trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml 2008-04-03 11:17:41 UTC (rev 7806) @@ -34,7 +34,7 @@ <ui:param name="namingContainer" value="forumTopicsPlugin\\\\:topicForm"/> <ui:param name="label" value="#{messages['forum.label.Message']}"/> <ui:param name="valueBinding" value="#{topicHome.formContent}"/> - <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueMaxLength" value="32767"/> <ui:param name="valueRequired" value="true"/> <ui:param name="textEditorColumns" value="60"/> <ui:param name="textEditorRows" value="20"/>

17 years, 8 months

1
0
0 / 0

Seam SVN: r7805 - trunk/src/main/org/jboss/seam/security/permission.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-04-03 05:16:30 -0400 (Thu, 03 Apr 2008) New Revision: 7805 Modified: trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java Log: change log priority to debug Modified: trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2008-04-03 07:20:56 UTC (rev 7804) +++ trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2008-04-03 09:16:30 UTC (rev 7805) @@ -68,7 +68,7 @@ if (getSecurityContext() == null) { - log.warn("no security rule base available - please install a RuleBase with the name '" + + log.debug("no security rule base available - please install a RuleBase with the name '" + RULES_COMPONENT_NAME + "' if permission checks are required."); } }

17 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2008