JBoss Portal SVN: r10813 - in branches/JBoss_Portal_Branch_2_6: core-identity/src/resources/portal-identity-sar/conf/bundles and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-24 14:18:40 -0400 (Sat, 24 May 2008)
New Revision: 10813
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
Log:
update for italian traslation
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-24 18:17:22 UTC (rev 10812)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-24 18:18:40 UTC (rev 10813)
@@ -58,6 +58,7 @@
CMS_CREATEFOLDER= Crea Cartella
CMS_CREATEFILE=Crea File
CMS_UPLOADARCHIVE=Carica Archivio
+CMS_UPLOADARCHIVE_ASYNC=Carica Archivio in modo asincrono
CMS_BACKTOBROWSER=Torna al Navigatore delle Directory
CMS_TRANSFER=Importa/Esporta
CMS_EXPORTARCHIVE=Esporta Cartella
@@ -96,4 +97,7 @@
CMS_PATH=Localit\u00e0
CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota .
+
+CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nell\'aggiornamento dell\'archivio. Riprova attivando la modalit\u00e0 asincrona
+CMS_MSG_UPLOADARCHIVE_ASYNC=L\'archivio \u00e8 stato accettato. Le risorse appariranno nella tua cartella una volta terminato il processo
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:17:22 UTC (rev 10812)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:18:40 UTC (rev 10813)
@@ -39,6 +39,7 @@
IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti.
IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione.
IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto.
+IDENTITY_REGISTER_FAILED=La registrazione \u00e8 fallita per un motivo sconosciuto.
IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login?
IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password.
@@ -47,6 +48,8 @@
IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato.
IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita
+IDENTITY_SERVER_ERROR=Errore inaspettato sul Server dell\'identit\u00e0
+
IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo.
IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password
IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente
Modified: branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:17:22 UTC (rev 10812)
+++ branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:18:40 UTC (rev 10813)
@@ -61,4 +61,4 @@
# Nav
continue=Continua
back=Indietro
-retry=Riprova
+retry=Riprova
\ No newline at end of file
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10812 - in branches/JBoss_Portal_Branch_2_7: migration/src/resources/portal-migration-war/WEB-INF/classes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-24 14:17:22 -0400 (Sat, 24 May 2008)
New Revision: 10812
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
Log:
update for italian traslation
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 17:24:58 UTC (rev 10811)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:17:22 UTC (rev 10812)
@@ -39,6 +39,7 @@
IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti.
IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione.
IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto.
+IDENTITY_REGISTER_FAILED=La registrazione \u00e8 fallita per un motivo sconosciuto.
IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login?
IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password.
@@ -47,6 +48,8 @@
IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato.
IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita
+IDENTITY_SERVER_ERROR=Errore inaspettato sul Server dell\'identit\u00e0
+
IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo.
IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password
IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente
Modified: branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 17:24:58 UTC (rev 10811)
+++ branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:17:22 UTC (rev 10812)
@@ -61,4 +61,4 @@
# Nav
continue=Continua
back=Indietro
-retry=Riprova
+retry=Riprova
\ No newline at end of file
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10811 - in branches/JBoss_Portal_Branch_2_7/core-samples/src: resources/portal-users-samples-war/WEB-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-24 13:24:58 -0400 (Sat, 24 May 2008)
New Revision: 10811
Added:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
I add customization and help page for current users portlet.
See http://jira.jboss.org/jira/browse/JBPORTAL-2026
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:24:58 UTC (rev 10811)
@@ -22,6 +22,15 @@
package org.jboss.portal.core.samples.users;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Set;
+
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.UnavailableException;
+
import org.apache.log4j.Logger;
import org.jboss.portal.core.identity.UsersActivityStatsService;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -30,13 +39,6 @@
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.UnavailableException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-
/**
* Read the current users online and write them in output.
*
@@ -44,51 +46,67 @@
*/
public class CurrentUsersPortlet extends JBossPortlet {
- /** Logger */
- public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
+ /** Logger */
+ public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
- protected void doView(JBossRenderRequest rRequest,
- JBossRenderResponse rResponse) throws PortletException,
- IOException, UnavailableException {
- UsersActivityStatsService uass = (UsersActivityStatsService) this
- .getPortletContext().getAttribute("UsersActivityStats");
+ /** Help page */
+ private static final String JSP_HELP = "/WEB-INF/jsp/users/help.jsp";
- rResponse.setContentType("text/html");
- PrintWriter writer = rResponse.getWriter();
+ protected void doHelp(JBossRenderRequest request,
+ JBossRenderResponse response) throws PortletException,
+ PortletSecurityException, IOException {
+ response.setContentType("text/html");
+ PortletRequestDispatcher dispatcher = getPortletContext()
+ .getRequestDispatcher(JSP_HELP);
+ dispatcher.include(request, response);
+ }
- long currentTime = System.currentTimeMillis();
+ protected void doView(JBossRenderRequest rRequest,
+ JBossRenderResponse rResponse) throws PortletException,
+ IOException, UnavailableException {
+
+ String guestNumber = rRequest.getPreferences().getValue("guestNumber","");
+
+ UsersActivityStatsService uass = (UsersActivityStatsService) this
+ .getPortletContext().getAttribute("UsersActivityStats");
- // TODO: this is wrong - should pass period instead of current time -
- // actually it works by a coincedence...
- Set users = uass.getActiveUsersNames(currentTime);
+ rResponse.setContentType("text/html");
+ PrintWriter writer = rResponse.getWriter();
- int sessionCount = uass.getActiveSessionCount(currentTime);
+ long currentTime = System.currentTimeMillis();
- int allLoggedSessions = uass.getUsersActivities(currentTime).size();
+ // TODO: this is wrong - should pass period instead of current time -
+ // actually it works by a coincedence...
+ Set users = uass.getActiveUsersNames(currentTime);
- if (sessionCount == 1) {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(sessionCount));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext()
- .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
- rd.include(rRequest, rResponse);
- } else if (sessionCount > 1) {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(sessionCount));
- ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext()
- .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
- rd.include(rRequest, rResponse);
- } else {
- PortletRequestDispatcher rd = getPortletContext()
- .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
- rd.include(rRequest, rResponse);
- }
+ int sessionCount = uass.getActiveSessionCount(currentTime);
- writer.close();
- }
+ int allLoggedSessions = uass.getUsersActivities(currentTime).size();
+
+ if (sessionCount == 1 || (guestNumber.equals("false") && users.size() == 1)) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
+ rd.include(rRequest, rResponse);
+ } else if (sessionCount > 1) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
+ rd.include(rRequest, rResponse);
+ } else {
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
+ rd.include(rRequest, rResponse);
+ }
+
+ writer.close();
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:24:58 UTC (rev 10811)
@@ -21,12 +21,17 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-NO_USERS_ONLINE=No logged-in user
+NO_USERS_ONLINE=No online user
ONE_USER_ONLINE_0=There is <b>
-ONE_USER_ONLINE_1=</b> logged-in user:
+ONE_USER_ONLINE_1=</b> online user
+ONE_USER_LOGGED_1=</b> logged user
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=There are <b>
-USERS_ONLINE_1=</b> logged-in users:
+USERS_ONLINE_1=</b> online users
+USERS_LOGGED_1=</b> logged users
USERS_ARE_0=<b>
-USERS_ARE_1=</b>
\ No newline at end of file
+USERS_ARE_1=</b>
+USERS_WHICH_0=Whose <b>
+USERS_WHICH_1=</b> are logged-in:
+USERS_WHICH_2=</b> is logged-in:
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:24:58 UTC (rev 10811)
@@ -23,10 +23,15 @@
NO_USERS_ONLINE=Nessun utente \u00e8 online
ONE_USER_ONLINE_0=Al momento c'\u00e8 <b>
-ONE_USER_ONLINE_1=</b> utente online:
+ONE_USER_ONLINE_1=</b> utente online
+ONE_USER_LOGGED_1=</b> utente loggato
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=Al momento ci sono <b>
-USERS_ONLINE_1=</b> utenti online:
+USERS_ONLINE_1=</b> utenti online
+USERS_LOGGED_1=</b> utenti loggati
USERS_ARE_0=<b>
-USERS_ARE_1=</b>
\ No newline at end of file
+USERS_ARE_1=</b>
+USERS_WHICH_0=Di cui <b>
+USERS_WHICH_1=</b> sono loggati:
+USERS_WHICH_2=</b> \u00e8 loggato:
\ No newline at end of file
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp 2008-05-24 17:24:58 UTC (rev 10811)
@@ -0,0 +1,41 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+
+<portlet:defineObjects />
+
+<div class="portlet-font" style="font-size: larger; font-weight: bold">Current
+Users Portlet Help:</div>
+</div>
+<br />
+<div class="portlet-font">Description: The Current users Portlet
+shows current users actually connected. You can to see both guest and
+logged users number and to see which users are logged.</div>
+<br />
+<div class="portlet-font">You can to manage what to show to users.
+You can to choose paragraphes to show, clicking the checkboxes</div>
+<br />
+<br />
+<div class="portlet-font"><a
+ href="<portlet:renderURL portletMode='view'/>">Back</a></div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:24:58 UTC (rev 10811)
@@ -32,13 +32,34 @@
<tr>
<td colspan="1">
<span class="portlet-text">
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
${n:i18n("ONE_USER_ONLINE_0")}
${n:out("USERS_COUNT")}
- ${n:i18n("ONE_USER_ONLINE_1")}
+ ${n:i18n("ONE_USER_ONLINE_1")}
<br/><br/>
+ <% }
+ java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
+ org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext =
+ ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext();
+ if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %>
+
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
+ ${n:i18n("USERS_WHICH_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("USERS_WHICH_2")}
+ <% } else { %>
+ ${n:i18n("ONE_USER_ONLINE_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("ONE_USER_LOGGED_1")}
+ <% } %>
+ <br/><br/>
+ <% }
+ if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %>
+
${n:i18n("ONE_USER_IS_0")}
${n:out("USERS")}
${n:i18n("ONE_USER_IS_1")}
+ <% } %>
</span>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:24:58 UTC (rev 10811)
@@ -32,13 +32,38 @@
<tr>
<td colspan="1">
<span class="portlet-text">
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
${n:i18n("USERS_ONLINE_0")}
${n:out("USERS_COUNT")}
- ${n:i18n("USERS_ONLINE_1")}
+ ${n:i18n("USERS_ONLINE_1")}
+ <br/><br/>
+ <% }
+ java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
+ org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext =
+ ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext();
+ if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %>
+
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
+ ${n:i18n("USERS_WHICH_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %>
+ ${n:i18n("USERS_WHICH_1")}
+ <% } else { %>
+ ${n:i18n("USERS_WHICH_2")}
+ <% } %>
+ <% } else { %>
+ ${n:i18n("USERS_ONLINE_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("USERS_LOGGED_1")}
+ <% } %>
<br/><br/>
+ <% }
+ if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %>
+
${n:i18n("USERS_ARE_0")}
${n:out("USERS")}
- ${n:i18n("USERS_ARE_1")}
+ ${n:i18n("USERS_ARE_1")}
+ <% } %>
</span>
</td>
</tr>
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-05-24 17:23:43 UTC (rev 10810)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 17:24:58 UTC (rev 10811)
@@ -44,5 +44,19 @@
<title>Current users</title>
<keywords>sample,test</keywords>
</portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>guestNumber</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>loggedNumber</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>loggedUsers</name>
+ <value>true</value>
+ </preference>
+ </portlet-preferences>
</portlet>
</portlet-app>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10810 - in branches/JBoss_Portal_Branch_2_6/core-samples/src: resources/portal-users-samples-war/WEB-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-24 13:23:43 -0400 (Sat, 24 May 2008)
New Revision: 10810
Added:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
I add customization and help page for current users portlet.
See http://jira.jboss.org/jira/browse/JBPORTAL-2026
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:23:43 UTC (rev 10810)
@@ -22,6 +22,15 @@
package org.jboss.portal.core.samples.users;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Set;
+
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.UnavailableException;
+
import org.apache.log4j.Logger;
import org.jboss.portal.core.identity.UsersActivityStatsService;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -30,67 +39,74 @@
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.UnavailableException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-
/**
* Read the current users online and write them in output.
- *
+ *
* @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a>
*/
-public class CurrentUsersPortlet extends JBossPortlet
-{
+public class CurrentUsersPortlet extends JBossPortlet {
- /** Logger */
- public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
+ /** Logger */
+ public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
- protected void doView(JBossRenderRequest rRequest, JBossRenderResponse rResponse) throws PortletException,
- IOException, UnavailableException
- {
- UsersActivityStatsService uass = (UsersActivityStatsService) this.getPortletContext().getAttribute(
- "UsersActivityStats");
+ /** Help page */
+ private static final String JSP_HELP = "/WEB-INF/jsp/users/help.jsp";
- rResponse.setContentType("text/html");
- PrintWriter writer = rResponse.getWriter();
+ protected void doHelp(JBossRenderRequest request,
+ JBossRenderResponse response) throws PortletException,
+ PortletSecurityException, IOException {
+ response.setContentType("text/html");
+ PortletRequestDispatcher dispatcher = getPortletContext()
+ .getRequestDispatcher(JSP_HELP);
+ dispatcher.include(request, response);
+ }
- long currentTime = System.currentTimeMillis();
+ protected void doView(JBossRenderRequest rRequest,
+ JBossRenderResponse rResponse) throws PortletException,
+ IOException, UnavailableException {
+
+ String guestNumber = rRequest.getPreferences().getValue("guestNumber","");
+
+ UsersActivityStatsService uass = (UsersActivityStatsService) this
+ .getPortletContext().getAttribute("UsersActivityStats");
- //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence...
- Set users = uass.getActiveUsersNames(currentTime);
+ rResponse.setContentType("text/html");
+ PrintWriter writer = rResponse.getWriter();
- int sessionCount = uass.getActiveSessionCount(currentTime);
+ long currentTime = System.currentTimeMillis();
- int allLoggedSessions = uass.getUsersActivities(currentTime).size();
+ // TODO: this is wrong - should pass period instead of current time -
+ // actually it works by a coincedence...
+ Set users = uass.getActiveUsersNames(currentTime);
- if (sessionCount == 1)
- {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(sessionCount));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
- rd.include(rRequest, rResponse);
- }
- else if (sessionCount > 1)
- {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(sessionCount));
- ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
- rd.include(rRequest, rResponse);
- }
- else
- {
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
- rd.include(rRequest, rResponse);
- }
+ int sessionCount = uass.getActiveSessionCount(currentTime);
- writer.close();
- }
+ int allLoggedSessions = uass.getUsersActivities(currentTime).size();
+
+ if (sessionCount == 1 || (guestNumber.equals("false") && users.size() == 1)) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
+ rd.include(rRequest, rResponse);
+ } else if (sessionCount > 1) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
+ rd.include(rRequest, rResponse);
+ } else {
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
+ rd.include(rRequest, rResponse);
+ }
+
+ writer.close();
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:23:43 UTC (rev 10810)
@@ -21,13 +21,15 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-NO_USERS_ONLINE=No logged-in user
+NO_USERS_ONLINE=No online user
ONE_USER_ONLINE_0=There is <b>
ONE_USER_ONLINE_1=</b> online user
+ONE_USER_LOGGED_1=</b> logged user
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=There are <b>
USERS_ONLINE_1=</b> online users
+USERS_LOGGED_1=</b> logged users
USERS_ARE_0=<b>
USERS_ARE_1=</b>
USERS_WHICH_0=Whose <b>
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:23:43 UTC (rev 10810)
@@ -24,10 +24,12 @@
NO_USERS_ONLINE=Nessun utente \u00e8 online
ONE_USER_ONLINE_0=Al momento c'\u00e8 <b>
ONE_USER_ONLINE_1=</b> utente online
+ONE_USER_LOGGED_1=</b> utente loggato
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=Al momento ci sono <b>
USERS_ONLINE_1=</b> utenti online
+USERS_LOGGED_1=</b> utenti loggati
USERS_ARE_0=<b>
USERS_ARE_1=</b>
USERS_WHICH_0=Di cui <b>
Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp 2008-05-24 17:23:43 UTC (rev 10810)
@@ -0,0 +1,41 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+
+<portlet:defineObjects />
+
+<div class="portlet-font" style="font-size: larger; font-weight: bold">Current
+Users Portlet Help:</div>
+</div>
+<br />
+<div class="portlet-font">Description: The Current users Portlet
+shows current users actually connected. You can to see both guest and
+logged users number and to see which users are logged.</div>
+<br />
+<div class="portlet-font">You can to manage what to show to users.
+You can to choose paragraphes to show, clicking the checkboxes</div>
+<br />
+<br />
+<div class="portlet-font"><a
+ href="<portlet:renderURL portletMode='view'/>">Back</a></div>
\ No newline at end of file
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:23:43 UTC (rev 10810)
@@ -32,14 +32,30 @@
<tr>
<td colspan="1">
<span class="portlet-text">
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
${n:i18n("ONE_USER_ONLINE_0")}
${n:out("USERS_COUNT")}
- ${n:i18n("ONE_USER_ONLINE_1")}
- <% java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
+ ${n:i18n("ONE_USER_ONLINE_1")}
+ <br/><br/>
+ <% }
+ java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext =
- ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext();
- if (!currentContext.get("USERS").equals("[]")) { %>
+ ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext();
+ if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %>
+
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
+ ${n:i18n("USERS_WHICH_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("USERS_WHICH_2")}
+ <% } else { %>
+ ${n:i18n("ONE_USER_ONLINE_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("ONE_USER_LOGGED_1")}
+ <% } %>
<br/><br/>
+ <% }
+ if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %>
+
${n:i18n("ONE_USER_IS_0")}
${n:out("USERS")}
${n:i18n("ONE_USER_IS_1")}
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:23:43 UTC (rev 10810)
@@ -32,24 +32,34 @@
<tr>
<td colspan="1">
<span class="portlet-text">
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
${n:i18n("USERS_ONLINE_0")}
${n:out("USERS_COUNT")}
- ${n:i18n("USERS_ONLINE_1")}
- <% java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
+ ${n:i18n("USERS_ONLINE_1")}
+ <br/><br/>
+ <% }
+ java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get();
org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext =
((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext();
- if (!currentContext.get("USERS_LOGGED_COUNT").equals("0")) { %>
+ if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %>
+
+ <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %>
+ ${n:i18n("USERS_WHICH_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %>
+ ${n:i18n("USERS_WHICH_1")}
+ <% } else { %>
+ ${n:i18n("USERS_WHICH_2")}
+ <% } %>
+ <% } else { %>
+ ${n:i18n("USERS_ONLINE_0")}
+ ${n:out("USERS_LOGGED_COUNT")}
+ ${n:i18n("USERS_LOGGED_1")}
+ <% } %>
<br/><br/>
- ${n:i18n("USERS_WHICH_0")}
- ${n:out("USERS_LOGGED_COUNT")}
- <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %>
- ${n:i18n("USERS_WHICH_1")}
- <% } else { %>
- ${n:i18n("USERS_WHICH_2")}
- <% } %>
<% }
- if (!currentContext.get("USERS").equals("[]")) { %>
- <br/><br/>
+ if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %>
+
${n:i18n("USERS_ARE_0")}
${n:out("USERS")}
${n:i18n("USERS_ARE_1")}
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 01:39:58 UTC (rev 10809)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 17:23:43 UTC (rev 10810)
@@ -35,6 +35,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
@@ -44,5 +45,19 @@
<title>Current users</title>
<keywords>sample,test</keywords>
</portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>guestNumber</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>loggedNumber</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>loggedUsers</name>
+ <value>true</value>
+ </preference>
+ </portlet-preferences>
</portlet>
</portlet-app>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10809 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-05-23 21:39:58 -0400 (Fri, 23 May 2008)
New Revision: 10809
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
Log:
8.3.2. Page Policy Properties
- starting markup and content revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:13:15 UTC (rev 10808)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:39:58 UTC (rev 10809)
@@ -149,7 +149,7 @@
<sect2>
<title>Portal Policy Properties</title>
<para>
- A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties:
+ A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal-policy properties:
</para>
<para>
<table frame="all">
@@ -240,12 +240,12 @@
</para>
</sect2>
<sect2>
- <title>Page policy properties</title>
- <para>A set of properties configure the the behavior of the page policy. Those properties will only be
- taken in account for objects of type portal and page.</para>
+ <title>Page Policy Properties</title>
+ <para>
+ A set of properties configure the the behavior of the page policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents page-policy properties:
+ </para>
<para>
<table frame="all">
- <title>Page policy properties</title>
<tgroup cols="3" align="left" colsep="1" rowset="1">
<colspec colname='c1'/>
<colspec colname='c2'/>
@@ -259,41 +259,44 @@
</thead>
<tbody>
<row>
- <entry align="center">control.page.access_denied</entry>
- <entry align="center">On access denied</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.access_denied</computeroutput></entry>
+ <entry align="center">when access is denied</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center">control.page.unavailable</entry>
- <entry align="center">On resource not available</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.unavailable</computeroutput></entry>
+ <entry align="center">when a resource is unavailable</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center">control.page.error</entry>
- <entry align="center">On an expected error</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.error</computeroutput></entry>
+ <entry align="center">when an expected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center">control.page.internal_error</entry>
- <entry align="center">On an unexpected error</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.internal_error</computeroutput></entry>
+ <entry align="center">when an unexpected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center">control.page.not_found</entry>
- <entry align="center">On resource not found</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.not_found</computeroutput></entry>
+ <entry align="center">when a resource is not found</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center">control.page.resource_uri</entry>
- <entry align="center">The path of the JSP used for redirections</entry>
- <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry>
+ <entry align="center"><computeroutput>control.page.resource_uri</computeroutput></entry>
+ <entry align="center">the path of the JSP used for redirections</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
- <para>An example of page configuration:
- <programlisting><![CDATA[
+ </para>
+ <para>
+ The following page configuration details the use of page-policy properties:
+ </para>
+ <para>
+<programlisting><![CDATA[
<page>
<page-name>MyPortal</page-name>
...
@@ -328,8 +331,15 @@
</page>
]]></programlisting>
</para>
- <note>You can configure the page properties also on objects of type portal, in that case they will be inherited by the pages
- which are located in the portal.</note>
+ <para>
+ <note>
+ <para>
+ You can configure the page properties also on objects of type portal, in that case they will be inherited by the pages
+ which are located in the portal.
+ </para>
+ </note>
+</para>
+
</sect2>
</sect1>
<sect1>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10808 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-05-23 21:13:15 -0400 (Fri, 23 May 2008)
New Revision: 10808
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml
Log:
Chapter 8. Error Handling Configuration
- minor revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 22:02:29 UTC (rev 10807)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:13:15 UTC (rev 10808)
@@ -9,7 +9,7 @@
</chapterinfo>
<title>Error Handling Configuration</title>
<para>
- The JBoss Portal request pipeline allows fine-grained, dynamic configuration of how JBoss Portal behaves when errors occur at runtime.
+ The JBoss Portal request pipeline allows fine-grained, dynamic configuration of how JBoss Portal behaves when errors occur during runtime.
</para>
<sect1>
<title>Error Types</title>
@@ -117,7 +117,7 @@
<sect2>
<title>Portal Policy</title>
<para>
- The portal error-policy controls the response that is sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore the error. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with appropriate request attributes, allowing page customization.
+ The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore the error. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization.
</para>
</sect2>
<sect2>
@@ -144,11 +144,12 @@
<sect1>
<title>Configuration using XML Descriptors</title>
<para>
- Different policies are configured using portal object properties, allowing the error-handling policy for objects to be configured in XML descriptors, <filename>*-object.xml</filename> files, for a portal deployment.
+ Different policies are configured using portal object properties, allowing the error-handling policy for objects to be configured in XML descriptors -- the <filename>*-object.xml</filename> files -- for a portal deployment.
</para>
<sect2>
<title>Portal Policy Properties</title>
- <para>A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties:
+ <para>
+ A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties:
</para>
<para>
<table frame="all">
@@ -198,8 +199,11 @@
</tgroup>
</table>
</para>
- <para>An example of portal configuration:
- <programlisting><![CDATA[
+ <para>
+ The following portal configuration details the use of portal-policy properties:
+ </para>
+ <para>
+<programlisting><![CDATA[
<portal>
<portal-name>MyPortal</portal-name>
...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-23 22:02:29 UTC (rev 10807)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-24 01:13:15 UTC (rev 10808)
@@ -33,7 +33,7 @@
</mediaobject>
</para>
<para>
- Before reading the following sections, be familiar with how to define a page and a portal. Refer to <xref linkend="desc_example_page" /> for details.
+ Before reading the following sections, be familiar with how to define pages and portal. Refer to <xref linkend="desc_example_page" /> for details.
</para>
</sect1>
<sect1>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10807 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-23 18:02:29 -0400 (Fri, 23 May 2008)
New Revision: 10807
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
Log:
added support for session and guest
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-23 22:00:51 UTC (rev 10806)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-23 22:02:29 UTC (rev 10807)
@@ -34,20 +34,24 @@
public static final int NAVIGATION = 0;
- public static final int SIGN_OUT = 1;
+ public static final int EXIT = 1;
private String id;
+ private String sessionId;
+
private long timestamp;
private final int type;
+ public final static String GUEST = "guest";
+
private UserActivity()
{
this.type = NAVIGATION;
}
- public UserActivity(String id, long timestamp, int type)
+ public UserActivity(String id, String sessionId, long timestamp, int type)
{
if (id == null)
{
@@ -55,6 +59,7 @@
}
this.id = id;
+ this.sessionId = sessionId;
this.timestamp = timestamp;
this.type = type;
}
@@ -65,7 +70,8 @@
{
throw new IllegalArgumentException("Id (notification message) cannot be null");
}
- this.id = notification.getMessage();
+ this.id = notification.getMessage().substring(0, notification.getMessage().indexOf("_"));
+ this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf("_"));
this.timestamp = notification.getTimeStamp();
this.type = Integer.parseInt(notification.getType());
}
@@ -75,6 +81,11 @@
return id;
}
+ public String getSessionId()
+ {
+ return sessionId;
+ }
+
public long getTimestamp()
{
return timestamp;
@@ -85,7 +96,6 @@
return type;
}
-
public boolean equals(Object o)
{
if (this == o)
@@ -97,9 +107,9 @@
return false;
}
- UserActivity that = (UserActivity)o;
+ UserActivity that = (UserActivity) o;
- if (!id.equals(that.id))
+ if (!id.equals(that.id) || !sessionId.equals(that.sessionId))
{
return false;
}
@@ -110,7 +120,7 @@
public int hashCode()
{
int result;
- result = id.hashCode();
+ result = id.hashCode() + sessionId.hashCode();
return result;
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-23 22:00:51 UTC (rev 10806)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-23 22:02:29 UTC (rev 10807)
@@ -33,6 +33,8 @@
public Set getActiveUsersIds(long period);
+ public int getActiveSessionCount(long period);
+
public Set getActiveUsersNames(long period);
public Set getUsersActivities(long period);
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-23 22:00:51 UTC (rev 10806)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-23 22:02:29 UTC (rev 10807)
@@ -1,24 +1,24 @@
/*
-* 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.
+ */
package org.jboss.portal.core.identity;
@@ -42,16 +42,20 @@
import java.util.Set;
/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
+ * com">Boleslaw Dawidowicz</a>
* @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a>
* @version $Revision$
*/
-public class UsersActivityStatsServiceImpl extends AbstractJBossService implements UsersActivityStatsService, NotificationListener
+public class UsersActivityStatsServiceImpl extends AbstractJBossService
+ implements
+ UsersActivityStatsService,
+ NotificationListener
{
/** Our logger. */
private static final Logger log = Logger.getLogger(UsersActivityStatsServiceImpl.class);
- //TODO: some value just to begin - find some good default
+ // TODO: some value just to begin - find some good default
private int userTrackerThreadsNumber = 10;
private int updaterThreadsNumber = 1;
@@ -86,7 +90,8 @@
updaterExecutor = Executors.newScheduledThreadPool(getUpdaterThreadsNumber());
- updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(), TimeUnit.MILLISECONDS);
+ updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(),
+ TimeUnit.MILLISECONDS);
if (activityBroadcasterName != null)
{
@@ -97,7 +102,6 @@
addNotificationListener(this, null, null);
}
-
}
protected void stopService() throws Exception
@@ -114,23 +118,39 @@
Set results = new HashSet();
for (Iterator iterator = activityResults.iterator(); iterator.hasNext();)
{
- UserActivity ua = (UserActivity)iterator.next();
- if (currentTime - ua.getTimestamp() < period)
+ UserActivity ua = (UserActivity) iterator.next();
+ if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST))
{
- results.add(ua.getId());
+ results.add(ua.getSessionId());
}
}
return results;
}
+ public int getActiveSessionCount(long period)
+ {
+ long currentTime = System.currentTimeMillis();
+
+ int results = 0;
+ for (Iterator iterator = activityResults.iterator(); iterator.hasNext();)
+ {
+ UserActivity ua = (UserActivity) iterator.next();
+ if (currentTime - ua.getTimestamp() < period && ua.getId().equals(UserActivity.GUEST))
+ {
+ results++;
+ }
+ }
+ return results;
+ }
+
public Set getActiveUsersNames(long period)
{
long currentTime = System.currentTimeMillis();
Set results = new HashSet();
for (Iterator iterator = activityResults.iterator(); iterator.hasNext();)
{
- UserActivity ua = (UserActivity)iterator.next();
- if (currentTime - ua.getTimestamp() < period)
+ UserActivity ua = (UserActivity) iterator.next();
+ if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST))
{
results.add(ua.getId());
}
@@ -144,7 +164,7 @@
Set results = new HashSet();
for (Iterator iterator = activityResults.iterator(); iterator.hasNext();)
{
- UserActivity ua = (UserActivity)iterator.next();
+ UserActivity ua = (UserActivity) iterator.next();
if (currentTime - ua.getTimestamp() < period)
{
results.add(ua);
@@ -157,21 +177,17 @@
{
try
{
- Notification notification = new Notification(Integer.toString(userActivity.getType()),
- this.getServiceName(),
- userActivity.getTimestamp(),
- userActivity.getTimestamp(),
- userActivity.getId());
+ Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(),
+ userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + "_"
+ + userActivity.getSessionId());
-
if (activityBroadcasterName != null)
{
log.debug("Broadcasting user activity notification ");
- server.invoke(new ObjectName(activityBroadcasterName),
- "sendNotification",
- new Object[]{notification},
- new String[]{Notification.class.getName()});
+ server.invoke(new ObjectName(activityBroadcasterName), "sendNotification", new Object[]
+ {notification}, new String[]
+ {Notification.class.getName()});
}
else
{
@@ -185,7 +201,6 @@
log.error("Failed to send user activity notification: ", e);
}
-
}
public void handleNotification(Notification notification, Object object)
@@ -213,7 +228,6 @@
userTrackerExecutor.execute(task);
}
-
public int getUserTrackerThreadsNumber()
{
return userTrackerThreadsNumber;
@@ -283,7 +297,7 @@
this.activityQueue = activityQueue;
}
- //never run
+ // never run
private Updater()
{
this.activityQueue = null;
@@ -297,10 +311,10 @@
while (!activityQueue.isEmpty())
{
- UserActivity activity = (UserActivity)activityQueue.poll();
+ UserActivity activity = (UserActivity) activityQueue.poll();
if (activity != null && ((currentTime - activity.getTimestamp()) < activityTimeout))
{
- if (activity.getType() != UserActivity.SIGN_OUT)
+ if (activity.getType() != UserActivity.EXIT)
{
stillActive.add(activity);
}
@@ -316,6 +330,4 @@
}
}
-
}
-
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10806 - in branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users: event and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-23 18:00:51 -0400 (Fri, 23 May 2008)
New Revision: 10806
Added:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java
Log:
added support for session and guest
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-23 14:54:41 UTC (rev 10805)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-23 22:00:51 UTC (rev 10806)
@@ -26,12 +26,12 @@
import org.jboss.portal.core.identity.UsersActivityStatsService;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
+import org.jboss.portlet.JBossPortlet;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.portlet.JBossRenderResponse;
-import javax.portlet.GenericPortlet;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
import javax.portlet.UnavailableException;
import java.io.IOException;
import java.io.PrintWriter;
@@ -39,52 +39,56 @@
/**
* Read the current users online and write them in output.
- *
+ *
* @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a>
*/
-public class CurrentUsersPortlet extends GenericPortlet
-{
+public class CurrentUsersPortlet extends JBossPortlet {
- /** Logger */
- public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
+ /** Logger */
+ public static Logger log = Logger.getLogger(CurrentUsersPortlet.class);
- protected void doView(RenderRequest rRequest, RenderResponse rResponse)
- throws PortletException, IOException, UnavailableException
- {
- UsersActivityStatsService uass = (UsersActivityStatsService)this
- .getPortletContext().getAttribute("UsersActivityStats");
+ protected void doView(JBossRenderRequest rRequest,
+ JBossRenderResponse rResponse) throws PortletException,
+ IOException, UnavailableException {
+ UsersActivityStatsService uass = (UsersActivityStatsService) this
+ .getPortletContext().getAttribute("UsersActivityStats");
- rResponse.setContentType("text/html");
- PrintWriter writer = rResponse.getWriter();
+ rResponse.setContentType("text/html");
+ PrintWriter writer = rResponse.getWriter();
- //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence...
- Set users = uass.getActiveUsersNames(System.currentTimeMillis());
+ long currentTime = System.currentTimeMillis();
- if (users.size() == 1)
- {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(users.size()));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
- rd.include(rRequest, rResponse);
- }
- else if (users.size() > 1)
- {
- DelegateContext ctx = new DelegateContext();
- ctx.put("USERS", users.toString());
- ctx.put("USERS_COUNT", Integer.toString(users.size()));
- rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
- rd.include(rRequest, rResponse);
- }
- else
- {
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
- rd.include(rRequest, rResponse);
- }
+ // TODO: this is wrong - should pass period instead of current time -
+ // actually it works by a coincedence...
+ Set users = uass.getActiveUsersNames(currentTime);
+ int sessionCount = uass.getActiveSessionCount(currentTime);
- writer.close();
- }
+ int allLoggedSessions = uass.getUsersActivities(currentTime).size();
+
+ if (sessionCount == 1) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp");
+ rd.include(rRequest, rResponse);
+ } else if (sessionCount > 1) {
+ DelegateContext ctx = new DelegateContext();
+ ctx.put("USERS", users.toString());
+ ctx.put("USERS_COUNT", Integer.toString(sessionCount));
+ ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size()));
+ rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp");
+ rd.include(rRequest, rResponse);
+ } else {
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp");
+ rd.include(rRequest, rResponse);
+ }
+
+ writer.close();
+ }
}
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-23 22:00:51 UTC (rev 10806)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.core.samples.users.event;
+
+import org.jboss.portal.api.event.PortalEvent;
+import org.jboss.portal.api.event.PortalEventContext;
+import org.jboss.portal.api.session.event.PortalSessionEvent;
+import org.jboss.portal.core.identity.UserActivity;
+
+/**
+ * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a>
+ * @version $Revision: 1.1 $
+ */
+public class PortalSessionEventListener extends StatsListener
+{
+
+ public void onEvent(PortalEventContext eventContext, PortalEvent event)
+ {
+ if (event instanceof PortalSessionEvent)
+ {
+ PortalSessionEvent portalEvent = (PortalSessionEvent) event;
+ UserActivity userActivity = null;
+
+ if (portalEvent.getType() == PortalSessionEvent.SESSION_CREATED)
+ {
+ userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession()
+ .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION);
+ }
+ else if (portalEvent.getType() == PortalSessionEvent.SESSION_DESTROYED)
+ {
+ userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession()
+ .getId(), System.currentTimeMillis(), UserActivity.EXIT);
+ }
+ getStatsService().registerActivity(userActivity);
+ }
+ }
+}
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java 2008-05-23 22:00:51 UTC (rev 10806)
@@ -0,0 +1,44 @@
+package org.jboss.portal.core.samples.users.event;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.portal.api.event.PortalEventListener;
+import org.jboss.portal.core.identity.UsersActivityStatsService;
+
+public abstract class StatsListener implements PortalEventListener
+{
+
+ /** Our logger. */
+ private static final Logger log = Logger.getLogger(StatsListener.class);
+
+ private UsersActivityStatsService activityService;
+
+ public UsersActivityStatsService getStatsService()
+ {
+ if (activityService == null)
+ {
+ try
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ activityService = (UsersActivityStatsService) MBeanProxy.get(UsersActivityStatsService.class,
+ new ObjectName("portal:service=Module,type=UsersActivityStatsService"), mbeanServer);
+ }
+ catch (MBeanProxyCreationException e)
+ {
+ log.error("could not obtain a proxy for User Activity Statistics Service", e);
+ }
+ catch (MalformedObjectNameException e2)
+ {
+ log.error("object name to obtain User Activity Statistics Service is wrong", e2);
+ }
+ }
+ return activityService;
+ }
+
+}
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-23 14:54:41 UTC (rev 10805)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-23 22:00:51 UTC (rev 10806)
@@ -22,84 +22,36 @@
******************************************************************************/
package org.jboss.portal.core.samples.users.event;
-import org.apache.log4j.Logger;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.api.event.PortalEvent;
import org.jboss.portal.api.event.PortalEventContext;
-import org.jboss.portal.api.event.PortalEventListener;
import org.jboss.portal.api.user.event.UserAuthenticationEvent;
import org.jboss.portal.core.identity.UserActivity;
-import org.jboss.portal.core.identity.UsersActivityStatsService;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
/**
* @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a>
* @version $Revision: 1.1 $
*/
-public class UserEventListener implements PortalEventListener
+public class UserEventListener extends StatsListener
{
- /** Our logger. */
- private static final Logger log = Logger
- .getLogger(UserEventListener.class);
-
- private UsersActivityStatsService activityService;
-
- public UsersActivityStatsService getStatsService()
- {
- if (activityService == null)
- {
- try
- {
- MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
- activityService = (UsersActivityStatsService)MBeanProxy
- .get(
- UsersActivityStatsService.class,
- new ObjectName(
- "portal:service=Module,type=UsersActivityStatsService"),
- mbeanServer);
- }
- catch (MBeanProxyCreationException e)
- {
- log
- .error(
- "could not obtain a proxy for User Activity Statistics Service",
- e);
- }
- catch (MalformedObjectNameException e2)
- {
- log
- .error(
- "object name to obtain User Activity Statistics Service is wrong",
- e2);
- }
- }
- return activityService;
- }
-
public void onEvent(PortalEventContext eventContext, PortalEvent event)
{
if (event instanceof UserAuthenticationEvent)
{
- UserAuthenticationEvent userEvent = (UserAuthenticationEvent)event;
+ UserAuthenticationEvent userEvent = (UserAuthenticationEvent) event;
UserActivity userActivity = null;
if (userEvent.getType() == UserAuthenticationEvent.SIGN_IN)
{
- userActivity = new UserActivity(userEvent.getUserId(), System
- .currentTimeMillis(), UserActivity.NAVIGATION);
+ userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession()
+ .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION);
}
else if (userEvent.getType() == UserAuthenticationEvent.SIGN_OUT)
{
- userActivity = new UserActivity(userEvent.getUserId(), System
- .currentTimeMillis(), UserActivity.SIGN_OUT);
+ userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession()
+ .getId(), System.currentTimeMillis(), UserActivity.EXIT);
}
getStatsService().registerActivity(userActivity);
}
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10805 - modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-23 10:54:41 -0400 (Fri, 23 May 2008)
New Revision: 10805
Modified:
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java
Log:
- i18n day
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23 12:48:14 UTC (rev 10804)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23 14:54:41 UTC (rev 10805)
@@ -59,7 +59,7 @@
*/
public class IdentityLoginModule extends UsernamePasswordLoginModule
{
-
+
protected String userModuleJNDIName;
protected String roleModuleJNDIName;
@@ -175,29 +175,16 @@
{
UserStatus userStatus = getUserStatus(inputPassword);
+
+ // Set the user Status in the request so that the login page can show an error message accordingly
+ request.setAttribute("org.jboss.portal.userStatus", userStatus);
- if (userStatus == UserStatus.DISABLE)
+ if (userStatus == UserStatus.OK)
{
- request.setAttribute("org.jboss.portal.loginError", "Your account is disabled");
- return false;
- }
- else if (userStatus == UserStatus.NOTASSIGNEDTOROLE)
- {
- request.setAttribute("org.jboss.portal.loginError", "The user doesn't have the correct role");
- return false;
- }
- else if ((userStatus == UserStatus.UNEXISTING) || userStatus == UserStatus.WRONGPASSWORD)
- {
- request.setAttribute("org.jboss.portal.loginError", "The user doesn't exist or the password is incorrect");
- return false;
- }
- else if (userStatus == UserStatus.OK)
- {
return true;
}
else
{
- log.error("Unexpected error while logging in");
return false;
}
}
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10804 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-sar/conf/bundles and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-23 08:48:14 -0400 (Fri, 23 May 2008)
New Revision: 10804
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/role/
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/user/
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_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
- removed obsolete stuff
- i18n day ! Make the identity module and login window i18n
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23 12:48:14 UTC (rev 10804)
@@ -22,14 +22,12 @@
input.login-button {
bottom: 20px;
- width: 60px;
right: 90px
}
input.cancel-button {
bottom: 20px;
right: 10px;
- width: 70px;
}
div.login-container div.login-header {
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23 12:48:14 UTC (rev 10804)
@@ -25,4 +25,14 @@
PAGENAME_default=Home
PAGENAME_Admin=Admin
PAGENAME_Test=Test
-PAGENAME_News=News
\ No newline at end of file
+PAGENAME_News=News
+
+ACCOUNT_DISABLED=Your account is disabled
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role
+
+LOGIN_TITLE=JBoss Portal Login
+LOGIN_USERNAME=Username
+LOGIN_PASSWORD=Password
+LOGIN_CANCEL=Cancel
+LOGIN_SUBMIT=Submit
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23 12:48:14 UTC (rev 10804)
@@ -25,4 +25,14 @@
PAGENAME_default=Accueil
PAGENAME_Admin=Admin
PAGENAME_Test=Test
-PAGENAME_News=Actualit\u00E9s
\ No newline at end of file
+PAGENAME_News=Actualit\u00E9s
+
+ACCOUNT_DISABLED=Votre compte n'est pas actif
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=L'utilisateur n'existe pas ou le mot de passe est incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=L'utilisateur n'a pas le role requis
+
+LOGIN_TITLE=Connexion JBoss Portal
+LOGIN_USERNAME=Nom d'utilisateur
+LOGIN_PASSWORD=Mot de passe
+LOGIN_CANCEL=Annuler
+LOGIN_SUBMIT=Se connecter
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23 12:48:14 UTC (rev 10804)
@@ -23,9 +23,17 @@
<%@ page pageEncoding="utf-8" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@page import="org.jboss.portal.identity.UserStatus"%>
+<%@page import="org.jboss.portal.common.i18n.ResourceBundleFactory"%>
+<%@page import="java.util.ResourceBundle"%>
+
+<%
+ ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale());
+%>
+
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>Login</title>
+ <title><%= rb.getString("LOGIN_TITLE") %></title>
<style type="text/css">
/* <![CDATA[ */
body {
@@ -53,26 +61,42 @@
<div class="login-container">
+
<div class="login-header">
- <h2>JBoss Portal Login</h2>
+ <h2><%= rb.getString("LOGIN_TITLE") %></h2>
</div>
<div class="login-content">
+
<div class="error-message"
- style="<%=(request.getAttribute("org.jboss.portal.loginError") != null ? "" : "display:none")%>;"><%=
- (request.getAttribute("org.jboss.portal.loginError") == null ? "" : request.getAttribute("org.jboss.portal.loginError"))%>
+ style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus") ? "" : "display:none"))%>;">
+ <%
+
+ if (UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_DISABLED"));
+ }
+ else if (UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus")) || UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD"));
+ }
+ else if (UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE"));
+ }
+ %>
</div>
<form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm"
target="_parent">
<div class="form-field">
- <label for="j_username">Username:</label>
+ <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>:</label>
<input type="text" name="j_username" id="j_username" value=""/>
</div>
<div class="form-field bottom-field">
- <label for="j_password">Password:</label>
+ <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>:</label>
<input type="password" name="j_password" id="j_password" value=""/>
</div>
- <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="Cancel" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/>
- <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="Login" class="login-button"/>
+ <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/>
</form>
</div>
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-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-23 12:48:14 UTC (rev 10804)
@@ -175,4 +175,7 @@
# Example usage for dynamic values
IDENTITY_DYNAMIC_VALUE_TEST=test label
-IDENTITY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
+
+javax.portlet.title=User profile
+javax.portlet.keywords=management,user
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-23 12:48:14 UTC (rev 10804)
@@ -292,3 +292,5 @@
IDENTITY_XMMP = Identifiant XMMP
IDENTITY_YIM = Identifiant Yahoo
+
+javax.portlet.title=Utilisateur
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23 06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23 12:48:14 UTC (rev 10804)
@@ -59,10 +59,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
- <portlet-info>
- <title>User portlet</title>
- <keywords>management,user</keywords>
- </portlet-info>
+ <resource-bundle>conf.bundles.Identity</resource-bundle>
<portlet-preferences>
<preference>
<!-- Use captcha verification -->
16 years, 1 month
- 1
- 0