Author: taylor
Date: Thu Feb 18 04:30:45 2016
New Revision: 1731002
URL: http://svn.apache.org/viewvc?rev=1731002&view=rev
Log:
JS2-1349: Add ability to filter by groups in the user manager. Add filterRoles
and filterGroups drop downs to Edit Mode configuration. Add example pages and
security constraints to demo packaging
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/default-page.psml
- copied, changed from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/default-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/folder.metadata
- copied, changed from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/folder.metadata
- copied, changed from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/page.security
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml?rev=1731002&r1=1731001&r2=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed-layouts/src/main/webapp/WEB-INF/jetspeed-portlet.xml
Thu Feb 18 04:30:45 2016
@@ -26,7 +26,7 @@ limitations under the License.
<dc:title xml:lang="en">Layout Portlets</dc:title>
<dc:creator>J2 Team</dc:creator>
<js:metadata name="layout-app">true</js:metadata>
- <js:metadata name="pa-version">2.2</js:metadata>
+ <js:metadata name="pa-version">2.3.1</js:metadata>
<portlet>
<portlet-name>SimpleLayout</portlet-name>
Copied:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/default-page.psml
(from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/default-page.psml)
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/default-page.psml?p2=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/default-page.psml&p1=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/default-page.psml&r1=1730780&r2=1731002&rev=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/default-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/default-page.psml
Thu Feb 18 04:30:45 2016
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<page id="_dev-template-default-page.psml"
+<page id="_del-template-default-page.psml"
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.2/schemas/psml.xsd";>
@@ -25,16 +25,16 @@ limitations under the License.
<metadata name="title" xml:lang="zh-TW">ç¨æ¶ä¸»é </metadata>
<metadata name="title" xml:lang="ko">ì¬ì©ì í</metadata>
- <fragment id="devtemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
- <fragment id="devtemp-1001" type="portlet" name="rss::RSS">
+ <fragment id="deltemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="deltemp-1001" type="portlet" name="rss::RSS">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="devtemp-1010" type="portlet" name="j2-admin::LoginPortlet">
+ <fragment id="deltemp-1010" type="portlet" name="j2-admin::LoginPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="devtemp-1012" type="portlet" name="demo::BookmarkPortlet">
+ <fragment id="deltemp-1012" type="portlet" name="demo::BookmarkPortlet">
<property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
Copied:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/folder.metadata
(from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata)
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/folder.metadata?p2=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/folder.metadata&p1=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata&r1=1730780&r2=1731002&rev=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/delegated/folder.metadata
Thu Feb 18 04:30:45 2016
@@ -17,10 +17,10 @@ limitations under the License.
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.2/schemas/folder-metadata.xsd";>
- <title >Home</title>
+ <title >Home</title>
<security-constraints>
- <security-constraints-ref>delegated</security-constraints-ref>
+ <security-constraints-ref>delegated-manager</security-constraints-ref>
</security-constraints>
<menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml?rev=1731002&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/delegated.psml
Thu Feb 18 04:30:45 2016
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<page id="delegated.psml" hidden="false">
+ <title>Engineering Users</title>
+ <short-title>Engineering</short-title>
+ <fragment id="SP-152e7614282-10000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="SP-152e761b333-10001" type="portlet"
name="j2-admin::DelegatedUserManager">
+ <property name="row" value="0"></property>
+ <property name="column" value="0"></property>
+ </fragment>
+ </fragment>
+
+</page>
+
Copied:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/folder.metadata
(from r1730780,
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/devmgr/folder.metadata)
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/folder.metadata?p2=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/folder.metadata&p1=portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/devmgr/folder.metadata&r1=1730780&r2=1731002&rev=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/devmgr/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/delegated/folder.metadata
Thu Feb 18 04:30:45 2016
@@ -17,12 +17,11 @@ limitations under the License.
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.2/schemas/folder-metadata.xsd";>
- <title >Home</title>
+ <title >Delegated Security</title>
+
+ <document-order>delegated.psml</document-order>
- <document-order>default-page.psml</document-order>
- <document-order>account.psml</document-order>
-
<security-constraints>
- <owner>devmgr</owner>
- </security-constraints>
+ <security-constraints-ref>delegated-manager</security-constraints-ref>
+ </security-constraints>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/page.security
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/page.security?rev=1731002&r1=1731001&r2=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/page.security
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/page.security
Thu Feb 18 04:30:45 2016
@@ -107,6 +107,12 @@ limitations under the License.
<permissions>view, edit, config, edit_defaults</permissions>
</security-constraint>
</security-constraints-def>
-
+
+ <security-constraints-def name="delegated-manager">
+ <security-constraint>
+ <roles>mgr-engineering</roles>
+ <permissions>view, edit, config, edit_defaults</permissions>
+ </security-constraint>
+ </security-constraints-def>
</page-security>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?rev=1731002&r1=1731001&r2=1731002&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
Thu Feb 18 04:30:45 2016
@@ -296,6 +296,7 @@
<Role>subsite2</Role>
<Role>dev</Role>
<Role>devmgr</Role>
+ <Role>mgr-engineering</Role>
</Roles>
<Groups>
<Group>accounting</Group>
@@ -402,7 +403,7 @@
</User>
<User name="tomcat" userTemplate='/_template/new-user/'
subsite='_hostname/localhost'>
<credentials password="tomcat" enabled="TRUE"
requiresUpdate="FALSE"/>
- <roles></roles>
+ <roles>user</roles>
<groups></groups>
<preferences/>
<userinfo>
@@ -419,7 +420,7 @@
</User>
<User name="jetspeed">
<credentials password="jetspeed" enabled="TRUE"
requiresUpdate="FALSE"/>
- <roles>manager</roles>
+ <roles>user,manager</roles>
<groups>engineering</groups>
<preferences/>
<userinfo>
@@ -493,7 +494,25 @@
<Rules>
<Rule locator="page" rule="user-role-fallback"/>
</Rules>
- </User>
+ </User>
+ <User name="engmgr">
+ <credentials password="engmgr" enabled="TRUE"/>
+ <roles>user,mgr-engineering</roles>
+ <groups>engineering,marketing</groups>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Eng"/>
+ </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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
