Author: taylor
Date: Tue Feb 27 21:13:09 2007
New Revision: 512606
URL: http://svn.apache.org/viewvc?view=rev&rev=512606
Log:
copy the dev/devmgr delegated security use-case into demo site from min site
per Ate's suggestion
copy Jetspeed Info portlets over to demo site, didn't make this the default
page though
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/account.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html?view=diff&rev=512606&r1=512605&r2=512606
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/welcome.html
Tue Feb 27 21:13:09 2007
@@ -87,4 +87,9 @@
<td>subsite2</td>
<td>Example of how to setup users with a secondary subsite role fallback
profiling rules</td>
</tr>
+<tr>
+<td>devmgr</td>
+<td>devmgr</td>
+<td>Delegated security manager, can manage users with the "dev" (developer)
role</td>
+</tr>
</table>
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=512606&r1=512605&r2=512606
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Tue Feb 27 21:13:09 2007
@@ -347,6 +347,24 @@
<Rule locator="page"
rule="subsite2-role-fallback-home"/>
</Rules>
</User>
+ <User name="devmgr">
+ <credentials password="devmgr" enabled="TRUE"/>
+ <roles>user,dev,devmgr</roles>
+ <groups></groups>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Dev"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="Manager"/>
+ </preference>
+ </userinfo>
+ <Rules>
+ <Rule locator="page" rule="user-role-fallback"/>
+ </Rules>
+ </User>
</Users>
<Permissions>
<Permission type="folder" resource="/" actions="view">
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml?view=diff&rev=512606&r1=512605&r2=512606
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
Tue Feb 27 21:13:09 2007
@@ -21,4 +21,9 @@
<fragment id="jetdev-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<fragment id="jetdev-1001" type="portlet"
name="j2-admin::JetspeedDeveloper"/>
</fragment>
+
+ <security-constraints>
+ <security-constraints-ref>dev</security-constraints-ref>
+ </security-constraints>
+
</page>
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml?view=diff&rev=512606&r1=512605&r2=512606
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
Tue Feb 27 21:13:09 2007
@@ -21,4 +21,9 @@
<fragment id="jetdev-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<fragment id="jetdev-1001" type="portlet"
name="j2-admin::JetspeedDeveloper"/>
</fragment>
+
+ <security-constraints>
+ <security-constraints-ref>dev</security-constraints-ref>
+ </security-constraints>
+
</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/account.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/account.psml?view=auto&rev=512606
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/account.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/account.psml
Tue Feb 27 21:13:09 2007
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="my-account3" hidden="false"
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
+
+ <title>My Account</title>
+ <metadata name="title" xml:lang="ja">ã¢ã«ã¦ã³ã</metadata>
+ <metadata name="title" xml:lang="es">Mi cuenta</metadata>
+ <metadata name="title" xml:lang="hu">Személyes beállÃtások</metadata>
+ <metadata name="title" xml:lang="zh">æçå¸æ·é
ç½®</metadata>
+ <metadata name="title" xml:lang="zh-TW">æç帳æ¶é
ç½®</metadata>
+ <metadata name="title" xml:lang="ko">ë´ ê³ì </metadata>
+
+ <fragment id="devmgr-macc-1" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="devmgr-macc-2" type="portlet" name="j2-admin::LoginPortlet">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="0" />
+ </fragment>
+ <fragment id="devmgr-macc-3" type="portlet"
name="j2-admin::ChangePasswordPortlet">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ </fragment>
+
+</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/default-page.psml?view=auto&rev=512606
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/default-page.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/default-page.psml
Tue Feb 27 21:13:09 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="devmgr-home"
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
+
+ <title>Delegated Security</title>
+
+ <fragment id="devmgr-210" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <property layout="TwoColumns" name="sizes" value="33%,64%" />
+ <fragment id="devmgr-211" type="portlet"
name="j2-admin::DevelopersBrowser">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="0" />
+ </fragment>
+ <fragment id="devmgr-212" type="portlet" name="j2-admin::DeveloperDetails">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ </fragment>
+</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/folder.metadata?view=auto&rev=512606
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
Tue Feb 27 21:13:09 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<folder
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
+ <title >Home</title>
+
+ <document-order>default-page.psml</document-order>
+ <document-order>account.psml</document-order>
+
+ <security-constraints>
+ <owner>devmgr</owner>
+ </security-constraints>
+</folder>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/folder.metadata?view=auto&rev=512606
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/folder.metadata
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/folder.metadata
Tue Feb 27 21:13:09 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<folder
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
+ <title >Home</title>
+
+ <security-constraints>
+ <security-constraints-ref>delegated</security-constraints-ref>
+ </security-constraints>
+</folder>
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml?view=auto&rev=512606
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jetspeed.psml Tue Feb 27
21:13:09 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2007 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="default-page"
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
+
+ <title>Jetspeed</title>
+
+ <fragment id="jsabout-10" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="jsabout-11" type="portlet"
name="j2-admin::WelcomeToJetspeed">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="0" />
+ </fragment>
+ <fragment id="jsabout-12" type="portlet" name="j2-admin::AboutJetspeed">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ <fragment id="jsabout-13" type="portlet"
name="j2-admin::JetspeedDeveloper">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="2" />
+ </fragment>
+ </fragment>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</page>
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?view=diff&rev=512606&r1=512605&r2=512606
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Tue Feb 27 21:13:09 2007
@@ -49,6 +49,8 @@
#set($columnLayout = $renderRequest.getAttribute("columnLayout"))
#set($decorationFactory = $renderRequest.getAttribute("decorationFactory"))
#set($rc =
$renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($psrc =
$rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+#set($profiledPage = $psrc.Page.Path)
<div id="$renderResponse.namespace" class="${layoutClass}
${layoutClass}-${layoutType}">
@@ -82,7 +84,7 @@
<div class="layout-edit-bar-right">
#if($allowAddPortlet)
<label>$messages.getString("portal.page.editing.portlet")</label>
- #set ($chooser =
"${jetspeed.basePath}/system/customizer/selector.psml?jspage=${rc.Path}")
+ #set ($chooser =
"${jetspeed.basePath}/system/customizer/selector.psml?jspage=${profiledPage}")
<a href="$response.encodeURL($chooser)">
<img src="#GetPageResource('images/select.gif')" border="0"
title="$messages.getString("portal.page.editing.addportlet")"/>
</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
