portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r348264 [1/2] - in /portals/jetspeed-2/trunk/applications/jetspeed-admin: ./ src/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jetspeed/ src/java/org/apache/jetspeed/portlets/ src/java/org/apache/jetspeed/portlets/entity...
Date Tue, 22 Nov 2005 22:07:12 GMT
Author: taylor
Date: Tue Nov 22 14:06:45 2005
New Revision: 348264

URL: http://svn.apache.org/viewcvs?rev=348264&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-413

Simplify Build, step one
Combine security, pam, palm --> j2-admin single portlet app

Added:
    portals/jetspeed-2/trunk/applications/jetspeed-admin/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/.cvsignore
    portals/jetspeed-2/trunk/applications/jetspeed-admin/maven.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/project.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/project.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/entityeditor/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/entityeditor/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/localeselector/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/localeselector/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/palm/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/palm/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/palm/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/pam/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/pam/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/profiler/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/registration/
      - copied from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/registration/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/security/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/SecurityApplicationResources.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityApplicationResources.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/SecurityResources.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityResources.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/SecurityUtil.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityUtil.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/groups/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/groups/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ca.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ca.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_de.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_de.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_es.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_es.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_hu.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_hu.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_it.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_it.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ja.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ja.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_pl.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_pl.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ru.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_ru.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_zh.properties
      - copied unchanged from r348126, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_zh.properties
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/roles/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/roles/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/sso/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/sso/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/GroupChooserPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/GroupChooserPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBean.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserBean.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/selector/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/selector/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/site/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/site/SiteDetailsPortlet.java
      - copied unchanged from r345860, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailsPortlet.java
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/java/org/apache/jetspeed/portlets/statistics/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/statistics/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/META-INF/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/META-INF/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/c.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/c.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/faces-config.xml
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/faces-config.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/fmt.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/fmt.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-tree.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/jetspeed-tree.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/model/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/model/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/model/spring-portlet-configuration.xml
      - copied unchanged from r345861, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/model/spring-portlet-configuration.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/pam.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/pam.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/chgpwd/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/chgpwd/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/groups/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/login/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/roles/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/sso/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/users/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/sql.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/sql.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/struts-config.xml
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/struts-config.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/validation.xml
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/validation.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/validator-rules.xml
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/validator-rules.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/velocity/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/velocity/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/locale-list.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/locale-list.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/metadata-detail.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/metadata-detail.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/palm.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/palm/src/webapp/WEB-INF/view/palm.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-browser.jsp
      - copied, changed from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pam-browser.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-detail.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pam-detail.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pemp/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pemp/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/portlet-detail.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/portlet-detail.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/profiler-admin.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/profiler-admin.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/profiler-criterion.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/profiler-criterion.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/profiler-help.html
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/profiler-help.html
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/prototype.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/prototype.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/selectors/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/selectors/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site-detail.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-detail.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/add-page.vm
      - copied unchanged from r345862, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site/add-page.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/statistics/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/statistics/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/status-include.vm
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/view/status-include.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/tabs.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/view/tabs.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/user-admin.jsp
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/user-admin.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/web.xml
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/x.tld
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/x.tld
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/css/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/css/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/images/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/group-chooser.gif
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/images/group-chooser.gif
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/selected.gif
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/images/selected.gif
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/sw_med_rond.gif
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/images/sw_med_rond.gif
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/tree/Thumbs.db   (with props)
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/user-chooser.gif
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/images/user-chooser.gif
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/waste_bin.gif
      - copied unchanged from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/images/waste_bin.gif
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/javascript/
      - copied from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/javascript/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/scripts/
      - copied from r345531, portals/jetspeed-2/trunk/applications/security/src/webapp/scripts/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/xdocs/
    portals/jetspeed-2/trunk/applications/jetspeed-admin/xdocs/navigation.xml
Modified:
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-details.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-view.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.vm
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/site-browser.jsp
    portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/images/Thumbs.db

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/.cvsignore
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/.cvsignore?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/.cvsignore (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/.cvsignore Tue Nov 22 14:06:45 2005
@@ -0,0 +1,3 @@
+target
+*.log
+jcoverage.ser

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/maven.xml?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/maven.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/maven.xml Tue Nov 22 14:06:45 2005
@@ -0,0 +1,37 @@
+<project default="java:jar"
+         xmlns:j="jelly:core"
+         xmlns:define="jelly:define">
+
+
+  <!-- ================================================================ -->
+  <!-- Hot Deploy for mundane everyday development under Catalina       -->
+  <!-- ================================================================ -->
+  <goal name="hotdeploy">
+    <echo message="Hot Deploying ${org.apache.jetspeed.portlet.app.name} to ${org.apache.jetspeed.deploy.war.dir}"/>
+    <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/WEB-INF/classes">
+        <fileset dir="${maven.build.dir}/classes">
+        </fileset>
+    </copy>
+    <copy todir="${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portlet.app.name}/">
+      <fileset dir="./src/webapp"/>
+    </copy>
+  </goal>
+
+  <preGoal name="hotdeploy">
+   <attainGoal name= "java:compile"/>
+  </preGoal>
+  
+  <goal name="hotdeploywar">
+    <echo message="Hot Deploying war for ${org.apache.jetspeed.portlet.app.name} to ${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/deploy"/>
+
+    <copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/deploy" 
+		file="${maven.build.dir}/${maven.war.final.name}">
+      
+    </copy>
+  </goal>
+  
+  <preGoal name="hotdeploywar">
+   <attainGoal name= "war"/>
+  </preGoal>
+
+</project>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/project.properties?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/project.properties (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/project.properties Tue Nov 22 14:06:45 2005
@@ -0,0 +1,22 @@
+# Copyright 2004 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.
+#
+# $Id: project.properties 187110 2004-07-24 11:01:23Z paulsp $
+#
+
+maven.multiproject.type=war
+maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+
+org.apache.jetspeed.portlet.app.name=j2-admin
+

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/project.xml?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/project.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/project.xml Tue Nov 22 14:06:45 2005
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+
+    $Id: project.xml 332389 2005-11-10 22:30:52Z ate $
+-->
+<project>
+    <extend>${basedir}/../../project-info.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>j2-admin</artifactId>
+    <name>Jetspeed-2 Administration</name>
+    <description>Jetspeed-2 Administration and Security</description>
+    <shortDescription>Administration</shortDescription>
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/j2-admin</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/j2-admin
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/j2-admin/</url>
+    </repository>
+    
+    <dependencies>
+      
+    <!-- Pluto Container -->
+    <dependency>
+      <id>org.apache.pluto:pluto</id>
+      <version>${pluto.version}</version>
+      <type>jar</type>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+        <id>portlet-api</id>
+        <version>1.0</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>false</war.bundle>
+        </properties>
+    </dependency>
+
+    <!-- Jetspeed -->
+    <dependency>
+        <id>jetspeed2:jetspeed-api</id>  
+        <version>${jetspeed.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>false</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>jetspeed2:jetspeed-commons</id> 
+        <version>${jetspeed.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>false</war.bundle>
+        </properties>
+    </dependency>    
+    <dependency>
+        <id>jetspeed2:jetspeed-statistics</id> 
+        <version>${jetspeed.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>jetspeed2:jetspeed2-taglib-treecontrol</id>
+        <version>${jetspeed.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+
+    <!-- Portals Bridges -->
+    <dependency>
+        <id>portals-gems:portals-gems</id>
+        <version>${jetspeed.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>    
+    <dependency>        
+      <id>portals-bridges:portals-bridges-common</id>
+      <version>${portals.bridges.common.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>                       
+    <dependency>
+      <id>portals-bridges:portals-bridges-frameworks</id>
+      <version>${portals.bridges.frameworks.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>portals-bridges:portals-bridges-velocity</id>
+      <version>${portals.bridges.velocity.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+        <id>portals-bridges:portals-bridges-jsf</id>
+        <version>${portals.bridges.jsf.version}</version>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    
+    <!-- Servlets, JSTL -->      
+    <dependency>
+        <id>jstl</id>
+        <version>1.0.6</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>taglibs:standard</id>
+        <version>1.0.6</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>taglibs:request</id>
+        <version>1.0.1</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>servletapi</id>
+        <version>2.3</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>false</war.bundle>
+        </properties>
+    </dependency>
+    
+    <!-- Commons -->        
+    <dependency>
+      <id>commons-validator</id>
+      <version>1.1.3</version>
+      <url>http://jakarta.apache.org/commons/validator/</url>
+      <properties>
+            <war.bundle>true</war.bundle>
+      </properties>    
+    </dependency>        
+    <dependency>
+        <id>commons-logging</id>
+        <version>${commons.logging.version}</version>
+        <type>jar</type>
+        <url>http://jakarta.apache.org/commons/logging.html</url>
+        <properties>
+            <war.bundle>${commons.logging.include}</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>commons-el</id>
+        <version>1.0</version>
+        <type>jar</type>
+        <url>http://jakarta.apache.org/commons/el/</url>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>commons-collections</id>
+        <version>3.0</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>commons-digester</id>
+        <version>1.5</version>
+        <type>jar</type>
+        <url>http://jakarta.apache.org/commons/digester.html</url>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>commons-beanutils</id>
+        <version>1.6.1</version>
+        <type>jar</type>
+        <url>http://jakarta.apache.org/commons/beanutils.html</url>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>commons-codec</id>
+        <version>1.2</version>
+        <type>jar</type>
+        <url>http://jakarta.apache.org/commons/codec/</url>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/fileupload/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+        <id>log4j</id>
+        <version>${log4j.version}</version>
+        <type>jar</type>
+        <properties>
+            <war.bundle>${log4j.include}</war.bundle>
+        </properties>
+    </dependency>
+
+    <!-- JSF -->            
+    <dependency>
+        <id>myfaces:myfaces-impl</id>
+    <version>${myfaces.version}</version>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+    <dependency>
+        <id>myfaces:myfaces-api</id>
+        <version>${myfaces.version}</version>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+	<dependency>
+        <id>myfaces:tomahawk</id>
+        <version>${myfaces.version}</version>
+        <properties>
+            <war.bundle>true</war.bundle>
+        </properties>
+    </dependency>
+
+    <!-- Spring -->        
+    <dependency>
+      <id>springframework:spring</id>
+      <version>${spring.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency> 
+
+    <!-- Velocity -->
+    <dependency>
+      <id>velocity</id>
+      <version>1.4</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>
+    <dependency>
+      <id>velocity-tools</id>
+      <version>1.1</version>
+      <url>http://jakarta.apache.org/velocity</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>      
+    </dependency>                
+                   
+    <!-- Antlr -->
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>2.7.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+                                    
+    </dependencies>
+
+</project>

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-portlet.xml?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-portlet.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/jetspeed-portlet.xml Tue Nov 22 14:06:45 2005
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+-->
+<portlet-app id="j2-admin" version="1.0"
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    xmlns:js="http://portals.apache.org/jetspeed"
+    xmlns:dc="http://www.purl.org/dc">
+
+    <dc:title>Jetspeed-2 Administration Portlets</dc:title>
+    <dc:title xml:lang="en">Jetspeed-2 Administration Portlets</dc:title>
+    <dc:creator>J2 Team</dc:creator>
+
+    <portlet>
+        <portlet-name>LoginPortlet</portlet-name>
+        <dc:title>Login Portlet</dc:title>
+        <dc:creator>J2 Team</dc:creator>
+    </portlet>
+
+    <portlet>
+        <portlet-name>LocaleSelectorPortlet</portlet-name>
+        <dc:title>Locale Selector Portlet</dc:title>
+        <dc:creator>J2 Team</dc:creator>
+    </portlet>
+
+	<js:services>        
+        <js:service name='ApplicationServerManager'/>
+        <js:service name='DeploymentManager'/>
+		<js:service name='EntityAccessor'/>
+        <js:service name='GroupManager'/>    
+        <js:service name='PageManager'/>    
+        <js:service name='PermissionManager'/>        
+        <js:service name='PortalAdministration'/>        
+        <js:service name='PortletFactory'/>        
+        <js:service name='PortalAdministration'/>
+        <js:service name='PortletRegistryComponent'/>
+        <js:service name='PortalStatistics'/>        
+        <js:service name="Profiler" />         
+        <js:service name='RoleManager'/>
+	    <js:service name='SearchComponent'/>                
+        <js:service name="SSO" />                 
+        <js:service name='UserManager'/>        
+	</js:services>
+
+</portlet-app>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.xml?rev=348264&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/portlet.xml Tue Nov 22 14:06:45 2005
@@ -0,0 +1,843 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+-->
+<portlet-app id="j2-admin" version="1.0">
+
+<portlet id="PortletApplicationLifecyleManager">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/palm.jsp</value>
+     </init-param>
+    <portlet-name>PortletApplicationLifecycleManager</portlet-name>
+    <display-name>Portlet Application Lifecycle Manager</display-name>
+    <description>The PALM (Portlet Application Lifecycle Manager) manages the lifecyle of portlet applications. From here you can start, stop, undeploy and delete portlet applications</description>
+    <portlet-class>org.apache.jetspeed.portlets.palm.PortletApplicationLifecycleManager</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>
+    <portlet-info>
+      <title>Portlet Application Lifecycle Manager</title>
+      <short-title>PALM</short-title>
+      <keywords>applications,apps,PALM</keywords>
+    </portlet-info>
+  </portlet>
+
+    <portlet id="LoginPortlet">
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/login/login.jsp</value>
+        </init-param>
+        <portlet-name>LoginPortlet</portlet-name>
+        <display-name>Login</display-name>
+        <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</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>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+        <portlet-info>
+            <title>Login</title>
+            <short-title>Login</short-title>
+        </portlet-info>
+    </portlet>
+    <portlet id="LoginPortletForXHTMLBasic">
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/login/login-xhtmlbasic.jsp</value>
+        </init-param>
+        <portlet-name>LoginPortletForXHTMLBasic</portlet-name>
+        <display-name>Login for XHTML Basic</display-name>
+        <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</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>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+        <portlet-info>
+            <title>Login</title>
+            <short-title>Login</short-title>
+        </portlet-info>
+    </portlet>
+    <!-- *********************** -->
+    <!-- Change Password Portlet -->
+    <!-- *********************** -->
+    <portlet id="ChangePasswordPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/chgpwd/change-password.jsp</value>
+        </init-param>
+        <portlet-name>ChangePasswordPortlet</portlet-name>
+        <display-name>Change Password</display-name>
+        <description>Change current logged on user its password.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.ChangePasswordPortlet</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>
+        <supported-locale>nl</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.ChgPwdResources</resource-bundle>
+        <portlet-info>
+            <title>Change Password</title>
+            <short-title>Change Password</short-title>
+            <keywords>security,user,password</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserBrowserPortlet">
+        <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>
+        <portlet-name>UserBrowserPortlet</portlet-name>
+        <display-name>User Browser</display-name>
+        <description>The User Browser displays a list of users managed in this portal. From here you can add, edit, and users.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserBrowser</portlet-class>
+        <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>
+        </portlet-preferences>
+    </portlet>
+
+    <portlet id="UserDetailsPortlet">
+        <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>
+        <portlet-name>UserDetailsPortlet</portlet-name>
+        <display-name>User Information</display-name>
+        <description>The User Details portlet displays a users details in a tabbed view. From here you can add, edit, and user information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserDetailsPortlet</portlet-class>
+        <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-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>false</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>user</value>
+            </preference>
+            <preference>
+                <name>defaultProfile</name>
+                <value>j2</value>
+            </preference>
+            <preference>
+                <name>newUserTemplateDirectory</name>
+                <value>/_user/template/</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>User Detail Information</title>
+            <short-title>User</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupDetailsPortlet">
+        <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>
+        <portlet-name>GroupDetailsPortlet</portlet-name>
+        <display-name>Group Information</display-name>
+        <description>The Group Details portlet displays a groups details in a tabbed view. From here you can add, edit, and group information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupDetails</portlet-class>
+        <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">
+        <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>
+        <portlet-name>RoleDetailsPortlet</portlet-name>
+        <display-name>Role Information</display-name>
+        <description>The Role Details portlet displays a roles details in a tabbed view. From here you can add, edit, and role information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleDetails</portlet-class>
+        <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">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/sso/sites-view.vm</value>
+        </init-param>
+        <portlet-name>SSOBrowserPortlet</portlet-name>
+        <display-name>SSO Sites Browser</display-name>
+        <description>SSO Sites Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.sso.SSOBrowser</portlet-class>
+        <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.SSOResources</resource-bundle>
+        <portlet-info>
+            <title>SSO Sites</title>
+            <short-title>Sites</short-title>
+            <keywords>admin,security,site,SSO</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="SSODetailsPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/sso/sites-details.vm</value>
+        </init-param>
+        <portlet-name>SSODetailsPortlet</portlet-name>
+        <display-name>SSO Details</display-name>
+        <description>SSO Site Details Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.sso.SSODetails</portlet-class>
+        <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.SSODetailsResources</resource-bundle>
+        <portlet-info>
+            <title>SSO Details</title>
+            <short-title>SSO Details</short-title>
+            <keywords>admin,security,site,SSO</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserChooser">
+        <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>
+        <portlet-name>UserChooser</portlet-name>
+        <display-name>Users</display-name>
+        <description>User Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
+        <expiration-cache>-1</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-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>User Select</title>
+            <short-title>Users</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserMultiChooser">
+        <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>
+        <portlet-name>UserMultiChooser</portlet-name>
+        <display-name>Choose Multiple Users</display-name>
+        <description>Multiple User Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
+        <expiration-cache>-1</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-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Users Select</title>
+            <short-title>Users</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="RoleChooser">
+        <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>
+        <portlet-name>RoleChooser</portlet-name>
+        <display-name>Roles</display-name>
+        <description>Role Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.RoleChooserPortlet</portlet-class>
+        <expiration-cache>-1</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-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Role Select</title>
+            <short-title>Roles</short-title>
+            <keywords>admin,security,roles</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupChooser">
+        <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>
+        <portlet-name>GroupChooser</portlet-name>
+        <display-name>Groups</display-name>
+        <description>Group Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.GroupChooserPortlet</portlet-class>
+        <expiration-cache>-1</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-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Group Select</title>
+            <short-title>Groups</short-title>
+            <keywords>admin,security,groups</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupBrowser">
+        <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>
+        <portlet-name>GroupBrowserPortlet</portlet-name>
+        <display-name>Group Admin</display-name>
+        <description>Group Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupBrowser</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>org.apache.jetspeed.portlets.security.resources.GroupBrowserResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Group admin</title>
+            <short-title>Groups</short-title>
+            <keywords>admin,security,groups</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="RoleBrowser">
+        <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>
+        <portlet-name>RoleBrowserPortlet</portlet-name>
+        <display-name>Role Admin</display-name>
+        <description>Role Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleBrowser</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>org.apache.jetspeed.portlets.security.resources.RoleBrowserResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Role admin</title>
+            <short-title>Roles</short-title>
+            <keywords>admin,security,roles</keywords>
+        </portlet-info>
+    </portlet>
+
+<portlet id="LocaleSelector">
+    <portlet-name>LocaleSelector</portlet-name>
+    <display-name>Locale Selector</display-name>
+    <description>Locale Selector is a portlet to select your preferred locale</description>
+    <portlet-class>org.apache.jetspeed.portlets.localeselector.LocaleSelectorPortlet</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>
+    <supported-locale>ja</supported-locale>
+    <resource-bundle>org.apache.jetspeed.portlets.localeselector.resources.LocaleSelectorResources</resource-bundle>
+    <portlet-info>
+      <title>Locale Selector</title>
+      <short-title>This is a portlet to select your preferred locale</short-title>
+      <keywords>Locale,Language</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortletApplicationBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/pam-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortletApplicationBrowser</portlet-name>
+    <display-name>Portlet Application Browser</display-name>
+    <description>The PAM (Portlet Application Manager) Portlet Application Browser displays a list of portlet applications deployed to this portal. From here you can add, edit, and delete portlet applications.</description>
+    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
+    <expiration-cache>-1</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>    
+    <portlet-info>
+      <title>Portlet Application Browser</title>
+      <short-title>Apps</short-title>
+      <keywords>applications,apps,PAM</keywords>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="PortletApplicationDetail">
+    <init-param>
+      <description>This parameter sets the template used in view mode.</description>
+      <name>ViewPage</name>
+      <value>//WEB-INF/view/pam-detail.jsp</value>
+    </init-param>   
+    <portlet-name>PortletApplicationDetail</portlet-name>
+    <display-name>Portlet Application Detail</display-name>
+    <description>The PAM (Portlet Application Manager) Portlet Application Detail displays a specific portlet application deployed to this portal. From here you can add, edit, and delete this portlet application.</description>
+    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
+    <expiration-cache>-1</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>    
+    <portlet-info>
+      <title>Portlet Application Detail</title>
+      <short-title>PAD</short-title>
+      <keywords>applications,apps,PAM</keywords>
+    </portlet-info>
+  </portlet>
+<!--
+<portlet id="PortalSiteBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/site-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortalSiteBrowser</portlet-name>
+    <display-name>Portal Site Browser</display-name>
+    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.portals.bridges.jsf.FacesPortlet</portlet-class>
+    <expiration-cache>-1</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>
+    <portlet-info>
+      <title>Portal Site Browser</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+</portlet>
+-->
+<portlet id="PortalSiteBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/site/site-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortalSiteBrowser</portlet-name>
+    <display-name>Portal Site Browser</display-name>
+    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.jetspeed.portlets.site.SiteBrowserPortlet</portlet-class>
+    <expiration-cache>-1</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>
+    <portlet-info>
+      <title>Portal Site Browser</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortalSiteDetail">
+	<init-param>
+		<name>spring-configuration</name>
+		<value>/WEB-INF/model/spring-portlet-configuration.xml</value>
+	</init-param>
+	<init-param>
+		<name>validator-configuration</name>
+		<value>/WEB-INF/model/validator-configuration.xml</value>
+	</init-param>	
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>folder-view</value>
+     </init-param>   
+    <portlet-name>PortalSiteDetail</portlet-name>
+    <display-name>Portal Site Detail</display-name>
+    <description>The Portal Site Detail portlet displays the details of a selected folder/page.  From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.jetspeed.portlets.site.SiteDetailsPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+     <resource-bundle>org.apache.jetspeed.portlets.site.resources.SiteResources</resource-bundle>            	
+    <portlet-info>
+      <title>Portal Site Detail</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+	
+</portlet>
+
+<portlet id="ProfilerAdmin">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+		<value>/WEB-INF/view/profiler-admin.jsp</value>
+     </init-param>   
+    <init-param>
+    	<description>This parameter sets the template used in help mode.</description>
+		<name>HelpPage</name>
+		<value>/WEB-INF/view/profiler-help.html</value>
+     </init-param>   
+    <portlet-name>ProfilerAdmin</portlet-name>
+    <display-name>Profiler Admin</display-name>
+    <description>The Profiler Admin is used to adminstrate profiling rules.</description>
+    <portlet-class>org.apache.jetspeed.portlets.profiler.ProfilerAdminPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Profiler Admin</title>
+      <short-title>Profiler</short-title>
+      <keywords>admin,profiler</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="JetspeedUserAdmin">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+                <name>ViewPage</name>
+                        <value>/WEB-INF/view/user-admin.jsp</value>
+     </init-param>   
+    <portlet-name>JetspeedUserAdmin</portlet-name>
+    <display-name>User Administration</display-name>
+    <description>User Administration of portal users in the system.</description>
+    <portlet-class>org.apache.jetspeed.portlets.security.users.UserManagerPortlet</portlet-class>
+    <expiration-cache>-1</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>
+    <portlet-info>
+      <title>User Administration</title>
+      <short-title>Users</short-title>
+      <keywords>admin,security,users</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortletSelector">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/selectors/portlet-selector.vm</value>
+     </init-param>   
+    <portlet-name>PortletSelector</portlet-name>
+    <display-name>Portlet Selector</display-name>
+    <description>Select one or more portlets from the customizer</description>
+    <portlet-class>org.apache.jetspeed.portlets.selector.PortletSelector</portlet-class>
+    <expiration-cache>-1</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.site.resources.SiteResources</resource-bundle>            
+    <portlet-preferences>
+      <preference>                            
+        <name>WindowSize</name>                    
+        <value>15</value>    
+      </preference>                               		    
+    </portlet-preferences>            
+    <portlet-info>
+      <title>Portlet Selector</title>
+      <short-title>Portlets</short-title>
+      <keywords>portlet,selector,customizer,chooser,add</keywords>
+    </portlet-info>
+</portlet>
+<portlet id="PortletEntityBrowserPortlet">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/pemp/browser_view.vm</value>
+     </init-param>
+    <portlet-name>PortletEntityBrowserPortlet</portlet-name>
+    <display-name>Portlet Entity Browser</display-name>
+    <description>Provides for browsing portlet enitites</description>
+    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityBrowserPortlet</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>
+    <portlet-info>
+      <title>Portlet Entity Browser</title>
+      <short-title>Portlet Entity Browser</short-title>
+      <keywords>applications,apps,entity,manager</keywords>
+    </portlet-info>
+  </portlet>
+  <portlet id="PortletEntityEditorPortlet">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/pemp/editor_view.vm</value>
+     </init-param>
+    <portlet-name>PortletEntityEditorPortlet</portlet-name>
+    <display-name>Portlet Entity Browser</display-name>
+    <description>Provides for editing of portlet enitites</description>
+    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityEditorPortlet</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>
+    <portlet-info>
+      <title>Portlet Entity Editor</title>
+      <short-title>Portlet Entity Editor</short-title>
+      <keywords>applications,apps,entity,manager</keywords>
+    </portlet-info>
+  </portlet>
+
+<portlet id="StatisticsPortlet">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/statistics/statistics.vm</value>
+     </init-param>
+    <portlet-name>StatisticsPortlet</portlet-name>
+    <display-name>Portal Statistics</display-name>
+    <description>Provides statistics about portal access by page, portlet, user</description>
+    <portlet-class>org.apache.jetspeed.portlets.statistics.StatisticsPortlet</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>
+    <portlet-info>
+      <title>Portal Statistics</title>
+      <short-title>Statistics</short-title>
+      <keywords>statistics,portlets,pages,access</keywords>
+    </portlet-info>
+  </portlet>
+
+</portlet-app>
+

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/groups-view.vm?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/groups-view.vm (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/groups/groups-view.vm Tue Nov 22 14:06:45 2005
@@ -26,7 +26,7 @@
 	$action.setParameter("group", $group)           
 	   #if ($selected == $group)
        <td class="$rowstyle" nowrap width='12'>
-         <img src="/security/images/selected.gif" />
+         <img src="/j2-admin/images/selected.gif" />
        </td>	 	
        #else
        <td class="$rowstyle" nowrap width='12'>

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/roles-view.vm?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/roles-view.vm (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/roles/roles-view.vm Tue Nov 22 14:06:45 2005
@@ -26,7 +26,7 @@
 	$action.setParameter("role", $role)           
 	   #if ($selected == $role)
        <td class="$rowstyle" nowrap width='12'>
-         <img src="/security/images/selected.gif" />
+         <img src="/j2-admin/images/selected.gif" />
        </td>	 	
        #else
        <td class="$rowstyle" nowrap width='12'>

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-details.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-details.vm?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-details.vm (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-details.vm Tue Nov 22 14:06:45 2005
@@ -62,7 +62,7 @@
     #end    
      #if ($currentP == $principal)
        <td class="$rowstyle" nowrap width='12'>
-         <img src="/security/images/selected.gif" width="7" height="12" border="0" vspace="2"/>
+         <img src="/j2-admin/images/selected.gif" width="7" height="12" border="0" vspace="2"/>
        </td>
 	 #else
        <td class="$rowstyle" nowrap width='12'>
@@ -79,7 +79,7 @@
       </td>      
        <td class="$rowstyle" nowrap width='24' align='center'>
          <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmToDeleteRemote')','$MESSAGES.getString('confirmDelete')','securityform','ssoDelete','$principal.PortalPrincipalName','YesNoReturnMethod()');">
-           <img src="/security/images/waste_bin.gif" width="20" height="15" border="0"/>            
+           <img src="/j2-admin/images/waste_bin.gif" width="20" height="15" border="0"/>            
          </a>
        </td>      
     <td class="">&nbsp;</td>               
@@ -98,11 +98,11 @@
 	 <a href="javascript:openWindow('$userChooser');">
         <img title="Select a User"
              name="assigneeImage" 
-             src="/security/images/user-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>      
+             src="/j2-admin/images/user-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>      
 	 <a href="javascript:openWindow('$groupChooser');">
         <img title="Select a Group"
              name="assigneeImage" 
-             src="/security/images/group-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>                   
+             src="/j2-admin/images/group-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>                   
     </td>      
     </td>
   </tr>

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-view.vm?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-view.vm (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/sso/sites-view.vm Tue Nov 22 14:06:45 2005
@@ -21,7 +21,7 @@
 
 *#
 
-<script language='JavaScript' src='/security/scripts/jetspeed-security.js'></script>
+<script language='JavaScript' src='/j2-admin/scripts/jetspeed-security.js'></script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
 
@@ -53,7 +53,7 @@
 
    #if ($ssoName == $currentName)
    <td class="$rowstyle" nowrap width='12'>
-     <img src="/security/images/selected.gif" />
+     <img src="/j2-admin/images/selected.gif" />
    </td>	 	
    #else
    <td class="$rowstyle" nowrap width='12'>
@@ -68,7 +68,7 @@
       </td>
        <td class="$rowstyle" nowrap width='24' align='center'>
          <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmtodeletesite')','$MESSAGES.getString('confirmdelete')','ssoForm','ssoDelete','$ssoUrl','YesNoReturnMethod()');">
-           <img src="/security/images/waste_bin.gif" width="20" height="14" border="0"/>            
+           <img src="/j2-admin/images/waste_bin.gif" width="20" height="14" border="0"/>            
          </a>
        </td>      
     <td class="">&nbsp;</td>               

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.jsp?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.jsp (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.jsp Tue Nov 22 14:06:45 2005
@@ -20,7 +20,7 @@
 	<portlet:param name="node" value="${name}" />
 </portlet:actionURL>
 
-<pam:tree tree="j2_tree" images="/security/images" scope="portlet_request"
+<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
           action="<%= nodeLink %>"
           style="tree-control"
           styleSelected="portlet-section-alternate"

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.vm?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.vm (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/security/users/user-browser.vm Tue Nov 22 14:06:45 2005
@@ -1,4 +1,26 @@
-<script language='JavaScript' src='/idtb/scripts/idtb.js'></script>
+#*
+Copyright 2004 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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id$
+
+*#
+<script language='JavaScript' src='/j2-admin/scripts/jetspeed-security.js'></script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
 
@@ -26,7 +48,7 @@
 	$action.setParameter("user", $user)           
 	   #if ($selected == $user)
        <td class="$rowstyle" nowrap width='12'>
-         <img src="/security/images/selected.gif" />
+         <img src="/j2-admin/images/selected.gif" />
        </td>	 	
        #else
        <td class="$rowstyle" nowrap width='12'>

Copied: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-browser.jsp (from r345531, portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pam-browser.jsp)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-browser.jsp?p2=portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-browser.jsp&p1=portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pam-browser.jsp&r1=345531&r2=348264&rev=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/pam-browser.jsp (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/pam-browser.jsp Tue Nov 22 14:06:45 2005
@@ -97,7 +97,7 @@
 	<portlet:param name="node" value="${name}" />
 </portlet:actionURL>
 
-<pam:tree tree="j2_tree" images="/pam/images" scope="portlet_request"
+<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
           action="<%= nodeLink %>"
           style="tree-control"
           styleSelected="portlet-section-alternate"

Modified: portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/site-browser.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/site-browser.jsp?rev=348264&r1=345531&r2=348264&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/site-browser.jsp (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed-admin/src/webapp/WEB-INF/view/site/site-browser.jsp Tue Nov 22 14:06:45 2005
@@ -40,7 +40,7 @@
 	<portlet:param name="node" value="${name}" />
 </portlet:actionURL>
 
-<pam:tree tree="site-tree" images="/pam/images/tree" scope="portlet_request"
+<pam:tree tree="site-tree" images="/j2-admin/images/tree" scope="portlet_request"
           action="<%= nodeLink %>"
           style="tree-control"
           styleSelected="portlet-section-alternate"          



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


Mime
View raw message