Author: taylor
Date: Mon Feb 26 00:30:35 2007
New Revision: 511750
URL: http://svn.apache.org/viewvc?view=rev&rev=511750
Log:
finishing up new min site
- delegated security example built in for devmgr managing developers with role
dev
- aggregated role pages example
- added a few delegated security features to user browser, user editor
- setup seed data for examples
Added:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/developers.html
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/account.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/account.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
Mon Feb 26 00:30:35 2007
@@ -28,10 +28,11 @@
import javax.portlet.PortletMode;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.security.auth.Subject;
import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.portlets.security.SecurityUtil;
import org.apache.jetspeed.portlets.security.SecurityResources;
+import org.apache.jetspeed.portlets.security.SecurityUtil;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
@@ -137,6 +138,8 @@
public void getRows(RenderRequest request, String sql, int windowSize,
String filter)
{
+ String roleFilter = request.getPreferences().getValue("FilterByRole",
"");
+ boolean filterByRole = !roleFilter.equals("") ||
roleFilter.equalsIgnoreCase("false");
List resultSetTitleList = new ArrayList();
List resultSetTypeList = new ArrayList();
resultSetTypeList.add(String.valueOf(Types.VARCHAR));
@@ -145,12 +148,26 @@
List list = new ArrayList();
try
{
- Iterator users = userManager.getUserNames(filter);
-
- while (users.hasNext())
+ if (filterByRole)
{
- list.add(users.next());
- }
+ Iterator users =
userManager.getUsersInRole(roleFilter).iterator();
+ while (users.hasNext())
+ {
+ // NOTE: this can be a bit costly if you have a lot of
users in a role
+ User user = (User)users.next();
+ Principal pr = getBestPrincipal(user.getSubject(),
UserPrincipal.class);
+ list.add(pr.getName());
+ }
+ }
+ else
+ {
+ Iterator users = userManager.getUserNames(filter);
+ while (users.hasNext())
+ {
+ list.add(users.next());
+ }
+
+ }
}
catch (SecurityException sex)
{
@@ -159,5 +176,29 @@
BrowserIterator iterator = new DatabaseBrowserIterator(list,
resultSetTitleList, resultSetTypeList, windowSize);
setBrowserIterator(request, iterator);
iterator.sort("user"); // resource bundle key
+ }
+
+ public static Principal getBestPrincipal(Subject subject, Class classe)
+ {
+
+ Principal principal = null;
+ Iterator principals = subject.getPrincipals().iterator();
+ while (principals.hasNext())
+ {
+ Principal p = (Principal) principals.next();
+ if (classe.isInstance(p))
+ {
+ principal = p;
+ break;
+ }
+ else
+ {
+ if (principal == null)
+ {
+ principal = p;
+ }
+ }
+ }
+ return principal;
}
}
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
Mon Feb 26 00:30:35 2007
@@ -1044,6 +1044,12 @@
}
}
}
+
+ String requiredRole =
actionRequest.getPreferences().getValue("requiredRole", "");
+ if (!requiredRole.equals("") && user != null)
+ {
+ roleManager.addRoleToUser(userName, requiredRole);
+ }
String role = actionRequest.getParameter(ROLES_CONTROL);
if (!SecurityUtil.isEmpty(role) && user != null)
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
Mon Feb 26 00:30:35 2007
@@ -72,10 +72,25 @@
<portlet-name>AboutJetspeed</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
</portlet>
+
+ <portlet>
+ <portlet-name>JetspeedDeveloper</portlet-name>
+ <js:security-constraint-ref>dev</js:security-constraint-ref>
+ </portlet>
<portlet>
<portlet-name>ChangePasswordPortlet</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
+ </portlet>
+
+ <portlet>
+ <portlet-name>DevelopersBrowser</portlet-name>
+ <js:security-constraint-ref>devmgr</js:security-constraint-ref>
+ </portlet>
+
+ <portlet>
+ <portlet-name>DeveloperDetails</portlet-name>
+ <js:security-constraint-ref>devmgr</js:security-constraint-ref>
</portlet>
<js:services>
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
Mon Feb 26 00:30:35 2007
@@ -191,6 +191,10 @@
<name>WindowSize</name>
<value>10</value>
</preference>
+ <preference>
+ <name>FilterByRole</name>
+ <value></value>
+ </preference>
</portlet-preferences>
</portlet>
@@ -295,6 +299,10 @@
<preference>
<name>newUserTemplateDirectory</name>
<value>/_user/template/</value>
+ </preference>
+ <preference>
+ <name>requiredRole</name>
+ <value></value>
</preference>
</portlet-preferences>
</portlet>
@@ -1566,6 +1574,178 @@
</preference>
</portlet-preferences>
</portlet>
+
+ <portlet>
+ <description>Jetspeed Developer Information</description>
+ <portlet-name>JetspeedDeveloper</portlet-name>
+ <display-name>Jetspeed Developer Information</display-name>
+ <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <!-- resource-bundle></resource-bundle -->
+ <portlet-info>
+ <title>About Jetspeed</title>
+ <short-title>About</short-title>
+ <keywords>developer,development,jetspeed</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>file</name>
+ <value>view/info/developers.html</value>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+
+ <!-- Delegated Security Example -->
+ <portlet id="DevelopersBrowser">
+ <description>The User Browser displays a list of users filtered by the
Developer role managed in this portal. From here you can select users for
editing. Place this portlet on the same page as the User Details
portlet.</description>
+ <portlet-name>DevelopersBrowser</portlet-name>
+ <display-name>Developer Browser</display-name>
+
<portlet-class>org.apache.jetspeed.portlets.security.users.UserBrowser</portlet-class>
+ <init-param>
+ <description>This parameter sets the template used in view
mode.</description>
+ <name>ViewPage</name>
+ <value>/WEB-INF/security/users/user-browser.vm</value>
+ </init-param>
+ <init-param>
+ <name>portlet-icon</name>
+ <value>system-users.png</value>
+ </init-param>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <!-- not implemented yet
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ -->
+ </supports>
+ <supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.security.resources.UserBrowserResources</resource-bundle>
+ <portlet-info>
+ <title>Developer Browser</title>
+ <short-title>Developers</short-title>
+ <keywords>admin,security,developers,delegated security</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>WindowSize</name>
+ <value>10</value>
+ </preference>
+ <preference>
+ <name>FilterByRole</name>
+ <value>dev</value>
+ </preference>
+ </portlet-preferences>
+</portlet>
+
+<portlet id="DeveloperDetails">
+ <description>The User Details portlet displays a Developers details in a
tabbed view. From here you can add, edit, and delete User information. Place
this portlet on the same page as the User Browser portlet.</description>
+ <portlet-name>DeveloperDetails</portlet-name>
+ <display-name>Developer Details</display-name>
+
<portlet-class>org.apache.jetspeed.portlets.security.users.UserDetailsPortlet</portlet-class>
+ <init-param>
+ <description>This parameter sets the template used in view
mode.</description>
+ <name>ViewPage</name>
+ <value>/WEB-INF/security/users/user-details.jsp</value>
+ </init-param>
+ <init-param>
+ <description>This parameter sets the template used in edit
mode.</description>
+ <name>EditPage</name>
+ <value>/WEB-INF/security/users/user-details-edit.jsp</value>
+ </init-param>
+ <init-param>
+ <name>portlet-icon</name>
+ <value>system-users.png</value>
+ </init-param>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <!-- not implemented yet
+ <portlet-mode>HELP</portlet-mode>
+ -->
+ </supports>
+ <supported-locale>en</supported-locale>
+
<resource-bundle>org.apache.jetspeed.portlets.security.resources.UserDetailsResources</resource-bundle>
+ <portlet-info>
+ <title>Developer Detail Information</title>
+ <short-title>Developer</short-title>
+ <keywords>admin,security,developers,user,delegated security</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>showUserTab</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>showAttributesTab</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showPasswordTab</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showRoleTab</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showGroupTab</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showProfileTab</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showPasswordOnUserTab</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>showPasswordExpiration</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showChangePasswordRequiredForAddUser</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showRoleForAddUser</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showProfileForAddUser</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>defaultChangePasswordRequired</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>defaultRole</name>
+ <value>dev</value>
+ </preference>
+ <preference>
+ <name>defaultProfile</name>
+ <value>user-role-fallback</value>
+ </preference>
+ <preference>
+ <name>newUserTemplateDirectory</name>
+ <value>/_user/template-dev/</value>
+ </preference>
+ <preference>
+ <name>requiredRole</name>
+ <value>user</value>
+ </preference>
+ </portlet-preferences>
+</portlet>
+
</portlet-app>
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
Mon Feb 26 00:30:35 2007
@@ -132,6 +132,8 @@
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
<td><input type="text" name="searchString" size="30" value=""
class="portlet-form-field-label"></td>
+ </tr>
+ <tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
<td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
</tr>
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
Mon Feb 26 00:30:35 2007
@@ -132,6 +132,8 @@
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
<td><input type="text" name="searchString" size="30" value=""
class="portlet-form-field-label"></td>
+ </tr>
+ <tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
<td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
</tr>
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
Mon Feb 26 00:30:35 2007
@@ -154,6 +154,8 @@
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
<td><input type="text" name="searchString" size="30" value=""
class="portlet-form-field-label"></td>
+ </tr>
+ <tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
<td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
</tr>
Added:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/developers.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/developers.html?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/developers.html
(added)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/info/developers.html
Mon Feb 26 00:30:35 2007
@@ -0,0 +1 @@
+<b>Developers</b>
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=511750&r1=511749&r2=511750
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Mon Feb 26 00:30:35 2007
@@ -248,6 +248,8 @@
<Role>guest</Role>
<Role>subsite</Role>
<Role>subsite2</Role>
+ <Role>dev</Role>
+ <Role>devmgr</Role>
</Roles>
<Groups>
<Group>accounting</Group>
Modified: portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/min/j2-seed.xml Mon Feb 26 00:30:35 2007
@@ -245,6 +245,8 @@
<Role>admin</Role>
<Role>guest</Role>
<Role>user</Role>
+ <Role>dev</Role>
+ <Role>devmgr</Role>
</Roles>
<Groups>
</Groups>
@@ -275,6 +277,24 @@
<Rule locator="page" rule="j2"/>
</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="portal" resource="j2-admin::*" actions="view,
edit">
Added:
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=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_role/dev/developers.psml
Mon Feb 26 00:30:35 2007
@@ -0,0 +1,24 @@
+<?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="roledevdevelopers.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.1/schemas/psml.xsd";>
+
+ <title>Jetspeed Dev</title>
+
+ <fragment id="jetdev-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="jetdev-1001" type="portlet"
name="j2-admin::JetspeedDeveloper"/>
+ </fragment>
+</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/account.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/account.psml?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/account.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/account.psml
Mon Feb 26 00:30:35 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/min-pages/_user/devmgr/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/default-page.psml?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/default-page.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/default-page.psml
Mon Feb 26 00:30:35 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/min-pages/_user/devmgr/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
Mon Feb 26 00:30:35 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/min-pages/_user/template-dev/account.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/account.psml?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/account.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/account.psml
Mon Feb 26 00:30:35 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="dev-macc-1" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="dev-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="dev-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/min-pages/_user/template-dev/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/default-page.psml?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/default-page.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/default-page.psml
Mon Feb 26 00:30:35 2007
@@ -0,0 +1,37 @@
+<?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="_user-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.1/schemas/psml.xsd";>
+
+ <title>User Home</title>
+ <metadata name="title" xml:lang="ja">ã¦ã¼ã¶ã¼ãã¼ã </metadata>
+ <metadata name="title" xml:lang="es">Carpeta de Usuario</metadata>
+ <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</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="devtemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="devtemp-1001" type="portlet"
name="j2-admin::WelcomeToJetspeed">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="0" />
+ </fragment>
+ <fragment id="devtemp-1010" type="portlet" name="j2-admin::AboutJetspeed">
+ <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/min-pages/_user/template-dev/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/folder.metadata?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/folder.metadata
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template-dev/folder.metadata
Mon Feb 26 00:30:35 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>
+ <security-constraints-ref>delegated</security-constraints-ref>
+ </security-constraints>
+</folder>
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/account.psml
Mon Feb 26 00:30:35 2007
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<page id="my-account2" hidden="true"
+<page id="my-account2" 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";>
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml
(original)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/default-page.psml
Mon Feb 26 00:30:35 2007
@@ -24,7 +24,7 @@
<metadata name="title" xml:lang="zh-TW">ç¨æ¶ä¸»é </metadata>
<metadata name="title" xml:lang="ko">ì¬ì©ì í</metadata>
- <fragment id="uhtemp-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="uhtemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="uhtemp-1001" type="portlet"
name="j2-admin::WelcomeToJetspeed">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
@@ -33,11 +33,5 @@
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
-<!-- temp fix -->
- <fragment id="removeme" type="portlet" name="j2-admin::LoginPortlet">
- <property layout="TwoColumns" name="row" value="1" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- </fragment>
-
+ </fragment>
</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/folder.metadata?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/folder.metadata
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/_user/template/folder.metadata
Mon Feb 26 00:30:35 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>
+
+ <document-order>default-page.psml</document-order>
+ <document-order>account.psml</document-order>
+
+</folder>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/folder.metadata Mon
Feb 26 00:30:35 2007
@@ -38,7 +38,6 @@
</menu>
<!-- temporary menu definitions for jscookmenu layout decorator; will be
standard -->
- <menu name="site-navigations" regexp="true" options="/*/,/*.psml"
depth="-1"/>
<menu name="additional-links" regexp="true" options="/*.link"/>
<security-constraints>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/min-pages/page.security Mon Feb
26 00:30:35 2007
@@ -60,4 +60,33 @@
</security-constraint>
</security-constraints-def>
+ <security-constraints-def name="dev">
+ <security-constraint>
+ <roles>dev</roles>
+ <permissions>view</permissions>
+ </security-constraint>
+ <security-constraint>
+ <roles>devmgr,admin</roles>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
+ <security-constraints-def name="devmgr">
+ <security-constraint>
+ <roles>devmgr</roles>
+ <permissions>view</permissions>
+ </security-constraint>
+ <security-constraint>
+ <roles>admin</roles>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
+ <security-constraints-def name="delegated">
+ <security-constraint>
+ <roles>devmgr</roles>
+ <permissions>view,edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
</page-security>
Added:
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=auto&rev=511750
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
(added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/dev/developers.psml
Mon Feb 26 00:30:35 2007
@@ -0,0 +1,24 @@
+<?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="roledevdevelopers.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.1/schemas/psml.xsd";>
+
+ <title>Jetspeed Dev</title>
+
+ <fragment id="jetdev-1000" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="jetdev-1001" type="portlet"
name="j2-admin::JetspeedDeveloper"/>
+ </fragment>
+</page>
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/default-page.psml?view=auto&rev=511750
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
(added)
+++
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
Mon Feb 26 00:30:35 2007
@@ -0,0 +1,51 @@
+<?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="_dev-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.1/schemas/psml.xsd";>
+ <defaults
+ skin="blue"
+ layout-decorator="tigris"
+ portlet-decorator="tigris"
+ />
+ <title>User Home</title>
+ <metadata name="title" xml:lang="ja">ã¦ã¼ã¶ã¼ãã¼ã </metadata>
+ <metadata name="title" xml:lang="es">Carpeta de Usuario</metadata>
+ <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</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="devtemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="devtemp-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">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ <fragment id="devtemp-1011" type="portlet"
name="jsf-demo::CalendarPortlet">
+ <property layout="TwoColumns" name="row" value="1" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ <fragment id="devtemp-1012" type="portlet" name="demo::BookmarkPortlet">
+ <property layout="TwoColumns" name="row" value="2" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+
+ </fragment>
+
+</page>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security?view=diff&rev=511750&r1=511749&r2=511750
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security Mon Feb 26
00:30:35 2007
@@ -67,4 +67,34 @@
</security-constraint>
</security-constraints-def>
+ <security-constraints-def name="dev">
+ <security-constraint>
+ <roles>dev</roles>
+ <permissions>view</permissions>
+ </security-constraint>
+ <security-constraint>
+ <roles>devmgr,admin</roles>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
+ <security-constraints-def name="devmgr">
+ <security-constraint>
+ <roles>devmgr</roles>
+ <permissions>view</permissions>
+ </security-constraint>
+ <security-constraint>
+ <roles>admin</roles>
+ <permissions>view, edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
+ <security-constraints-def name="delegated">
+ <security-constraint>
+ <roles>devmgr</roles>
+ <permissions>view,edit</permissions>
+ </security-constraint>
+ </security-constraints-def>
+
+
</page-security>
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=511750&r1=511749&r2=511750
==============================================================================
---
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
Mon Feb 26 00:30:35 2007
@@ -82,7 +82,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.Page.Path}")
+ #set ($chooser =
"${jetspeed.basePath}/system/customizer/selector.psml?jspage=${rc.Path}")
<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]
