JBoss Portal SVN: r11915 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/validators and 1 other directories.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-09-17 09:19:46 -0400 (Wed, 17 Sep 2008)
New Revision: 11915
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
Log:
JBPORTAL-2167: Wrong validation message shown in Change password function
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2008-09-17 12:29:20 UTC (rev 11914)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2008-09-17 13:19:46 UTC (rev 11915)
@@ -257,10 +257,12 @@
public String enableUser()
{
+
FacesContext ctx = FacesContext.getCurrentInstance();
ExternalContext ectx = ctx.getExternalContext();
Map params = ectx.getRequestParameterMap();
String action = (String) params.get("enableAction");
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null;
// TODO - do something better than .equals("admin")
@@ -287,12 +289,18 @@
catch (Exception e)
{
log.error("unable to get user: " + this.currentUser, e);
- ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
return "userAdmin";
}
// Updating search
- ctx.addMessage("status", new FacesMessage("user enabled"));
+ if (action.equals("enable"))
+ {
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED")));
+ }
+ else if (action.equals("disable"))
+ {
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED")));
+ }
return this.searchUsers();
}
return "searchUsers";
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2008-09-17 12:29:20 UTC (rev 11914)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2008-09-17 13:19:46 UTC (rev 11915)
@@ -44,8 +44,7 @@
if (passwordComponent != null && passwordComponent instanceof HtmlInputSecret)
{
String password = (String) ((HtmlInputSecret) passwordComponent).getValue();
-
- if (value == null || password == null || !password.equals((String) value))
+ if (password != null && !password.equals((String) value))
{
throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH")));
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2008-09-17 12:29:20 UTC (rev 11914)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2008-09-17 13:19:46 UTC (rev 11915)
@@ -15,7 +15,7 @@
</ui:define>
<ui:define name="content">
- <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ <h:messages infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:panelGrid columns="2">
17 years, 10 months
JBoss Portal SVN: r11914 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-17 08:29:20 -0400 (Wed, 17 Sep 2008)
New Revision: 11914
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
Log:
Make the portlet.xml validate
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -42,7 +42,7 @@
<title>Portlet Content Portlet</title>
<keywords>management,admin</keywords>
</portlet-info>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
<user-attribute>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -32,9 +32,6 @@
<portlet-name>AdminPortlet</portlet-name>
<display-name>Administration Portlet</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
- <supported-locale>en</supported-locale>
- <supported-locale>it</supported-locale>
- <supported-locale>de</supported-locale>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/jsf/objects.xhtml</value>
@@ -47,6 +44,9 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>it</supported-locale>
+ <supported-locale>de</supported-locale>
<portlet-info>
<title>Management Portlet</title>
<keywords>management,admin</keywords>
@@ -75,7 +75,7 @@
<keywords>management,admin</keywords>
</portlet-info>
- <supported-processing-event xmlns:x="urn:jboss:portal:content">x:select</supported-processing-event>
+ <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-processing-event>
</portlet>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -63,7 +63,7 @@
<value>false</value>
</preference>
</portlet-preferences>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -1,45 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- version="2.0">
-
- <filter>
- <filter-name>JBoss Portlet Filter</filter-name>
- <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- <lifecycle>RENDER_PHASE</lifecycle>
- </filter>
-
- <filter-mapping>
- <filter-name>JBoss Portlet Filter</filter-name>
- <portlet-name>TestPortlet</portlet-name>
- <portlet-name>ModePortlet</portlet-name>
- </filter-mapping>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
<portlet>
<description>Mode Portlet</description>
<portlet-name>ModePortlet</portlet-name>
@@ -61,7 +47,9 @@
<portlet-name>HeaderContentPortlet</portlet-name>
<display-name>Header Content Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.HeaderContentPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.HeaderContentPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -74,7 +62,9 @@
<description>Event Portlet</description>
<portlet-name>EventPortlet</portlet-name>
<display-name>Event Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.event.EventPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.event.EventPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -85,20 +75,6 @@
</portlet-info>
</portlet>
<portlet>
- <description>Portlet to test modification of head content</description>
- <portlet-name>HeaderContentPortlet</portlet-name>
- <display-name>Header Content Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.samples.basic.HeaderContentPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title>Header Content portlet</title>
- <keywords>sample,test</keywords>
- </portlet-info>
- </portlet>
- <portlet>
<description>A test portlet</description>
<description xml:lang="fr">C'est une portlet de test</description>
<portlet-name>TestPortlet</portlet-name>
@@ -146,7 +122,7 @@
<supported-publishing-event>
<qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname>
</supported-publishing-event>
-
+
</portlet>
<portlet>
<description>Portlet displaying the number of it's action/render calls</description>
@@ -191,7 +167,9 @@
<description>Portlet using portlet session</description>
<portlet-name>PortletSessionPortlet</portlet-name>
<display-name>Portlet Session Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PortletSessionPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PortletSessionPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -229,7 +207,9 @@
</portlet-info>
</portlet>
<portlet>
- <description>Portlet showing different ways to properly display and submit unicode text</description>
+ <description>
+ Portlet showing different ways to properly display and submit unicode text
+ </description>
<portlet-name>CharsetPortlet</portlet-name>
<display-name>Charset Portlet</display-name>
<portlet-class>org.jboss.portal.core.samples.basic.CharsetPortlet</portlet-class>
@@ -303,8 +283,8 @@
</portlet>
<portlet>
<portlet-name>BasicPortlet</portlet-name>
+ <display-name>Basic Portlet</display-name>
<portlet-class>org.jboss.portal.core.samples.basic.BasicPortlet</portlet-class>
- <display-name>Basic Portlet</display-name>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -318,7 +298,9 @@
<description>File System Content Driven Portlet</description>
<portlet-name>FSContentDrivenPortlet</portlet-name>
<display-name>File System Content Driven Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.FSContentDrivenPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.FSContentDrivenPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -328,8 +310,10 @@
<title>File Portlet</title>
<keywords>sample,test</keywords>
</portlet-info>
+ <supported-publishing-event>
+ <qname xmlns:x="urn:jboss:portal:content">select</qname>
+ </supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
</portlet>
<portlet>
<description>File Upload Portlet</description>
@@ -348,7 +332,9 @@
<description>Portlet which performs a programmatic submit of a form</description>
<portlet-name>FormAutoSubmitPortlet</portlet-name>
<display-name>Form auto submit Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.FormAutoSubmitPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.FormAutoSubmitPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -376,7 +362,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet1</portlet-name>
<display-name>Public Parameters Portlet 1</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -391,7 +379,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet2</portlet-name>
<display-name>Public Parameters Portlet 2</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -406,7 +396,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet3</portlet-name>
<display-name>Public Parameters Portlet 3</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -418,36 +410,6 @@
<supported-public-render-parameter>juu</supported-public-render-parameter>
</portlet>
- <public-render-parameter>
- <name>foo</name>
- <identifier>foo</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <name>bar</name>
- <identifier>bar</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <name>juu</name>
- <identifier>juu</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <identifier>uri</identifier>
- <qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
- </public-render-parameter>
-
- <event-definition>
- <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
-
- <!--
- <custom-portlet-mode>
- <name>ADMIN</name>
- </custom-portlet-mode>
--->
<user-attribute>
<name>user.name.nickName</name>
</user-attribute>
@@ -469,6 +431,7 @@
<user-attribute>
<name>portal.user.last-login-date</name>
</user-attribute>
+
<security-constraint>
<portlet-collection>
<portlet-name>SecuredTestPortlet</portlet-name>
@@ -477,10 +440,48 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
- <event-definition>
+
+ <filter>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <portlet-name>TestPortlet</portlet-name>
+ <portlet-name>ModePortlet</portlet-name>
+ </filter-mapping>
+
+ <event-definition>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
+ <event-definition>
<qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname>
<value-type>java.lang.String</value-type>
</event-definition>
-
+
+ <public-render-parameter>
+ <identifier>foo</identifier>
+ <name>foo</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>bar</identifier>
+ <name>bar</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>juu</identifier>
+ <name>juu</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>uri</identifier>
+ <qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
+ </public-render-parameter>
+
</portlet-app>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -28,18 +28,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
version="2.0">
- <filter>
- <filter-name>JBoss Portlet Filter</filter-name>
- <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- <lifecycle>RENDER_PHASE</lifecycle>
- </filter>
-
- <filter-mapping>
- <filter-name>JBoss Portlet Filter</filter-name>
- <portlet-name>CurrentUsersPortlet</portlet-name>
- </filter-mapping>
-
<portlet>
<description>Current users portlet</description>
<portlet-name>CurrentUsersPortlet</portlet-name>
@@ -71,4 +59,17 @@
</preference>
</portlet-preferences>
</portlet>
+
+ <filter>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <portlet-name>CurrentUsersPortlet</portlet-name>
+ </filter-mapping>
+
</portlet-app>
17 years, 10 months
JBoss Portal SVN: r11913 - modules/web/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-17 04:21:23 -0400 (Wed, 17 Sep 2008)
New Revision: 11913
Modified:
modules/web/trunk/build/pom.xml
Log:
Don't include classpath in the manifest
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-09-17 08:16:55 UTC (rev 11912)
+++ modules/web/trunk/build/pom.xml 2008-09-17 08:21:23 UTC (rev 11913)
@@ -68,7 +68,23 @@
</repository>
</repositories>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<pluginRepositories>
<pluginRepository>
<id>java.net maven repository</id>
17 years, 10 months
JBoss Portal SVN: r11912 - modules/portlet/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-17 04:16:55 -0400 (Wed, 17 Sep 2008)
New Revision: 11912
Modified:
modules/portlet/trunk/build/pom.xml
Log:
Don't include classpath in the manifest
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-09-16 20:50:00 UTC (rev 11911)
+++ modules/portlet/trunk/build/pom.xml 2008-09-17 08:16:55 UTC (rev 11912)
@@ -97,6 +97,18 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
17 years, 10 months
JBoss Portal SVN: r11911 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/jsf/common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-16 16:50:00 -0400 (Tue, 16 Sep 2008)
New Revision: 11911
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
[JBPORTAL-2104] adding id to select boxes for different regions and available portlets
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-16 20:23:48 UTC (rev 11910)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-16 20:50:00 UTC (rev 11911)
@@ -116,10 +116,12 @@
<div class="portlet-editor-content">
<table style="width:100%;" cellspacing="0" cellpadding="0">
<%
+ int index;
for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
{
Instance instance = (Instance)i.next();
- String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
+ index = i.getIndex();
+ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (index % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
String displayName = instance.getDisplayName().getString(locale, true);
PortletInfo info = instance.getPortlet().getInfo();
MetaInfo portletMetaInfo = info.getMeta();
@@ -130,6 +132,7 @@
}
String iconLocation = getIcon(info);
+ String linkId="portlet-instance-link"+"_"+index;
%>
<portlet:actionURL var="url">
<portlet:param name="content.action.select" value="true"/>
@@ -157,7 +160,7 @@
<span
onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
- id="portlet-instance-link"><%= displayName %>
+ id="<%= linkId %>"><%= displayName %>
</a></span>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-09-16 20:23:48 UTC (rev 11910)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-09-16 20:50:00 UTC (rev 11911)
@@ -111,6 +111,7 @@
<td width="100%">
<h:selectManyListbox
value="#{pageManager.assignedWindows[regionName]}"
+ id="selectMany_#{regionName}"
size="7" styleClass="windowList portlet-form-field">
<f:selectItems
value="#{pageManager.windowItemsMap[regionName]}"/>
17 years, 10 months
JBoss Portal SVN: r11910 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-16 16:23:48 -0400 (Tue, 16 Sep 2008)
New Revision: 11910
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
[JBPORTAL-2104] adding unique link id to available portlets
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-16 19:41:16 UTC (rev 11909)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-16 20:23:48 UTC (rev 11910)
@@ -92,10 +92,12 @@
<div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
<table style="width:100%;" cellspacing="0" cellpadding="0">
<%
+ int index;
for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
{
Instance instance = (Instance)i.next();
- String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
+ index = i.getIndex();
+ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (index % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
String displayName = instance.getDisplayName().getString(locale, true);
PortletInfo info = instance.getPortlet().getInfo();
MetaInfo portletMetaInfo = info.getMeta();
@@ -106,6 +108,7 @@
}
String iconLocation = getIcon(info);
+ String linkId="portlet-instance-link"+"_"+index;
%>
<portlet:actionURL var="url">
<portlet:param name="content.action.select" value="true"/>
@@ -127,12 +130,13 @@
</div>
</div>
</div>
+
<tr class="<%= rowClass %>">
<td>
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
<span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="<%= url %>" id="portlet-instance-link"><%= displayName %>
+ href="<%= url %>" id="<%= linkId %>"><%= displayName %>
</a></span></td>
</tr>
<%
17 years, 10 months
JBoss Portal SVN: r11909 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-16 15:41:16 -0400 (Tue, 16 Sep 2008)
New Revision: 11909
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
[JBPORTAL-2104] adding id to select boxes for different regions
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-09-16 17:42:31 UTC (rev 11908)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-09-16 19:41:16 UTC (rev 11909)
@@ -110,6 +110,7 @@
<td width="100%">
<h:selectManyListbox
value="#{pageManager.assignedWindows[regionName]}"
+ id="selectMany_#{regionName}"
size="7" styleClass="windowList portlet-form-field">
<f:selectItems
value="#{pageManager.windowItemsMap[regionName]}"/>
17 years, 10 months
JBoss Portal SVN: r11908 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-16 13:42:31 -0400 (Tue, 16 Sep 2008)
New Revision: 11908
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
Log:
[JBPORTAL-2104] merging changes from Branch 26:11907
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-09-16 15:43:15 UTC (rev 11907)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-09-16 17:42:31 UTC (rev 11908)
@@ -90,7 +90,7 @@
</tr>
<tr>
<td>
- <h:form>
+ <h:form id="dashboardLayoutForm">
#{bundle.DASHBOARD_CHOOSE_LAYOUT}:<br/>
<h:selectOneMenu
id="layoutSelector"
@@ -108,7 +108,7 @@
</tr>
<tr>
<td>
- <h:form>
+ <h:form id="dashboardThemeForm">
#{bundle.DASHBOARD_CHOOSE_THEME}:<br/>
<h:selectOneMenu
id="themeSelector"
17 years, 10 months
JBoss Portal SVN: r11907 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-16 11:43:15 -0400 (Tue, 16 Sep 2008)
New Revision: 11907
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
Log:
[JBPORTAL-2104] adding id to forms to help with test automation
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-16 10:50:12 UTC (rev 11906)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-16 15:43:15 UTC (rev 11907)
@@ -90,7 +90,7 @@
</tr>
<tr>
<td>
- <h:form>
+ <h:form id="dashboardLayoutForm">
#{bundle.DASHBOARD_CHOOSE_LAYOUT}:<br/>
<h:selectOneMenu
id="layoutSelector"
@@ -108,7 +108,7 @@
</tr>
<tr>
<td>
- <h:form>
+ <h:form id="dashboardThemeForm">
#{bundle.DASHBOARD_CHOOSE_THEME}:<br/>
<h:selectOneMenu
id="themeSelector"
17 years, 10 months
JBoss Portal SVN: r11906 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: resources/portal-identity-sar/conf/bundles and 1 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-16 06:50:12 -0400 (Tue, 16 Sep 2008)
New Revision: 11906
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
Log:
sync JBPORTAL-2164 from 2.6 branch
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16 10:32:59 UTC (rev 11905)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16 10:50:12 UTC (rev 11906)
@@ -272,12 +272,12 @@
catch (IdentityException e)
{
log.error("error while updating password", e);
- ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
}
else
{
- ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
this.resetWindowState(ctx);
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16 10:32:59 UTC (rev 11905)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16 10:50:12 UTC (rev 11906)
@@ -51,8 +51,8 @@
IDENTITY_EDIT_PASSWORD_TITLE=Change your password
IDENTITY_EDIT_PASSWORD_CURRENT=Current password
IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
-IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Password has been updated.
IDENTITY_EDIT_EMAIL_TITLE=Change your email address
IDENTITY_EDIT_EMAIL_NEW=New email address
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-16 10:32:59 UTC (rev 11905)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-16 10:50:12 UTC (rev 11906)
@@ -20,7 +20,9 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
- <h:form>
+ <h:messages infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+ <h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
<h:commandButton id ="search" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="#{useradministrationbean.searchUsers}" styleClass="portlet-form-button"/>
17 years, 10 months