You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/04/21 12:20:07 UTC

svn commit: r767104 - in /portals/jetspeed-2/applications/j2-admin/trunk/src: main/java/org/apache/jetspeed/portlets/security/groups/ main/java/org/apache/jetspeed/portlets/security/resources/ main/java/org/apache/jetspeed/portlets/security/roles/ main...

Author: vkumar
Date: Tue Apr 21 10:20:04 2009
New Revision: 767104

URL: http://svn.apache.org/viewvc?rev=767104&view=rev
Log:
Removing  old Jsp and wicket based portlet.
http://issues.apache.org/jira/browse/JS2-880

Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/groups/
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupBrowserResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleBrowserResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserBrowserResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UserDetailsResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_ca.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_de.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_es.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_fr.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_hu.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_nl.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_pl.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_ru.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/UsersResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/roles/
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/GroupChooserPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/SubsiteInfo.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserBean.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails$UserAttributesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails$UserCredentialPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails$UserGroupsPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails$UserProfilesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails$UserRolesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_ca.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_de.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_el.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_es.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_hu.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_pl.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_ru.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=767104&r1=767103&r2=767104&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml Tue Apr 21 10:20:04 2009
@@ -154,394 +154,6 @@
     </portlet-info>
 </portlet>
 
- <portlet id="UserBrowserPortlet">
-    <description>The User Browser displays a list of users 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>
-    <description xml:lang="ja">ユーザーブラウザはこのポータル内で管理されているユーザーのリストを表示します。このポートレットにより、ユーザーを追加・編集することができます。</description>
-    <description xml:lang="zh">显示门户的用户列表。可以添加、修改用户资料。</description>
-    <description xml:lang="zh-TW">顯示門戶的用戶列表。可以添加、修改用戶資料。</description>        
-    <portlet-name>UserBrowserPortlet</portlet-name>
-    <display-name>User Browser</display-name>
-    <display-name xml:lang="ja">ユーザーブラウザ</display-name>
-    <display-name xml:lang="zh">浏览用户</display-name>
-    <display-name xml:lang="zh-TW">流覽用戶</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>User Browser</title>
-        <short-title>Users</short-title>
-        <keywords>admin,security,users</keywords>            
-    </portlet-info>
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>10</value>
-        </preference>
-        <preference>
-        	<name>FilterByRole</name>
-        	<value></value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-<!-- 
-<portlet>
-    <description>The Wicket User Browser displays a list of users managed in this portal. From here you can select users for editing. Place this portlet on the same page as the Wicket User Details portlet.</description>
-    <description xml:lang="ja">ユーザーブラウザはこのポータル内で管理されているユーザーのリストを表示します。このポートレットにより、ユーザーを追加・編集することができます。</description>
-    <description xml:lang="zh">显示门户的用户列表。可以添加、修改用户资料。</description>
-    <description xml:lang="zh-TW">顯示門戶的用戶列表。可以添加、修改用戶資料。</description>        
-    <portlet-name>WicketUserBrowserPortlet</portlet-name>
-    <display-name>Wicket User Browser</display-name>
-    <display-name xml:lang="ja">ユーザーブラウザ</display-name>
-    <display-name xml:lang="zh">浏览用户</display-name>
-    <display-name xml:lang="zh-TW">流覽用戶</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
-    <init-param>
-      <name>wicketFilterPath</name>
-      <value>/userbrowser</value>
-    </init-param>
-    <init-param>
-      <name>serviceComponentNames</name>
-      <value>cps:UserManager</value>
-    </init-param>
-    <supports>
-      <mime-type>*/*</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.users.WicketUserBrowser</resource-bundle>
-    <portlet-info>
-        <title>User Browser</title>
-        <short-title>Users</short-title>
-        <keywords>admin,security,users</keywords>            
-    </portlet-info>
-</portlet>
- -->
-<portlet id="UserDetailsPortlet">
-    <description>The User Details portlet displays a users 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>
-    <description xml:lang="ja">ユーザー詳細ポートレットはタブで表示されたユーザー情報の詳細を表示します。このポートレットにより、ユーザー情報の追加・編集することができます。</description>
-    <description xml:lang="zh">显示用户的资料。可以添加修改用户信息。</description>
-    <description xml:lang="zh-TW">顯示用戶的資料。可以添加修改用戶資訊。</description>        
-    <portlet-name>UserDetailsPortlet</portlet-name>
-    <display-name>User Details</display-name>
-    <display-name xml:lang="ja">ユーザー情報詳細</display-name>
-    <display-name xml:lang="zh">用户信息</display-name>
-    <display-name xml:lang="zh-TW">用戶資訊</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>0</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>User Detail Information</title>
-        <short-title>User</short-title>
-        <keywords>admin,security,users</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>showSubsiteForAddUser</name>
-            <value>true</value>
-        </preference>
-        <preference>
-            <name>defaultChangePasswordRequired</name>
-            <value>false</value>
-        </preference>
-        <preference>
-            <name>defaultRole</name>
-            <value>user</value>
-        </preference>
-        <preference>
-            <name>defaultProfile</name>
-            <value>j2</value>
-        </preference>
-        <preference>
-            <name>newUserTemplateDirectory</name>
-            <value>/_user/template/</value>
-        </preference>        
-        <preference>
-     		<name>requiredRole</name>
-            <value></value>   
-        </preference>
-        <preference>
-     		<name>subsiteRootFolder</name>
-            <value>/__subsite-root/_hostname/</value>   
-        </preference>        
-        <preference>
-     		<name>defaultSubsite</name>
-            <value></value>   
-        </preference>                
-    </portlet-preferences>
-</portlet>
-
-<portlet id="WicketUserDetailsPortlet">
-    <description>The Wicket User Details portlet displays a users details in a tabbed view. From here you can add, edit, and delete User information. Place this portlet on the same page as the Wicket User Browser portlet.</description>
-    <description xml:lang="ja">ユーザー詳細ポートレットはタブで表示されたユーザー情報の詳細を表示します。このポートレットにより、ユーザー情報の追加・編集することができます。</description>
-    <description xml:lang="zh">显示用户的资料。可以添加修改用户信息。</description>
-    <description xml:lang="zh-TW">顯示用戶的資料。可以添加修改用戶資訊。</description>        
-    <portlet-name>WicketUserDetailsPortlet</portlet-name>
-    <display-name>Wicket User Details</display-name>
-    <display-name xml:lang="ja">ユーザー情報詳細</display-name>
-    <display-name xml:lang="zh">用户信息</display-name>
-    <display-name xml:lang="zh-TW">用戶資訊</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
-    <init-param>
-      <name>wicketFilterPath</name>
-      <value>/userdetails</value>
-    </init-param>
-    <expiration-cache>0</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.users.WicketUserDetails</resource-bundle>
-    <portlet-info>
-        <title>User Detail Information</title>
-        <short-title>User</short-title>
-        <keywords>admin,security,users</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>showSubsiteForAddUser</name>
-            <value>true</value>
-        </preference>
-        <preference>
-            <name>defaultChangePasswordRequired</name>
-            <value>false</value>
-        </preference>
-        <preference>
-            <name>defaultRole</name>
-            <value>user</value>
-        </preference>
-        <preference>
-            <name>defaultProfile</name>
-            <value>j2</value>
-        </preference>
-        <preference>
-            <name>newUserTemplateDirectory</name>
-            <value>/_user/template/</value>
-        </preference>        
-        <preference>
-     		<name>requiredRole</name>
-            <value></value>   
-        </preference>
-        <preference>
-     		<name>subsiteRootFolder</name>
-            <value>/__subsite-root/_hostname/</value>   
-        </preference>        
-        <preference>
-     		<name>defaultSubsite</name>
-            <value></value>   
-        </preference>                
-    </portlet-preferences>
-</portlet>
-
-<portlet id="GroupDetailsPortlet">
-    <description>The Group Details portlet displays a groups details in a tabbed view. From here you can add, edit, and delete Group information. Place this portlet on the same page as the Group Browser portlet.</description>
-    <description xml:lang="ja">グループ詳細ポートレットは、タブで表示されたグループの詳細を表示します。このポートレットにより、グループの情報を追加・編集することができます。</description>
-    <description xml:lang="zh">显示组的详细信息。可以添加修改组的信息。</description>
-    <description xml:lang="zh-TW">顯示組的詳細資訊。可以添加修改組的資訊。</description>
-    <portlet-name>GroupDetailsPortlet</portlet-name>
-    <display-name>Group Details</display-name>
-    <display-name xml:lang="ja">グループ情報詳細</display-name>
-    <display-name xml:lang="zh">组信息</display-name>
-    <display-name xml:lang="zh-TW">組資訊</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupDetails</portlet-class>        
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/groups/group-details.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>network-workgroup.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.GroupDetailsResources</resource-bundle>
-    <portlet-info>
-        <title>Group Detail Information</title>
-        <short-title>Group</short-title>
-        <keywords>admin,security,group</keywords>            
-    </portlet-info>
-</portlet>
-
-<portlet id="RoleDetailsPortlet">
-    <description>The Role Details portlet displays a roles details in a tabbed view. From here you can add, edit, and delete Role information. Place this portlet on the same page as the Role Browser portlet.</description>
-    <description xml:lang="ja">ロール詳細ポートレットは、タブで表示されたロール情報の詳細を表示します。このポートレットにより、ロール情報の追加・編集することができます。</description>
-    <description xml:lang="zh">显示角色的详细信息。可以添加修改角色信息。</description>
-    <description xml:lang="zh-TW">顯示角色的詳細資訊。可以添加修改角色資訊。</description>
-    <portlet-name>RoleDetailsPortlet</portlet-name>
-    <display-name>Role Details</display-name>
-    <display-name xml:lang="ja">ロール情報詳細</display-name>
-    <display-name xml:lang="zh">角色信息</display-name>
-    <display-name xml:lang="zh-TW">角色信息</display-name>        
-    <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleDetails</portlet-class>        
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/roles/role-details.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>preferences-desktop-theme.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.RoleDetailsResources</resource-bundle>
-    <portlet-info>
-        <title>Role Detail Information</title>
-        <short-title>Role</short-title>
-        <keywords>admin,security,role</keywords>
-    </portlet-info>
-</portlet>
-
 <portlet id="SSOBrowserPortlet">
     <description>SSO Sites Browser displays a list of all configured SSO sites in the portal. From here you can select SSO Sites for editing. Place this portlet on the same page as the SSO Details portlet.</description>
     <description xml:lang="ja">SSO サイトブラウザポートレットは、ポータル内の構成された、すべての SSO サイトの一覧を表示します。ここから、編集したい SSO サイトを選択できます。</description>
@@ -618,296 +230,6 @@
     </portlet-info>
 </portlet>
 
-<portlet id="UserChooser">        
-    <description>A Popup portlet for selecting a single user from a list of users. Usually not placed on a page directly, but accessed by Jetspeed over the portlet pipeline in a popup window.</description>
-    <description xml:lang="ja">ユーザー一覧からユーザーを選択するポップアップポートレットです。通常、直接ページ上には置かれません。ポップアップウィンドウ内でポートレットのパイプライン外でポータルからアクセスされます。</description>
-    <description xml:lang="zh">选择用户的Portlet</description>
-    <description xml:lang="zh-TW">選擇用戶的Portlet</description>        
-    <portlet-name>UserChooser</portlet-name>
-    <display-name>User Chooser (popup)</display-name>
-    <display-name xml:lang="ja">ユーザー選択(ポップアップ)</display-name>
-    <display-name xml:lang="zh">用户</display-name>
-    <display-name xml:lang="zh-TW">用戶</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/users/user-chooser.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>system-users.png</value>
-    </init-param>                                                                                   
-    <expiration-cache>0</expiration-cache>
-    <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>EDIT</portlet-mode>
-        <portlet-mode>VIEW</portlet-mode>
-        <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
-    <portlet-info>
-        <title>User Select</title>
-        <short-title>Users</short-title>
-        <keywords>users,selector,chooser,popup</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
-<portlet id="UserMultiChooser">
-    <description>A Popup portlet for selecting one or more users from a list of users. Usually not placed on a page directly, but accessed by Jetspeed over the portlet pipeline in a popup window.</description>
-    <description xml:lang="ja">ユーザー一覧から一人以上のユーザーを選択するポップアップポートレットです。通常、ページ上には置かれません。ポップアップウィンドウ内でポートレットのパイプライン外でポータルからアクセスされます。</description>
-    <description xml:lang="zh">选择多用户的Portlet</description>
-    <description xml:lang="zh-TW">選擇多用戶的Portlet</description>        
-    <portlet-name>UserMultiChooser</portlet-name>
-    <display-name>Multiple User Chooser (popup)</display-name>
-    <display-name xml:lang="ja">複数ユーザー選択(ポップアップ)</display-name>
-    <display-name xml:lang="zh">选择多个用户</display-name>
-    <display-name xml:lang="zh-TW">選擇多個用戶</display-name>        
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/users/user-multi-chooser.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>system-users.png</value>
-    </init-param>                                                                                           
-    <expiration-cache>0</expiration-cache>
-    <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>EDIT</portlet-mode>
-        <portlet-mode>VIEW</portlet-mode>
-        <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
-    <portlet-info>
-        <title>Users Select</title>
-        <short-title>Users</short-title>
-        <keywords>users,chooser,selector,multi,popup</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
-<portlet id="RoleChooser">
-    <description>A Popup portlet for selecting a single role from a list of roles. Usually not placed on a page directly, but accessed by Jetspeed over the portlet pipeline in a popup window.</description>
-    <description xml:lang="ja">ロール一覧からロールを選択するポップアップポートレットです。通常、ページ上には置かれません。ポップアップウィンドウ内でポートレットのパイプライン外でポータルからアクセスされます。</description>
-    <description xml:lang="zh">选择角色的Portlet</description>
-    <description xml:lang="zh-TW">選擇角色的Portlet</description>        
-    <portlet-name>RoleChooser</portlet-name>
-    <display-name>Role Chooser (popup)</display-name>
-    <display-name xml:lang="ja">ロール選択(ポップアップ)</display-name>
-    <display-name xml:lang="zh">角色</display-name>
-    <display-name xml:lang="zh-TW">角色</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.RoleChooserPortlet</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/users/role-chooser.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>preferences-desktop-theme.png</value>
-    </init-param>                                                                    
-    <expiration-cache>0</expiration-cache>
-    <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>EDIT</portlet-mode>
-        <portlet-mode>VIEW</portlet-mode>
-        <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
-    <portlet-info>
-        <title>Role Select</title>
-        <short-title>Roles</short-title>
-        <keywords>roles,selector,chooser,popup</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
-<portlet id="RoleMultiChooser">
-  <description>A Popup portlet for selecting one or more roles from a list of roles. Usually not placed on a page directly, but accessed by Jetspeed over the portlet pipeline in a popup window.</description>        
-  <description xml:lang="ja">ロール一覧から一つ以上のロールを選択するポップアップポートレットです。通常、ページ上には置かれません。ポップアップウィンドウ内でポートレットのパイプライン外でポータルからアクセスされます。</description>
-  <description xml:lang="zh">选择多个角色的Portlet</description>
-  <description xml:lang="zh-TW">選擇多個角色的Portlet</description>        
-  <portlet-name>RoleMultiChooser</portlet-name>
-  <display-name>Multiple Role Chooser (popup)</display-name>
-  <display-name xml:lang="ja">複数ロール選択(ポップアップ)</display-name>
-  <display-name xml:lang="zh">选择多个角色</display-name>
-  <display-name xml:lang="zh-TW">選擇多個角色</display-name>
-  <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleChooserPortlet</portlet-class>
-  <init-param>
-    <description>This parameter sets the template used in view mode.</description>
-    <name>ViewPage</name>
-    <value>/WEB-INF/security/roles/role-multi-chooser.vm</value>
-  </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>preferences-desktop-theme.png</value>
-    </init-param>                                                                            
-  <expiration-cache>0</expiration-cache>
-  <supports>
-    <mime-type>text/html</mime-type>
-    <portlet-mode>EDIT</portlet-mode>
-    <portlet-mode>VIEW</portlet-mode>
-    <portlet-mode>HELP</portlet-mode>
-  </supports>
-  <supported-locale>en</supported-locale>
-  <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
-  <portlet-info>
-    <title>Roles Select</title>
-    <short-title>Roles</short-title>
-    <keywords>roles,selector,chooser,multi,popup</keywords>
-  </portlet-info>        
-  <portlet-preferences>
-    <preference>
-      <name>WindowSize</name>
-      <value>1000</value>
-    </preference>
-  </portlet-preferences>
-</portlet>
-    
-<portlet id="GroupChooser">
-    <description>A Popup portlet for selecting a single group from a list of groups. Usually not placed on a page directly, but accessed by Jetspeed over the portlet pipeline in a popup window.</description>        
-    <description xml:lang="ja">グループ一覧からグループを選択するポップアップポートレットです。通常、ページ上には置かれません。ポップアップウィンドウ内でポートレットのパイプライン外でポータルからアクセスされます。</description>
-    <description xml:lang="zh">选择组的Portlet</description>
-    <description xml:lang="zh-TW">選擇組的Portlet</description>        
-    <portlet-name>GroupChooser</portlet-name>
-    <display-name>Group Chooser (popup)</display-name>
-    <display-name xml:lang="ja">グループ選択(ポップアップ)</display-name>
-    <display-name xml:lang="zh">组</display-name>
-    <display-name xml:lang="zh-TW">組</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.GroupChooserPortlet</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/users/group-chooser.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>network-workgroup.png</value>
-    </init-param>                                                    
-    <expiration-cache>0</expiration-cache>
-    <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>EDIT</portlet-mode>
-        <portlet-mode>VIEW</portlet-mode>
-        <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
-    <portlet-info>
-        <title>Group Select</title>
-        <short-title>Groups</short-title>
-        <keywords>groups,selector,chooser,popup</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
-<portlet id="GroupBrowser">
-    <description>The Group Browser displays a list of groups managed in this portal. From here you can select Groups for editing. Place this portlet on the same page as the Group Details portlet.</description>        
-    <description xml:lang="ja">グループブラウザは、このポートレット内で管理されるグループ一覧を表示します。ここから、編集したいグループを選択できます。グループ情報詳細ポートレット同じページに置いてください。</description>
-    <description xml:lang="zh">浏览组的Portlet</description>
-    <description xml:lang="zh-TW">流覽組的Portlet</description>        
-    <portlet-name>GroupBrowserPortlet</portlet-name>
-    <display-name>Group Browser</display-name>
-    <display-name xml:lang="ja">グループブラウザ</display-name>
-    <display-name xml:lang="zh">组管理</display-name>
-    <display-name xml:lang="zh-TW">組管理</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupBrowser</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/groups/groups-view.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>network-workgroup.png</value>
-    </init-param>                                                                            
-    <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>org.apache.jetspeed.portlets.security.resources.GroupBrowserResources</resource-bundle>
-    <portlet-info>
-        <title>Group admin</title>
-        <short-title>Groups</short-title>
-        <keywords>admin,security,groups</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
-<portlet id="RoleBrowser">
-    <description>The Role Browser displays a list of roles managed in this portal. From here you can select Roles for editing. Place this portlet on the same page as the Role Details portlet.</description>                
-    <description xml:lang="ja">ロールブラウザは、このポートレット内で管理されるロール一覧を表示します。ここから、編集したいロールを選択できます。ロール情報詳細ポートレットと同じページに置いてください。</description>
-    <description xml:lang="zh">浏览角色的Portlet</description>
-    <description xml:lang="zh-TW">流覽角色的Portlet</description>        
-    <portlet-name>RoleBrowserPortlet</portlet-name>
-    <display-name>Role Browser</display-name>
-    <display-name xml:lang="ja">ロールブラウザ</display-name>
-    <display-name xml:lang="zh">角色管理</display-name>
-    <display-name xml:lang="zh-TW">角色管理</display-name>        
-    <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleBrowser</portlet-class>
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/roles/roles-view.vm</value>
-    </init-param>
-    <init-param>
-        <name>portlet-icon</name>
-        <value>preferences-desktop-theme.png</value>
-    </init-param>                                                                    
-    <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>org.apache.jetspeed.portlets.security.resources.RoleBrowserResources</resource-bundle>
-    <portlet-info>
-        <title>Role admin</title>
-        <short-title>Roles</short-title>
-        <keywords>admin,security,roles</keywords>
-    </portlet-info>        
-    <portlet-preferences>
-        <preference>
-            <name>WindowSize</name>
-            <value>1000</value>
-        </preference>
-    </portlet-preferences>
-</portlet>
-
 <portlet id="LocaleSelector">
     <description>Locale Selector is a portlet to select your preferred locale (language).</description>
     <description xml:lang="ja">言語選択はユーザーのロケールを選択するためのポートレットです。</description>
@@ -1551,7 +873,7 @@
     </portlet-info>
 </portlet>
     
-<portlet>
+<portlet id="portalSiteManager">
     <description>The Portal Site Manager displays a hierarchical view of the entire portal site. From here you can add, edit, and delete folders, links, and pages.</description>
     <description xml:lang="ja">ポータルサイトマネージャは、ポータルサイト全体の階層的な表示を提供します。ここから、フォルダ、リンクおよびページを追加・偏執・削除することができます。</description>
     <portlet-name>PortalSiteManager</portlet-name>
@@ -1608,29 +930,20 @@
     <portlet-name>RPADPortlet</portlet-name>
     <display-name>Remote Portlet Application Deployer</display-name>
     <display-name xml:lang="ja">リモートポートレットアプリケーション配備(RPAD)</display-name>
-    <portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
-    <init-param>
-      <name>portlet-class</name>
-      <value>org.apache.portals.bridges.jsf.FacesPortlet</value>
-    </init-param>
-    <init-param>
-      <name>portlet-filters</name>
-      <value>org.apache.jetspeed.portlets.rpad.portlet.RPADPortletFilter</value>
-    </init-param>
+    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
     <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/view/deployer/displayPortlets.jsp</value>
+      <name>wicketFilterPath</name>
+      <value>/rpad</value>
     </init-param>
     <init-param>
-      <name>EditPage</name>
-      <value>/WEB-INF/view/deployer/displayRepositories.jsp</value>
-    </init-param>
+      <name>principalParam</name>
+      <value>user</value>
+    </init-param> 
     <expiration-cache>300</expiration-cache>
     <supports>
-      <mime-type>text/html</mime-type>
+      <mime-type>*/*</mime-type>
       <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>
-    </supports>
+    </supports>            
     <supported-locale>en</supported-locale>
     <supported-locale>ja</supported-locale>
     <!-- resource-bundle></resource-bundle -->
@@ -1981,7 +1294,7 @@
                 <name>file</name>
                 <value>/_content/menu.html</value>
             </preference>
-        </portlet-preferences>
+        </portlet-preferences>      
    </portlet>
    <portlet>
     <description>The Wicket User Browser displays a list of users managed in this portal. From here you can select users for editing.</description>
@@ -2026,7 +1339,6 @@
       <portlet-mode>VIEW</portlet-mode>
     </supports>
     <supported-locale>en</supported-locale>
-    <!--<resource-bundle>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementUsers</resource-bundle> -->
     <portlet-info>
         <title>Wicket Group Browser</title>
         <short-title>Groups</short-title>
@@ -2050,8 +1362,7 @@
       <mime-type>*/*</mime-type>
       <portlet-mode>VIEW</portlet-mode>
     </supports>
-    <supported-locale>en</supported-locale>
-    <!--<resource-bundle>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementUsers</resource-bundle> -->
+    <supported-locale>en</supported-locale>    
     <portlet-info>
         <title>Wicket Role Browser</title>
         <short-title>Roles</short-title>



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