| 1 |
Index: etc/sql/j2-seed.xml |
Index: etc/sql/j2-seed.xml |
| 2 |
=================================================================== |
=================================================================== |
| 3 |
--- etc/sql/j2-seed.xml (リビジョン 495818) |
--- etc/sql/j2-seed.xml (リビジョン 514361) |
| 4 |
+++ etc/sql/j2-seed.xml (作業コピー) |
+++ etc/sql/j2-seed.xml (作業コピー) |
| 5 |
@@ -244,8 +244,11 @@ |
@@ -246,10 +246,13 @@ |
| 6 |
<Role>manager</Role> |
<Role>manager</Role> |
| 7 |
<Role>user</Role> |
<Role>user</Role> |
| 8 |
<Role>guest</Role> |
<Role>guest</Role> |
| 9 |
+ <Role>site</Role> |
+ <Role>site</Role> |
| 10 |
+<!-- |
+<!-- |
| 11 |
<Role>subsite</Role> |
<Role>subsite</Role> |
| 12 |
<Role>subsite2</Role> |
<Role>subsite2</Role> |
| 13 |
+--> |
<Role>dev</Role> |
| 14 |
</Roles> |
<Role>devmgr</Role> |
| 15 |
<Groups> |
+--> |
| 16 |
<Group>accounting</Group> |
</Roles> |
| 17 |
@@ -254,21 +257,25 @@ |
<Groups> |
| 18 |
</Groups> |
<Group>accounting</Group> |
| 19 |
<Users> |
@@ -258,9 +261,10 @@ |
| 20 |
<User name="admin"> |
</Groups> |
| 21 |
- <credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/> |
<Users> |
| 22 |
+ <credentials password="@@ADMIN_PASSWORD@@" enabled="TRUE" requiresUpdate="TRUE"/> |
<User name="admin"> |
| 23 |
<roles>user,manager,admin</roles> |
- <credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/> |
| 24 |
<groups></groups> |
+ <credentials password="@@ADMIN_PASSWORD@@" enabled="TRUE" requiresUpdate="TRUE"/> |
| 25 |
<preferences org.apache.jetspeed.prefered.locale="en,,"/> |
<roles>user,manager,admin</roles> |
| 26 |
+<!-- |
<groups></groups> |
| 27 |
<userinfo user.name.given="Test Dude" user.name.family="Dudley"/> |
+<!-- |
| 28 |
+--> |
<preferences> |
| 29 |
+ <userinfo/> |
<preference> |
| 30 |
<Rules/> |
<name value="org.apache.jetspeed.prefered.locale"/> |
| 31 |
</User> |
@@ -277,16 +281,18 @@ |
| 32 |
<User name="manager"> |
<value value="Dudley"/> |
| 33 |
- <credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/> |
</preference> |
| 34 |
+ <credentials password="@@MANAGER_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/> |
</userinfo> |
| 35 |
<roles>user,manager</roles> |
+--> |
| 36 |
<groups></groups> |
<Rules/> |
| 37 |
<preferences/> |
</User> |
| 38 |
<userinfo/> |
<User name="manager"> |
| 39 |
<Rules/> |
- <credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/> |
| 40 |
</User> |
+ <credentials password="@@MANAGER_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/> |
| 41 |
+<!-- |
<roles>user,manager</roles> |
| 42 |
<User name="user"> |
<groups></groups> |
| 43 |
<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/> |
<preferences/> |
| 44 |
<roles>user</roles> |
<userinfo/> |
| 45 |
@@ -280,6 +287,18 @@ |
<Rules/> |
| 46 |
<Rule locator="page" rule="j2"/> |
</User> |
| 47 |
</Rules> |
+<!-- |
| 48 |
</User> |
<User name="user"> |
| 49 |
+--> |
<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/> |
| 50 |
+ <User name="site"> |
<roles>user</roles> |
| 51 |
+ <credentials password="@@SITE_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/> |
@@ -317,16 +323,18 @@ |
| 52 |
+ <roles>user,site</roles> |
<Rule locator="page" rule="role-fallback"/> |
| 53 |
+ <groups></groups> |
</Rules> |
| 54 |
+ <preferences/> |
</User> |
| 55 |
+ <userinfo/> |
+--> |
| 56 |
+ <Rules> |
<User name="guest"> |
| 57 |
+ <Rule locator="page" rule="site"/> |
<Null/> |
| 58 |
+ </Rules> |
- <roles>guest</roles> |
| 59 |
+ </User> |
+ <roles>guest,site</roles> |
| 60 |
+<!-- |
<groups></groups> |
| 61 |
<User name="tomcat"> |
<preferences/> |
| 62 |
<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/> |
<userinfo/> |
| 63 |
<roles></roles> |
<Rules> |
| 64 |
@@ -299,16 +318,18 @@ |
- <Rule locator="page" rule="j2"/> |
| 65 |
<Rule locator="page" rule="role-fallback"/> |
+ <Rule locator="page" rule="site"/> |
| 66 |
</Rules> |
</Rules> |
| 67 |
</User> |
</User> |
| 68 |
+--> |
+<!-- |
| 69 |
<User name="guest"> |
<User name="subsite"> |
| 70 |
<Null/> |
<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/> |
| 71 |
- <roles>guest</roles> |
<roles>user,subsite,subsite2</roles> |
| 72 |
+ <roles>guest,site</roles> |
@@ -365,10 +373,21 @@ |
| 73 |
<groups></groups> |
<Rule locator="page" rule="user-role-fallback"/> |
| 74 |
<preferences/> |
</Rules> |
| 75 |
<userinfo/> |
</User> |
| 76 |
<Rules> |
+--> |
| 77 |
- <Rule locator="page" rule="j2"/> |
+ <User name="site"> |
| 78 |
+ <Rule locator="page" rule="site"/> |
+ <credentials password="@@SITE_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/> |
| 79 |
</Rules> |
+ <roles>user,site</roles> |
| 80 |
</User> |
+ <groups></groups> |
| 81 |
+<!-- |
+ <preferences/> |
| 82 |
<User name="subsite"> |
+ <userinfo/> |
| 83 |
<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/> |
+ <Rules> |
| 84 |
<roles>subsite,subsite2</roles> |
+ <Rule locator="page" rule="site"/> |
| 85 |
@@ -329,10 +350,14 @@ |
+ </Rules> |
| 86 |
<Rule locator="page" rule="subsite2-role-fallback-home"/> |
+ </User> |
| 87 |
</Rules> |
</Users> |
| 88 |
</User> |
<Permissions> |
| 89 |
+--> |
<Permission type="folder" resource="/" actions="view"> |
| 90 |
</Users> |
- <roles>user,guest,subsite,subsite2</roles> |
| 91 |
<Permissions> |
+ <roles>user,guest</roles> |
| 92 |
<Permission type="folder" resource="/" actions="view"> |
<groups></groups> |
| 93 |
+<!-- |
<users></users> |
| 94 |
<roles>user,guest,subsite,subsite2</roles> |
</Permission> |
| 95 |
+--> |
@@ -377,6 +396,7 @@ |
| 96 |
+ <roles>user,guest</roles> |
<groups></groups> |
| 97 |
<groups></groups> |
<users></users> |
| 98 |
<users></users> |
</Permission> |
| 99 |
</Permission> |
+<!-- |
| 100 |
@@ -341,6 +366,7 @@ |
<Permission type="folder" resource="/anotherdir/-" actions="view"> |
| 101 |
<groups></groups> |
<roles>user</roles> |
| 102 |
<users></users> |
<groups></groups> |
| 103 |
</Permission> |
@@ -437,6 +457,7 @@ |
| 104 |
+<!-- |
<groups></groups> |
| 105 |
<Permission type="folder" resource="/anotherdir/-" actions="view"> |
<users>subsite2</users> |
| 106 |
<roles>user</roles> |
</Permission> |
| 107 |
<groups></groups> |
+--> |
| 108 |
@@ -371,6 +397,7 @@ |
<Permission type="folder" resource="<<ALL FILES>>" actions="view, edit"> |
| 109 |
<groups></groups> |
<roles>admin</roles> |
| 110 |
<users></users> |
<groups></groups> |
| 111 |
</Permission> |
@@ -452,6 +473,7 @@ |
| 112 |
+--> |
<groups></groups> |
| 113 |
<Permission type="folder" resource="/_user/user" actions="view, edit"> |
<users></users> |
| 114 |
<roles></roles> |
</Permission> |
| 115 |
<groups></groups> |
+<!-- |
| 116 |
@@ -381,6 +408,7 @@ |
<Permission type="page" resource="/rss.psml" actions="view"> |
| 117 |
<groups></groups> |
<roles>guest</roles> |
| 118 |
<users>user</users> |
<groups></groups> |
| 119 |
</Permission> |
@@ -462,6 +484,7 @@ |
| 120 |
+<!-- |
<groups></groups> |
| 121 |
<Permission type="folder" resource="/__subsite-root" actions="view"> |
<users></users> |
| 122 |
<roles>subsite,subsite2</roles> |
</Permission> |
| 123 |
<groups></groups> |
+--> |
| 124 |
@@ -411,6 +439,7 @@ |
<Permission type="portal" resource="j2-admin::*" actions="view, edit"> |
| 125 |
<groups></groups> |
<roles>admin</roles> |
| 126 |
<users>subsite2</users> |
<groups></groups> |
| 127 |
</Permission> |
@@ -472,11 +495,13 @@ |
| 128 |
+--> |
<groups></groups> |
| 129 |
<Permission type="folder" resource="<<ALL FILES>>" actions="view, edit"> |
<users></users> |
| 130 |
<roles>admin</roles> |
</Permission> |
| 131 |
<groups></groups> |
+<!-- |
| 132 |
@@ -426,6 +455,7 @@ |
<Permission type="portal" resource="rss::*" actions="view, edit"> |
| 133 |
<groups></groups> |
<roles>user</roles> |
| 134 |
<users></users> |
<groups></groups> |
| 135 |
</Permission> |
<users></users> |
| 136 |
+<!-- |
</Permission> |
| 137 |
<Permission type="page" resource="/rss.psml" actions="view"> |
+--> |
| 138 |
<roles>guest</roles> |
</Permissions> |
| 139 |
<groups></groups> |
<ProfilingRules> |
| 140 |
@@ -436,6 +466,7 @@ |
<ProfilingRule id="group-fallback" standardRule="false"> |
| 141 |
<groups></groups> |
@@ -616,6 +641,7 @@ |
| 142 |
<users></users> |
</Criterion> |
| 143 |
</Permission> |
</Criteria> |
| 144 |
+--> |
</ProfilingRule> |
| 145 |
<Permission type="portal" resource="j2-admin::*" actions="view, edit"> |
+<!-- |
| 146 |
<roles>admin</roles> |
<ProfilingRule id="subsite-role-fallback-home" standardRule="false"> |
| 147 |
<groups></groups> |
<description value="A rule based on role fallback algorithm with specified subsite and home page"/> |
| 148 |
@@ -446,11 +477,13 @@ |
<Criteria> |
| 149 |
<groups></groups> |
@@ -660,6 +686,7 @@ |
| 150 |
<users></users> |
</Criterion> |
| 151 |
</Permission> |
</Criteria> |
| 152 |
+<!-- |
</ProfilingRule> |
| 153 |
<Permission type="portal" resource="rss::*" actions="view, edit"> |
+--> |
| 154 |
<roles>user</roles> |
<ProfilingRule id="user-role-fallback" standardRule="false"> |
| 155 |
<groups></groups> |
<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> |
| 156 |
<users></users> |
<Criteria> |
| 157 |
</Permission> |
@@ -714,5 +741,32 @@ |
| 158 |
+--> |
</Criterion> |
| 159 |
</Permissions> |
</Criteria> |
| 160 |
<ProfilingRules> |
</ProfilingRule> |
| 161 |
<ProfilingRule id="group-fallback" standardRule="false"> |
+ <ProfilingRule id="site" standardRule="false"> |
| 162 |
@@ -590,6 +623,7 @@ |
+ <description value="A role based fallback algorithm for editing site"/> |
| 163 |
</Criterion> |
+ <Criteria> |
| 164 |
</Criteria> |
+ <Criterion name="user"> |
| 165 |
</ProfilingRule> |
+ <type value="user"/> |
| 166 |
+<!-- |
+ <fallBackOrder value="0"/> |
| 167 |
<ProfilingRule id="subsite-role-fallback-home" standardRule="false"> |
+ <fallBackType value="2"/> |
| 168 |
<description value="A rule based on role fallback algorithm with specified subsite and home page"/> |
+ </Criterion> |
| 169 |
<Criteria> |
+ <Criterion name="navigation"> |
| 170 |
@@ -634,6 +668,34 @@ |
+ <type value="navigation"/> |
| 171 |
</Criterion> |
+ <value value="/"/> |
| 172 |
</Criteria> |
+ <fallBackOrder value="1"/> |
| 173 |
</ProfilingRule> |
+ <fallBackType value="2"/> |
| 174 |
+--> |
+ </Criterion> |
| 175 |
+ <ProfilingRule id="site" standardRule="false"> |
+ <Criterion name="role"> |
| 176 |
+ <description value="A role based fallback algorithm for editing site"/> |
+ <type value="role"/> |
| 177 |
+ <Criteria> |
+ <fallBackOrder value="2"/> |
| 178 |
+ <Criterion name="user"> |
+ <fallBackType value="2"/> |
| 179 |
+ <type value="user"/> |
+ </Criterion> |
| 180 |
+ <fallBackOrder value="0"/> |
+ <Criterion name="page"> |
| 181 |
+ <fallBackType value="2"/> |
+ <type value="path.session"/> |
| 182 |
+ </Criterion> |
+ <value value="default-page"/> |
| 183 |
+ <Criterion name="navigation"> |
+ <fallBackOrder value="3"/> |
| 184 |
+ <type value="navigation"/> |
+ <fallBackType value="1"/> |
| 185 |
+ <value value="/"/> |
+ </Criterion> |
| 186 |
+ <fallBackOrder value="1"/> |
+ </Criteria> |
| 187 |
+ <fallBackType value="2"/> |
+ </ProfilingRule> |
| 188 |
+ </Criterion> |
</ProfilingRules> |
| 189 |
+ <Criterion name="role"> |
</Snapshot> |
|
+ <type value="role"/> |
|
|
+ <fallBackOrder value="2"/> |
|
|
+ <fallBackType value="2"/> |
|
|
+ </Criterion> |
|
|
+ <Criterion name="page"> |
|
|
+ <type value="path.session"/> |
|
|
+ <value value="default-page"/> |
|
|
+ <fallBackOrder value="3"/> |
|
|
+ <fallBackType value="1"/> |
|
|
+ </Criterion> |
|
|
+ </Criteria> |
|
|
+ </ProfilingRule> |
|
|
<ProfilingRule id="user-role-fallback" standardRule="false"> |
|
|
<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> |
|
|
<Criteria> |
|