Shinsuke SUGAYA
shins****@users*****
2007年 3月 27日 (火) 16:38:03 JST
Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/etc/sql Modified Files: j2-seed.xml Log Message: updated to the latest j2 version pal-portal/portal/patches/etc/sql/j2-seed.xml 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/etc/sql/j2-seed.xml.diff?r1=1.3&r2=1.4 =================================================================== RCS file: pal-portal/portal/patches/etc/sql/j2-seed.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- j2-seed.xml 2007/03/10 23:20:35 1.3 +++ j2-seed.xml 2007/03/27 07:38:03 1.4 @@ -1,8 +1,8 @@ Index: etc/sql/j2-seed.xml =================================================================== ---- etc/sql/j2-seed.xml (リビジョン 514361) +--- etc/sql/j2-seed.xml (リビジョン 519203) +++ etc/sql/j2-seed.xml (作業コピー) -@@ -246,10 +246,13 @@ +@@ -262,10 +262,13 @@ <Role>manager</Role> <Role>user</Role> <Role>guest</Role> @@ -16,7 +16,7 @@ </Roles> <Groups> <Group>accounting</Group> -@@ -258,9 +261,10 @@ +@@ -274,9 +277,10 @@ </Groups> <Users> <User name="admin"> @@ -28,7 +28,7 @@ <preferences> <preference> <name value="org.apache.jetspeed.prefered.locale"/> -@@ -277,16 +281,18 @@ +@@ -293,16 +297,18 @@ <value value="Dudley"/> </preference> </userinfo> @@ -48,7 +48,7 @@ <User name="user"> <credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/> <roles>user</roles> -@@ -317,16 +323,18 @@ +@@ -333,16 +339,18 @@ <Rule locator="page" rule="role-fallback"/> </Rules> </User> @@ -69,7 +69,7 @@ <User name="subsite"> <credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/> <roles>user,subsite,subsite2</roles> -@@ -365,10 +373,21 @@ +@@ -381,10 +389,21 @@ <Rule locator="page" rule="user-role-fallback"/> </Rules> </User> @@ -92,7 +92,7 @@ <groups></groups> <users></users> </Permission> -@@ -377,6 +396,7 @@ +@@ -393,6 +412,7 @@ <groups></groups> <users></users> </Permission> @@ -100,7 +100,7 @@ <Permission type="folder" resource="/anotherdir/-" actions="view"> <roles>user</roles> <groups></groups> -@@ -437,6 +457,7 @@ +@@ -453,6 +473,7 @@ <groups></groups> <users>subsite2</users> </Permission> @@ -108,7 +108,7 @@ <Permission type="folder" resource="<<ALL FILES>>" actions="view, edit"> <roles>admin</roles> <groups></groups> -@@ -452,6 +473,7 @@ +@@ -468,6 +489,7 @@ <groups></groups> <users></users> </Permission> @@ -116,7 +116,7 @@ <Permission type="page" resource="/rss.psml" actions="view"> <roles>guest</roles> <groups></groups> -@@ -462,6 +484,7 @@ +@@ -478,6 +500,7 @@ <groups></groups> <users></users> </Permission> @@ -124,7 +124,7 @@ <Permission type="portal" resource="j2-admin::*" actions="view, edit"> <roles>admin</roles> <groups></groups> -@@ -472,11 +495,13 @@ +@@ -488,11 +511,13 @@ <groups></groups> <users></users> </Permission> @@ -138,7 +138,7 @@ </Permissions> <ProfilingRules> <ProfilingRule id="group-fallback" standardRule="false"> -@@ -616,6 +641,7 @@ +@@ -632,6 +657,7 @@ </Criterion> </Criteria> </ProfilingRule> @@ -146,7 +146,7 @@ <ProfilingRule id="subsite-role-fallback-home" standardRule="false"> <description value="A rule based on role fallback algorithm with specified subsite and home page"/> <Criteria> -@@ -660,6 +686,7 @@ +@@ -676,6 +702,7 @@ </Criterion> </Criteria> </ProfilingRule> @@ -154,7 +154,7 @@ <ProfilingRule id="user-role-fallback" standardRule="false"> <description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> <Criteria> -@@ -714,5 +741,32 @@ +@@ -730,5 +757,32 @@ </Criterion> </Criteria> </ProfilingRule>
