portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r534972 - in /portals/jetspeed-2/trunk: etc/sql/ src/webapp/WEB-INF/pages/__subsite-root/_hostname/ src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/ src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/ src/webapp/W...
Date Thu, 03 May 2007 19:41:42 GMT
Author: taylor
Date: Thu May  3 12:41:41 2007
New Revision: 534972

URL: http://svn.apache.org/viewvc?view=rev&rev=534972
Log:
https://issues.apache.org/jira/browse/JS2-674
I can now create two types of subsite scenarios based on a profile _control mechanism, in
this case the _hostname:
1. directly off the /_hostname, not using subsites, but we can still discovering pages from
a user + role fallback combo rule
   using this approach also allows fallback to the root / folder and should be considered
optional in future enhancements
2. standard subsite root approach, placing a _control (_hostname) under the __subsite root
and discovering pages from a user + role fallback combo rule
   this is a standard subsite approach that only falls back to the subsite root, thus allowing
content placed in the __subsite_root
   however pages will not be located directly off the root /

note that both of these approaches still can use a page.security file defined in a central
location /page.security

Added:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/bookmarks.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
Modified:
    portals/jetspeed-2/trunk/etc/sql/j2-seed.xml

Modified: portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/sql/j2-seed.xml?view=diff&rev=534972&r1=534971&r2=534972
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Thu May  3 12:41:41 2007
@@ -321,7 +321,17 @@
 			<preferences/>
 			<userinfo/>
 			<Rules>
-				<Rule locator="page" rule="localhost"/>
+				<Rule locator="page" rule="localhost-fallback"/>
+			</Rules>
+		</User>
+		<User name="sublocal">
+			<credentials password="sublocal" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite-by-hostname"/>
 			</Rules>
 		</User>
 		<User name="tomcat">
@@ -686,6 +696,49 @@
 				</Criterion>
 			</Criteria>
 		</ProfilingRule>
+		<ProfilingRule id="subsite-by-hostname" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite
and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation-2">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="5"/>
+					<fallBackType value="2"/>
+				</Criterion>				
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="home"/>
+					<fallBackOrder value="6"/>
+					<fallBackType value="2"/>
+				</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>
@@ -782,7 +835,7 @@
 					<fallBackOrder value="2"/>
 					<fallBackType value="2"/>
 				</Criterion>
-				<Criterion name="hostname2">
+				<Criterion name="hostname">
 					<type value="hostname"/>
 					<fallBackOrder value="3"/>
 					<fallBackType value="2"/>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml?view=auto&rev=534972
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
Thu May  3 12:41:41 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/localhost/sublocalrole" hidden="false">
+    <title>Role Test2</title>
+    <short-title>Role Test2</short-title>
+    <defaults/>
+    <fragment id="role-test2-001" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+        <fragment id="role-test2-002" type="portlet" name="j2-admin::JetspeedDeveloper">
+            <property name="row" value="0"/>
+            <property name="column" value="0"/>
+        </fragment>
+        <fragment id="role-test2-003" type="portlet" name="demo::IFramePortlet">
+            <property name="row" value="0"/>
+            <property name="column" value="1"/>
+        </fragment>
+    </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/bookmarks.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/bookmarks.psml?view=auto&rev=534972
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/bookmarks.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/bookmarks.psml
Thu May  3 12:41:41 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/__subsiteroot/_hostname/localhost/sublocal/bookmarks.psml" hidden="false">
+    <title>Subsite Bookmarks</title>
+    <short-title>Subsite Bookmarks</short-title>
+    <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
+    <fragment id="P-111c9af9583-10001xxx" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+        <fragment id="P-111c9af9583-10002xxx" type="portlet" name="demo::BookmarkPortlet">
+            <property name="row" value="0"/>
+        </fragment>
+    </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml?view=auto&rev=534972
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
Thu May  3 12:41:41 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="local-607" hidden="false">
+    <title>SubLocal Home</title>
+    <short-title>SubLHome</short-title>
+    <defaults/>
+    <fragment id="P-111c98bf047-10001" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+        <fragment id="P-111c98bf047-10002" type="portlet" name="demo::CustomerList">
+            <property name="row" value="0"/>
+            <property name="column" value="0"/>
+        </fragment>
+        <fragment id="P-111c98bf047-10003" type="portlet" name="demo::IFramePortlet">
+            <property name="row" value="0"/>
+            <property name="column" value="1"/>
+        </fragment>
+    </fragment>
+</page>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml?view=auto&rev=534972
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
Thu May  3 12:41:41 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/localhost/roletest.psml" hidden="false">
+    <title>Role Test</title>
+    <short-title>Role Test</short-title>
+    <defaults/>
+    <fragment id="role-test-001" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+        <fragment id="role-test-002" type="portlet" name="j2-admin::JetspeedDeveloper">
+            <property name="row" value="0"/>
+            <property name="column" value="0"/>
+        </fragment>
+        <fragment id="role-test-003" type="portlet" name="demo::IFramePortlet">
+            <property name="row" value="0"/>
+            <property name="column" value="1"/>
+        </fragment>
+    </fragment>
+</page>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message