--- pal/pal-portal/portal/patches/etc/sql/j2-seed.xml	2007/01/14 02:00:54	1.1
+++ pal/pal-portal/portal/patches/etc/sql/j2-seed.xml	2007/03/07 22:14:05	1.2
@@ -1,204 +1,189 @@
 Index: etc/sql/j2-seed.xml
 ===================================================================
---- etc/sql/j2-seed.xml	(リビジョン 495818)
+--- etc/sql/j2-seed.xml	(リビジョン 514361)
 +++ etc/sql/j2-seed.xml	(作業コピー)
-@@ -244,8 +244,11 @@
- 		<Role>manager</Role>
- 		<Role>user</Role>
- 		<Role>guest</Role>
-+		<Role>site</Role>
-+<!--
- 		<Role>subsite</Role>
- 		<Role>subsite2</Role>
-+-->
- 	</Roles>
- 	<Groups>
- 		<Group>accounting</Group>
-@@ -254,21 +257,25 @@
- 	</Groups>
- 	<Users>
- 		<User name="admin">
--			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
-+			<credentials password="@@ADMIN_PASSWORD@@" enabled="TRUE" requiresUpdate="TRUE"/>
- 			<roles>user,manager,admin</roles>
- 			<groups></groups>
- 			<preferences org.apache.jetspeed.prefered.locale="en,,"/>
-+<!--
- 			<userinfo user.name.given="Test Dude" user.name.family="Dudley"/>
-+-->
-+			<userinfo/>
- 			<Rules/>
- 		</User>
- 		<User name="manager">
--			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
-+			<credentials password="@@MANAGER_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/>
- 			<roles>user,manager</roles>
- 			<groups></groups>
- 			<preferences/>
- 			<userinfo/>
- 			<Rules/>
- 		</User>
-+<!--
- 		<User name="user">
- 			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
- 			<roles>user</roles>
-@@ -280,6 +287,18 @@
- 				<Rule locator="page" rule="j2"/>
- 			</Rules>
- 		</User>
-+-->
-+		<User name="site">
-+			<credentials password="@@SITE_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/>
-+			<roles>user,site</roles>
-+			<groups></groups>
-+			<preferences/>
-+			<userinfo/>
-+			<Rules>
-+				<Rule locator="page" rule="site"/>
-+			</Rules>
-+		</User>
-+<!--
- 		<User name="tomcat">
- 			<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/>
- 			<roles></roles>
-@@ -299,16 +318,18 @@
- 				<Rule locator="page" rule="role-fallback"/>
- 			</Rules>
- 		</User>
-+-->
- 		<User name="guest">
- 			<Null/>
--			<roles>guest</roles>
-+			<roles>guest,site</roles>
- 			<groups></groups>
- 			<preferences/>
- 			<userinfo/>
- 			<Rules>
--				<Rule locator="page" rule="j2"/>
-+				<Rule locator="page" rule="site"/>
- 			</Rules>
- 		</User>
-+<!--
- 		<User name="subsite">
- 			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
- 			<roles>subsite,subsite2</roles>
-@@ -329,10 +350,14 @@
- 				<Rule locator="page" rule="subsite2-role-fallback-home"/>
- 			</Rules>
- 		</User>
-+-->
- 	</Users>
- 	<Permissions>
- 		<Permission type="folder" resource="/" actions="view">
-+<!--
- 			<roles>user,guest,subsite,subsite2</roles>
-+-->
-+			<roles>user,guest</roles>
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-@@ -341,6 +366,7 @@
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+<!--
- 		<Permission type="folder" resource="/anotherdir/-" actions="view">
- 			<roles>user</roles>
- 			<groups></groups>
-@@ -371,6 +397,7 @@
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+-->
- 		<Permission type="folder" resource="/_user/user" actions="view, edit">
- 			<roles></roles>
- 			<groups></groups>
-@@ -381,6 +408,7 @@
- 			<groups></groups>
- 			<users>user</users>
- 		</Permission>
-+<!--
- 		<Permission type="folder" resource="/__subsite-root" actions="view">
- 			<roles>subsite,subsite2</roles>
- 			<groups></groups>
-@@ -411,6 +439,7 @@
- 			<groups></groups>
- 			<users>subsite2</users>
- 		</Permission>
-+-->
- 		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
- 			<roles>admin</roles>
- 			<groups></groups>
-@@ -426,6 +455,7 @@
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+<!--
- 		<Permission type="page" resource="/rss.psml" actions="view">
- 			<roles>guest</roles>
- 			<groups></groups>
-@@ -436,6 +466,7 @@
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+-->
- 		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
- 			<roles>admin</roles>
- 			<groups></groups>
-@@ -446,11 +477,13 @@
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+<!--
- 		<Permission type="portal" resource="rss::*" actions="view, edit">
- 			<roles>user</roles>
- 			<groups></groups>
- 			<users></users>
- 		</Permission>
-+-->
- 	</Permissions>
- 	<ProfilingRules>
- 		<ProfilingRule id="group-fallback" standardRule="false">
-@@ -590,6 +623,7 @@
- 				</Criterion>
- 			</Criteria>
- 		</ProfilingRule>
-+<!--
- 		<ProfilingRule id="subsite-role-fallback-home" standardRule="false">
- 			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
- 			<Criteria>
-@@ -634,6 +668,34 @@
- 				</Criterion>
- 			</Criteria>
- 		</ProfilingRule>
-+-->
-+		<ProfilingRule id="site" standardRule="false">
-+			<description value="A role based fallback algorithm for editing site"/>
-+			<Criteria>
-+				<Criterion name="user">
-+					<type value="user"/>
-+					<fallBackOrder value="0"/>
-+					<fallBackType value="2"/>
-+				</Criterion>
-+				<Criterion name="navigation">
-+					<type value="navigation"/>
-+					<value value="/"/>
-+					<fallBackOrder value="1"/>
-+					<fallBackType value="2"/>
-+				</Criterion>
-+				<Criterion name="role">
-+					<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>
+@@ -246,10 +246,13 @@
+ 		<Role>manager</Role>
+ 		<Role>user</Role>
+ 		<Role>guest</Role>
++		<Role>site</Role>
++<!--
+ 		<Role>subsite</Role>
+ 		<Role>subsite2</Role>
+ 		<Role>dev</Role>
+ 		<Role>devmgr</Role>		
++-->
+ 	</Roles>
+ 	<Groups>
+ 		<Group>accounting</Group>
+@@ -258,9 +261,10 @@
+ 	</Groups>
+ 	<Users>
+ 		<User name="admin">
+-			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
++			<credentials password="@@ADMIN_PASSWORD@@" enabled="TRUE" requiresUpdate="TRUE"/>
+ 			<roles>user,manager,admin</roles>
+ 			<groups></groups>
++<!--
+ 			<preferences>
+ 				<preference>
+ 					<name value="org.apache.jetspeed.prefered.locale"/>
+@@ -277,16 +281,18 @@
+ 					<value value="Dudley"/>
+ 				</preference>
+ 			</userinfo>
++-->
+ 			<Rules/>
+ 		</User>
+ 		<User name="manager">
+-			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
++			<credentials password="@@MANAGER_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/>
+ 			<roles>user,manager</roles>
+ 			<groups></groups>
+ 			<preferences/>
+ 			<userinfo/>
+ 			<Rules/>
+ 		</User>
++<!--
+ 		<User name="user">
+ 			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
+ 			<roles>user</roles>
+@@ -317,16 +323,18 @@
+ 				<Rule locator="page" rule="role-fallback"/>
+ 			</Rules>
+ 		</User>
++-->
+ 		<User name="guest">
+ 			<Null/>
+-			<roles>guest</roles>
++			<roles>guest,site</roles>
+ 			<groups></groups>
+ 			<preferences/>
+ 			<userinfo/>
+ 			<Rules>
+-				<Rule locator="page" rule="j2"/>
++				<Rule locator="page" rule="site"/>
+ 			</Rules>
+ 		</User>
++<!--
+ 		<User name="subsite">
+ 			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
+ 			<roles>user,subsite,subsite2</roles>
+@@ -365,10 +373,21 @@
+ 			  <Rule locator="page" rule="user-role-fallback"/>
+ 			</Rules>
+ 		</User>				
++-->
++        <User name="site">
++            <credentials password="@@SITE_PASSWORD@@" enabled="TRUE" requiresUpdate="FALSE"/>
++            <roles>user,site</roles>
++            <groups></groups>
++            <preferences/>
++            <userinfo/>
++            <Rules>
++                <Rule locator="page" rule="site"/>
++            </Rules>
++        </User>
+ 	</Users>
+ 	<Permissions>
+ 		<Permission type="folder" resource="/" actions="view">
+-			<roles>user,guest,subsite,subsite2</roles>
++			<roles>user,guest</roles>
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
+@@ -377,6 +396,7 @@
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
++<!--
+ 		<Permission type="folder" resource="/anotherdir/-" actions="view">
+ 			<roles>user</roles>
+ 			<groups></groups>
+@@ -437,6 +457,7 @@
+ 			<groups></groups>
+ 			<users>subsite2</users>
+ 		</Permission>
++-->
+ 		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
+ 			<roles>admin</roles>
+ 			<groups></groups>
+@@ -452,6 +473,7 @@
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
++<!--
+ 		<Permission type="page" resource="/rss.psml" actions="view">
+ 			<roles>guest</roles>
+ 			<groups></groups>
+@@ -462,6 +484,7 @@
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
++-->
+ 		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
+ 			<roles>admin</roles>
+ 			<groups></groups>
+@@ -472,11 +495,13 @@
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
++<!--
+ 		<Permission type="portal" resource="rss::*" actions="view, edit">
+ 			<roles>user</roles>
+ 			<groups></groups>
+ 			<users></users>
+ 		</Permission>
++-->
+ 	</Permissions>
+ 	<ProfilingRules>
+ 		<ProfilingRule id="group-fallback" standardRule="false">
+@@ -616,6 +641,7 @@
+ 				</Criterion>
+ 			</Criteria>
+ 		</ProfilingRule>
++<!--
+ 		<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 @@
+ 				</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>
+@@ -714,5 +741,32 @@
+ 				</Criterion>
+ 			</Criteria>
+ 		</ProfilingRule>
++        <ProfilingRule id="site" standardRule="false">
++            <description value="A role based fallback algorithm for editing site"/>
++            <Criteria>
++                <Criterion name="user">
++                    <type value="user"/>
++                    <fallBackOrder value="0"/>
++                    <fallBackType value="2"/>
++                </Criterion>
++                <Criterion name="navigation">
++                    <type value="navigation"/>
++                    <value value="/"/>
++                    <fallBackOrder value="1"/>
++                    <fallBackType value="2"/>
++                </Criterion>
++                <Criterion name="role">
++                    <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>
+ 	</ProfilingRules>
+ </Snapshot>