JBoss Portal SVN: r8396 - branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 04:43:05 -0400 (Fri, 21 Sep 2007)
New Revision: 8396
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
Log:
Better (?) english
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 2007-09-21 08:28:02 UTC (rev 8395)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2007-09-21 08:43:05 UTC (rev 8396)
@@ -21,12 +21,12 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-NO_USERS_ONLINE=No user is logged
+NO_USERS_ONLINE=No logged-in user
ONE_USER_ONLINE_0=There is <b>
-ONE_USER_ONLINE_1=</b> user online:
+ONE_USER_ONLINE_1=</b> logged-in user:
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=There are <b>
-USERS_ONLINE_1=</b> users online:
+USERS_ONLINE_1=</b> logged-in users:
USERS_ARE_0=<b>
USERS_ARE_1=</b>
\ No newline at end of file
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8395 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 6 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 04:28:02 -0400 (Fri, 21 Sep 2007)
New Revision: 8395
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
Log:
- minor user interfaces updates
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-21 08:28:02 UTC (rev 8395)
@@ -223,27 +223,16 @@
catch (RuntimeException e)
{
ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
- if ( windowState != null)
- {
- try
- {
- JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
- response.setWindowState(windowState);
- }
- catch(WindowStateException e)
- {
- log.error("", e);
- }
- }
+ this.resetWindowState(ctx);
return "start";
}
@@ -257,18 +246,19 @@
{
// Update password
this.identityUserBean.updatePassword(this.currentUser, this.password);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWOR_STATUS")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWOR_STATUS")));
}
catch (Exception e)
{
log.error("error while updating password", e);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
}
}
else
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
}
+ this.resetWindowState(ctx);
return "status";
}
@@ -298,22 +288,39 @@
String validationStatus = this.validateEmailService.changeEmail(portalURL, user, email, locale);
if (IdentityConstants.REGISTRATION_PENDING.equals(validationStatus))
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING")));
}
else
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED")));
}
}
catch (Exception e)
{
log.error("error while changing email", e);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_ERROR")));
}
}
+ this.resetWindowState(ctx);
return "status";
}
+ private void resetWindowState(FacesContext ctx)
+ {
+ if ( windowState != null)
+ {
+ try
+ {
+ JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
+ response.setWindowState(windowState);
+ }
+ catch(WindowStateException e)
+ {
+ log.error("", e);
+ }
+ }
+ }
+
private String getPortalURL()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-21 08:28:02 UTC (rev 8395)
@@ -50,12 +50,9 @@
IdentityUIConfiguration cf = cfb.getConfiguration();
this.map = cf.getUiComponents();
}
-
+
public Class getType(Object propertyName) throws IllegalArgumentException
{
- if (propertyName != null && propertyName.equals("identityUIConfiguration"))
- return IdentityUIConfiguration.class;
- else
return UIComponentConfiguration.class;
}
@@ -69,8 +66,8 @@
{
return true;
}
-
- /** used on for building the url after validating email */
+
+ /** used for building the url after validating email */
public String getPortalContextPath()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 08:28:02 UTC (rev 8395)
@@ -51,7 +51,6 @@
IDENTITY_EDIT_PASSWORD_TITLE=Change your password
IDENTITY_EDIT_PASSWORD_CURRENT=Current password
IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user
IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
@@ -119,9 +118,8 @@
IDENTITY_MANAGEMENT_DISABLE=Disable
IDENTITY_MANAGEMENT_ENABLE=Enable
IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
-IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password of user
IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
-IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assign roles
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
IDENTITY_MANAGEMENT_APPROVE_ALL=Approve selected
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -265,7 +265,7 @@
<from-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/status.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -278,7 +278,7 @@
<from-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/status.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
<h:outputText value="#{assignrolemgr.uiUser.username}" />
</li>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -13,9 +13,13 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
+ <li class="pathItem">
<h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
</li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{editprofilemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -13,8 +13,12 @@
<h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ <h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
</li>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -81,7 +81,7 @@
<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
- <h:panelGrid columns="3">
+ <h:panelGrid columns="4">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
<h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -14,8 +14,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
<h:outputText value="#{editprofilemgr.currentUser}" />
</li>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
<h:outputText value="#{lostpasswordmgr.username}" />
</li>
</ui:define>
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 2007-09-21 08:18:57 UTC (rev 8394)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-21 08:28:02 UTC (rev 8395)
@@ -15,6 +15,9 @@
</ui:define>
<ui:define name="content">
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
<h:outputText value="#{editprofilemgr.uiUser.username}"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8394 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 6 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 04:18:57 -0400 (Fri, 21 Sep 2007)
New Revision: 8394
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
Log:
- minor user interface updates
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-21 08:18:57 UTC (rev 8394)
@@ -223,27 +223,16 @@
catch (RuntimeException e)
{
ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
- if ( windowState != null)
- {
- try
- {
- JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
- response.setWindowState(windowState);
- }
- catch(WindowStateException e)
- {
- log.error("", e);
- }
- }
+ this.resetWindowState(ctx);
return "start";
}
@@ -257,18 +246,19 @@
{
// Update password
this.identityUserBean.updatePassword(this.currentUser, this.password);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWOR_STATUS")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWOR_STATUS")));
}
catch (Exception e)
{
log.error("error while updating password", e);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
}
}
else
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
}
+ this.resetWindowState(ctx);
return "status";
}
@@ -298,22 +288,39 @@
String validationStatus = this.validateEmailService.changeEmail(portalURL, user, email, locale);
if (IdentityConstants.REGISTRATION_PENDING.equals(validationStatus))
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING")));
}
else
{
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED")));
}
}
catch (Exception e)
{
log.error("error while changing email", e);
- ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_ERROR")));
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_ERROR")));
}
}
+ this.resetWindowState(ctx);
return "status";
}
+ private void resetWindowState(FacesContext ctx)
+ {
+ if ( windowState != null)
+ {
+ try
+ {
+ JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
+ response.setWindowState(windowState);
+ }
+ catch(WindowStateException e)
+ {
+ log.error("", e);
+ }
+ }
+ }
+
private String getPortalURL()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-21 08:18:57 UTC (rev 8394)
@@ -50,12 +50,9 @@
IdentityUIConfiguration cf = cfb.getConfiguration();
this.map = cf.getUiComponents();
}
-
+
public Class getType(Object propertyName) throws IllegalArgumentException
{
- if (propertyName != null && propertyName.equals("identityUIConfiguration"))
- return IdentityUIConfiguration.class;
- else
return UIComponentConfiguration.class;
}
@@ -69,8 +66,8 @@
{
return true;
}
-
- /** used on for building the url after validating email */
+
+ /** used for building the url after validating email */
public String getPortalContextPath()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 08:18:57 UTC (rev 8394)
@@ -51,7 +51,6 @@
IDENTITY_EDIT_PASSWORD_TITLE=Change your password
IDENTITY_EDIT_PASSWORD_CURRENT=Current password
IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER=Change password for user
IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
@@ -119,9 +118,8 @@
IDENTITY_MANAGEMENT_DISABLE=Disable
IDENTITY_MANAGEMENT_ENABLE=Enable
IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password
-IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password of user
IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email.
-IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assign roles
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
IDENTITY_MANAGEMENT_APPROVE_ALL=Approve selected
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -265,7 +265,7 @@
<from-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/status.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -278,7 +278,7 @@
<from-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/status.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
<h:outputText value="#{assignrolemgr.uiUser.username}" />
</li>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -13,9 +13,13 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
+ <li class="pathItem">
<h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
</li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{editprofilemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -13,8 +13,12 @@
<h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ <h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
</li>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -81,7 +81,7 @@
<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
- <h:panelGrid columns="3">
+ <h:panelGrid columns="4">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
<h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -14,8 +14,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
<h:outputText value="#{editprofilemgr.currentUser}" />
</li>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -13,8 +13,11 @@
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
<h:outputText value="#{lostpasswordmgr.username}" />
</li>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-21 08:12:34 UTC (rev 8393)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-21 08:18:57 UTC (rev 8394)
@@ -15,6 +15,9 @@
</ui:define>
<ui:define name="content">
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
<h:outputText value="#{editprofilemgr.uiUser.username}"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8393 - in branches/JBoss_Portal_Branch_2_6: core-management and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 04:12:34 -0400 (Fri, 21 Sep 2007)
New Revision: 8393
Modified:
branches/JBoss_Portal_Branch_2_6/cms/.classpath
branches/JBoss_Portal_Branch_2_6/core-management/.classpath
Log:
Eclipse update
Modified: branches/JBoss_Portal_Branch_2_6/cms/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-09-21 07:37:42 UTC (rev 8392)
+++ branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-09-21 08:12:34 UTC (rev 8393)
@@ -43,5 +43,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-management/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-management/.classpath 2007-09-21 07:37:42 UTC (rev 8392)
+++ branches/JBoss_Portal_Branch_2_6/core-management/.classpath 2007-09-21 08:12:34 UTC (rev 8393)
@@ -10,5 +10,6 @@
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8392 - in branches/JBoss_Portal_Branch_2_6: core-cms/src/resources/portal-cms-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 03:37:42 -0400 (Fri, 21 Sep 2007)
New Revision: 8392
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
Log:
Removed window decoration on admin pages
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-21 07:35:21 UTC (rev 8391)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-21 07:37:42 UTC (rev 8392)
@@ -367,7 +367,19 @@
<instance-ref>IdentityAdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
</portal>
</deployment>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2007-09-21 07:35:21 UTC (rev 8391)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2007-09-21 07:37:42 UTC (rev 8392)
@@ -36,7 +36,19 @@
<instance-ref>CMSAdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
</deployment>
</deployments>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8391 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 03:35:21 -0400 (Fri, 21 Sep 2007)
New Revision: 8391
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
Log:
comment out "all" and "help" broken targets
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-20 17:27:47 UTC (rev 8390)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-21 07:35:21 UTC (rev 8391)
@@ -241,18 +241,19 @@
<!-- Add module specific elements here. -->
</target>
+
<target name="main" depends="most"
description="Executes the default target (most)."/>
-
+ <!--
<target name="all" depends="createthirdparty, modules-all"
description="Executes all modules and builds everything."/>
-
+ -->
<target name="most" depends="createthirdparty, modules-most"
description="Executes all modules and builds most everything."/>
-
+
<target name="help" depends="_buildmagic:help:build"
description="Show this help message."/>
-
+
<!--
| Deploy the application
-->
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8390 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-20 13:27:47 -0400 (Thu, 20 Sep 2007)
New Revision: 8390
Modified:
docs/trunk/referenceGuide/en/modules/identityportlets.xml
Log:
- some words about customizing the view profile page.
Modified: docs/trunk/referenceGuide/en/modules/identityportlets.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-20 17:24:59 UTC (rev 8389)
+++ docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-20 17:27:47 UTC (rev 8390)
@@ -383,7 +383,6 @@
</para>
</listitem>
</itemizedlist>
-
</para>
<note>
This is not a JavaServer Faces tutorial. Basic knowledge of
@@ -441,8 +440,7 @@
</sect2>
<sect2 id="identity_portlet_configuration_example2">
<title>
- Example 2: dynamic values (dropdown menu with predefined
- values)
+ Example 2: dynamic values (dropdown menu with predefined values)
</title>
<para>
If the data to enter is a choice instead of a free-text value, you can also define those
@@ -682,6 +680,13 @@
value from the profile config!</para>
</warning>
</sect2>
+ <sect2>
+ <title>Customizing the View Profile page</title>
+ <para>
+ By default not all values of the user profile will be displayed on the <emphasis>View profile</emphasis> page. For customization it is possible
+ to add further properties to the page by editing the file: <emphasis>portal-identity.sar/portal-identity.war/WEB-INF/jsf/profile/viewProfile.xhtml</emphasis>
+ </para>
+ </sect2>
</sect1>
<sect1>
<title>Customizing the workflow</title>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8389 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-20 13:24:59 -0400 (Thu, 20 Sep 2007)
New Revision: 8389
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
Log:
- delete role and navigation update
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20 17:21:50 UTC (rev 8388)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20 17:24:59 UTC (rev 8389)
@@ -227,13 +227,13 @@
return "roleAdmin";
}
- public String confirmDelete()
+ public String confirmedDelete()
{
Role uRole;
try
{
uRole = identityRoleBean.getRoleModule().findRoleByName(this.uiRole.getName());
- this.identityRoleBean.getRoleModule().removeRole(uRole);
+ this.identityRoleBean.getRoleModule().removeRole(uRole.getId());
this.roleList = null;
}
catch (Exception e)
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 17:21:50 UTC (rev 8388)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 17:24:59 UTC (rev 8389)
@@ -416,7 +416,7 @@
<from-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/register.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>registered</from-outcome>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8388 - in trunk/core-identity/src: resources/portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-20 13:21:50 -0400 (Thu, 20 Sep 2007)
New Revision: 8388
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
Log:
- delete role and navigation update
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20 16:38:15 UTC (rev 8387)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20 17:21:50 UTC (rev 8388)
@@ -227,13 +227,13 @@
return "roleAdmin";
}
- public String confirmDelete()
+ public String confirmedDelete()
{
Role uRole;
try
{
uRole = identityRoleBean.getRoleModule().findRoleByName(this.uiRole.getName());
- this.identityRoleBean.getRoleModule().removeRole(uRole);
+ this.identityRoleBean.getRoleModule().removeRole(uRole.getId());
this.roleList = null;
}
catch (Exception e)
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 16:38:15 UTC (rev 8387)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 17:21:50 UTC (rev 8388)
@@ -416,7 +416,7 @@
<from-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/register.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>registered</from-outcome>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8387 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/services and 18 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-20 12:38:15 -0400 (Thu, 20 Sep 2007)
New Revision: 8387
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
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/common/MetaDataServiceBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
Log:
- validate workflow configuration
- added non tabbed container for user portlets
- edit profile redirect when not maximized
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-20 16:38:15 UTC (rev 8387)
@@ -1,3 +1,8 @@
+/* No border container for user portlets */
+div.identity-ui div.no-tab-container{
+ padding: 15px 0 10px 0;
+}
+
/* Redefine spacing for tables. */
a {
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -63,7 +63,9 @@
public static final String REGISTRATION_PENDING = "registration_pending";
public static final String VALIDATION_FAILED = "validation_failed";
public static final String VALIDATION_VALIDATED = "validated";
+ public static final String VALIDATION_ERROR = "validation_error";
+
/** jBPM process variables */
public static final String PORTAL_URL = "portalURL";
public static final String VALIDATION_HASH = "validationHash";
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityCommandFactoryService.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -27,6 +27,7 @@
import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory;
import org.jboss.portal.core.identity.services.IdentityCommandFactory;
import org.jboss.portal.core.identity.services.IdentityConstants;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.workflow.ValidateEmailService;
import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand;
import org.jboss.portal.portlet.PortletParametersStateString;
@@ -72,10 +73,18 @@
{
String bpmId = aRequest[0];
String hash = aRequest[1];
- // Validating email
+ try
+ {
+ // Validating email
String status = validateEmailService.validateEmail(bpmId, hash);
// Passing status to portlet render parameters
operation = status;
+ }
+ catch(CoreIdentityConfigurationException e)
+ {
+ log.error(e);
+ operation = IdentityConstants.VALIDATION_ERROR;
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -48,10 +48,12 @@
* @return WorkflowService
* @throws NamingException
*/
- WorkflowService getWorkflowService();
+ WorkflowService getWorkflowService() throws CoreIdentityConfigurationException;
void setWorkflowService(WorkflowService workflowService);
+ boolean isValidConfiguration() throws CoreIdentityConfigurationException;
+
void startWorkflow() throws Exception;
void stopWorkflow() throws Exception;
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -87,11 +87,9 @@
// Loading workflow if subscriptionmodes != automatic
if (this.configuration.enableWorkflow())
{
+
+ this.isValidConfiguration();
- this.workflowService = this.getWorkflowService();
- if (this.workflowService == null)
- throw new CoreIdentityConfigurationException("Workflowservice must not be null.");
-
String subscriptionMode = this.configuration.getSubscriptionMode();
String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode();
String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name;
@@ -201,8 +199,12 @@
this.userProfileModule = userProfileModule;
}
- public WorkflowService getWorkflowService()
+ public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException
{
+ if ( workflowService == null )
+ {
+ throw new CoreIdentityConfigurationException("Workflow service not found. Make sure that the workflow service is deploy.");
+ }
return workflowService;
}
@@ -336,11 +338,20 @@
{
throw new CoreIdentityConfigurationException("Could not parse configuration file.");
}
- catch (Exception e)
+ catch (Throwable e)
{
- throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the wiki.");
+ throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the jboss portal wiki.");
}
}
+
+ public boolean isValidConfiguration() throws CoreIdentityConfigurationException
+ {
+ if (this.configuration.enableWorkflow() )
+ {
+ this.getWorkflowService();
+ }
+ return true;
+ }
protected InputStream getResource(String path) throws IOException
{
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -26,6 +26,8 @@
import java.util.Locale;
import java.util.Map;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
+
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
@@ -45,7 +47,7 @@
* @param adminFlag
* @return
*/
- String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag);
+ String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag) throws CoreIdentityConfigurationException;
/**
* Approve or reject a registration
@@ -54,7 +56,7 @@
* @param approve
* @return
*/
- String approve(String id, boolean approve);
+ String approve(String id, boolean approve) throws CoreIdentityConfigurationException;
/**
* Get pending users
@@ -62,7 +64,7 @@
* @param nodeName
* @return
*/
- List getPendingUsers(String nodeName);
+ List getPendingUsers(String nodeName) throws CoreIdentityConfigurationException;
/**
* Check for a existing username in the jBPM context
@@ -70,13 +72,13 @@
* @param username
* @return
*/
- boolean checkUsername(String username);
+ boolean checkUsername(String username) throws CoreIdentityConfigurationException;
/**
* Get pending users count
*
* @return
*/
- int getPendingCount();
+ int getPendingCount() throws CoreIdentityConfigurationException;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/ValidateEmailService.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -24,6 +24,7 @@
import java.util.Locale;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.identity.User;
/**
@@ -33,9 +34,27 @@
public interface ValidateEmailService
{
- String changeEmail(String url, User user, String email, Locale locale);
+ /**
+ * Change e-mail
+ *
+ * @param url
+ * @param user
+ * @param email
+ * @param locale
+ * @return
+ * @throws CoreIdentityConfigurationException
+ */
+ String changeEmail(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException;
- String validateEmail(String processId, String registrationHash);
+ /**
+ * Validate e-mail
+ *
+ * @param processId
+ * @param registrationHash
+ * @return
+ * @throws CoreIdentityConfigurationException
+ */
+ String validateEmail(String processId, String registrationHash) throws CoreIdentityConfigurationException;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -34,6 +34,7 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.IdentityUserManagementService;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
@@ -107,7 +108,7 @@
}
}
- public WorkflowService getWorkflowService()
+ public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException
{
if (this.workflowService == null)
{
@@ -151,8 +152,8 @@
this.identityUserManagementService = identityManagementService;
}
- public String registerUser(String url, String username, String password, Map profileMap, List roles, Locale locale,
- boolean adminFlag)
+ public String registerUser(String url, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag)
+ throws CoreIdentityConfigurationException
{
if (adminFlag)
@@ -190,7 +191,7 @@
}
}
- private void registerUserWorkflow(String url, UserContainer user, Locale locale, String processName)
+ private void registerUserWorkflow(String url, UserContainer user, Locale locale, String processName) throws CoreIdentityConfigurationException
{
JbpmContext jbpmContext = null;
ProcessInstance processInstance = null;
@@ -214,12 +215,6 @@
token.signal();
success = true;
}
- catch (Exception e)
- {
- success = false;
- log.error("Exception in Workflow");
- throw new RuntimeException(e);
- }
finally
{
if (processInstance != null && success)
@@ -230,7 +225,7 @@
}
}
- public String approve(String id, boolean approve)
+ public String approve(String id, boolean approve) throws CoreIdentityConfigurationException
{
// return registered if workflow is disabled
if (!this.identityUIConfigurationService.getConfiguration().enableWorkflow())
@@ -261,10 +256,6 @@
}
}
}
- catch (Exception e)
- {
- log.error("", e);
- }
finally
{
IOTools.safeClose(jbpmContext);
@@ -272,7 +263,7 @@
return IdentityConstants.REGISTRATION_PENDING;
}
- public int getPendingCount()
+ public int getPendingCount() throws CoreIdentityConfigurationException
{
int count = 0;
JbpmContext jbpmContext = null;
@@ -307,10 +298,6 @@
}
}
}
- catch (NamingException e)
- {
- log.error("failed to get pending users count", e);
- }
finally
{
IOTools.safeClose(jbpmContext);
@@ -318,7 +305,7 @@
return count;
}
- public List getPendingUsers(String nodeName)
+ public List getPendingUsers(String nodeName) throws CoreIdentityConfigurationException
{
List queue = new ArrayList();
JbpmContext jbpmContext = null;
@@ -340,10 +327,6 @@
}
}
}
- catch (NamingException e)
- {
- log.error("failed to get pending users", e);
- }
finally
{
IOTools.safeClose(jbpmContext);
@@ -394,7 +377,7 @@
return queue;
}
- public boolean checkUsername(String username)
+ public boolean checkUsername(String username) throws CoreIdentityConfigurationException
{
JbpmContext jbpmContext = null;
try
@@ -417,10 +400,6 @@
}
}
}
- catch (NamingException e)
- {
- log.error("failed to check username", e);
- }
finally
{
IOTools.safeClose(jbpmContext);
@@ -454,7 +433,7 @@
return usernameTaken;
}
- private List getProcessInstances(JbpmContext jbpmContext, String processName) throws NamingException
+ private List getProcessInstances(JbpmContext jbpmContext, String processName) throws CoreIdentityConfigurationException
{
List processInstances = new ArrayList();
if (!IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC.equals(processName))
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -28,6 +28,7 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.IdentityUserManagementService;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
import org.jboss.portal.core.identity.services.workflow.UserContainer;
import org.jboss.portal.core.identity.services.workflow.ValidateEmailService;
@@ -90,7 +91,7 @@
}
}
- public WorkflowService getWorkflowService()
+ public WorkflowService getWorkflowService() throws CoreIdentityConfigurationException
{
if ( workflowService == null)
{
@@ -134,7 +135,7 @@
this.identityUserManagementService = identityUserManagementService;
}
- public String changeEmail(String url, User user, String email, Locale locale)
+ public String changeEmail(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException
{
if (! this.identityUIConfigurationService.getConfiguration().enableWorkflow())
{
@@ -148,7 +149,7 @@
}
}
- public void changeEmailWorkflow(String url, User user, String email, Locale locale)
+ public void changeEmailWorkflow(String url, User user, String email, Locale locale) throws CoreIdentityConfigurationException
{
JbpmContext jbpmContext = null;
ProcessInstance processInstance = null;
@@ -169,12 +170,6 @@
token.signal();
success = true;
}
- catch (Exception e)
- {
- success = false;
- log.error("Exception in Workflow", e);
- // throw new WorkflowException(e);
- }
finally
{
if (processInstance != null && success)
@@ -185,7 +180,7 @@
}
}
- public String validateEmail(String id, String registrationHash)
+ public String validateEmail(String id, String registrationHash) throws CoreIdentityConfigurationException
{
String success = IdentityConstants.VALIDATION_FAILED;
if (!this.identityUIConfigurationService.getConfiguration().enableWorkflow())
@@ -214,10 +209,6 @@
}
}
}
- catch (Exception e)
- {
- log.error("", e);
- }
finally
{
IOTools.safeClose(jbpmContext);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -38,6 +38,7 @@
import org.jboss.portal.api.node.PortalNode;
import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portal.core.identity.services.IdentityConstants;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
@@ -185,9 +186,10 @@
}
}
- catch (Exception e)
+ catch(CoreIdentityConfigurationException e)
{
log.error("", e);
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION")));
}
}
/*
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -44,6 +44,7 @@
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.JBossRenderRequest;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
@@ -185,6 +186,15 @@
}
return "editProfile";
}
+
+ public String getCurrentWindowState()
+ {
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ ExternalContext ectx = ctx.getExternalContext();
+
+ JBossRenderRequest request = (JBossRenderRequest) ectx.getRequest();
+ return request.getWindowState().toString();
+ }
public String adminEditProfile()
{
@@ -229,7 +239,7 @@
JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
response.setWindowState(windowState);
}
- catch(Exception e)
+ catch(WindowStateException e)
{
log.error("", e);
}
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 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -38,6 +38,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.services.IdentityConstants;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
import org.jboss.portal.core.identity.services.workflow.UserContainer;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
@@ -296,7 +297,15 @@
public int getPendingCount()
{
- return this.registrationService.getPendingCount();
+ try
+ {
+ return this.registrationService.getPendingCount();
+ }
+ catch (CoreIdentityConfigurationException e)
+ {
+ log.error("", e);
+ return -1;
+ }
}
public int getUserCount()
@@ -319,8 +328,15 @@
public List getPendingUsers()
{
- if ( this.registrationService != null && this.pendingUsers == null)
- this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
+ try
+ {
+ if ( this.registrationService != null && this.pendingUsers == null)
+ this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
+ }
+ catch (CoreIdentityConfigurationException e)
+ {
+ log.error("", e);
+ }
return pendingUsers;
}
@@ -377,19 +393,31 @@
Map params = ectx.getRequestParameterMap();
String processId = (String) params.get("processId");
String action = (String) params.get("action");
- if (processId != null && action != null)
+ try
{
- if (action.equals("approve"))
+ if (processId != null && action != null)
{
- this.registrationService.approve(processId, true);
+ if (action.equals("approve"))
+ {
+ this.registrationService.approve(processId, true);
+ }
+ else if (action.equals("reject"))
+ {
+ this.registrationService.approve(processId, false);
+ }
}
- else if (action.equals("reject"))
- {
- this.registrationService.approve(processId, false);
- }
}
+ catch (CoreIdentityConfigurationException e)
+ {
+ log.error("", e);
+ return "userAdmin";
+ }
this.pendingUsers = null;
- return "pendingUsers";
+ this.getPendingUsers();
+ if (this.pendingUsers.size() > 0)
+ return "pendingUsers";
+ else
+ return "userAdmin";
}
public String approveList()
@@ -432,18 +460,25 @@
public String confirmPendingAction()
{
- for(Iterator i = pendingActionList.iterator(); i.hasNext(); )
+ try
{
- UserContainer user = (UserContainer) i.next();
- if (this.pendingUserAction.equals("approve"))
+ for(Iterator i = pendingActionList.iterator(); i.hasNext(); )
{
- this.registrationService.approve(user.getProcessId(), true);
+ UserContainer user = (UserContainer) i.next();
+ if (this.pendingUserAction.equals("approve"))
+ {
+ this.registrationService.approve(user.getProcessId(), true);
+ }
+ else if (this.pendingUserAction.equals("reject"))
+ {
+ this.registrationService.approve(user.getProcessId(), false);
+ }
}
- else if (this.pendingUserAction.equals("reject"))
- {
- this.registrationService.approve(user.getProcessId(), false);
- }
}
+ catch(CoreIdentityConfigurationException e)
+ {
+ log.error("", e);
+ }
this.pendingActionList = null;
this.pendingUsers = null;
return "success";
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java (from rev 8386, trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -0,0 +1,76 @@
+/******************************************************************************
+ * 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.ui.common;
+
+import org.jboss.logging.Logger;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class ConfigurationBean
+{
+
+ /** The identityUIConfiguration */
+ private IdentityUIConfiguration configuration;
+
+ /** The identityUIConfigurationService */
+ private IdentityUIConfigurationService identityUIConfigurationService;
+
+ /** the logger */
+ private static final Logger log = Logger.getLogger(ConfigurationBean.class);
+
+ public IdentityUIConfiguration getConfiguration()
+ {
+ return configuration;
+ }
+
+ public IdentityUIConfigurationService getIdentityUIConfigurationService()
+ {
+ return identityUIConfigurationService;
+ }
+
+ public void setIdentityUIConfigurationService(IdentityUIConfigurationService identityUIConfigurationService)
+ {
+ this.identityUIConfigurationService = identityUIConfigurationService;
+ this.configuration = identityUIConfigurationService.getConfiguration();
+ }
+
+ public boolean isValidConfiguration()
+ {
+ try
+ {
+ this.identityUIConfigurationService.isValidConfiguration();
+ }
+ catch(CoreIdentityConfigurationException e)
+ {
+ log.error("", e);
+ return false;
+ }
+ return true;
+ }
+}
+
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -26,13 +26,8 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.portlet.PortletException;
-import javax.portlet.UnavailableException;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
-import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
import org.jboss.portal.faces.el.PropertyValue;
import org.jboss.portal.faces.el.dynamic.DynamicBean;
@@ -47,27 +42,21 @@
{
/** The map */
Map map = null;
-
- /** . */
- private IdentityUIConfigurationService identityUIConfigurationService;
- public MetaDataServiceBean() throws UnavailableException
- {
- try
- {
- this.identityUIConfigurationService = (IdentityUIConfigurationService) new InitialContext().lookup("java:/portal/IdentityUIConfigurationService");
- IdentityUIConfiguration cf = identityUIConfigurationService.getConfiguration();
- this.map = cf.getUiComponents();
- }
- catch (Exception e)
- {
- throw new UnavailableException("Configuration service not available. Please check your configuration files and the logs.");
- }
+ public MetaDataServiceBean()
+ {
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ ConfigurationBean cfb = (ConfigurationBean) ctx.getApplication().createValueBinding(("#{configurationbean}")).getValue(ctx);
+ IdentityUIConfiguration cf = cfb.getConfiguration();
+ this.map = cf.getUiComponents();
}
-
+
public Class getType(Object propertyName) throws IllegalArgumentException
{
- return UIComponentConfiguration.class;
+ if (propertyName != null && propertyName.equals("identityUIConfiguration"))
+ return IdentityUIConfiguration.class;
+ else
+ return UIComponentConfiguration.class;
}
public PropertyValue getValue(Object propertyName) throws IllegalArgumentException
@@ -81,6 +70,7 @@
return true;
}
+ /** used on for building the url after validating email */
public String getPortalContextPath()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
@@ -88,5 +78,4 @@
ServerInvocationContext invocationContext = request.getControllerContext().getServerInvocation().getServerContext();
return invocationContext.getPortalContextPath();
}
-
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-20 16:38:15 UTC (rev 8387)
@@ -30,6 +30,7 @@
import javax.faces.validator.ValidatorException;
import javax.portlet.PortletContext;
+import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.NoSuchUserException;
@@ -84,5 +85,9 @@
{
throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
}
+ catch (CoreIdentityConfigurationException e)
+ {
+ throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-20 16:38:15 UTC (rev 8387)
@@ -21,6 +21,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet not available. Please check your configuration and the error log for further information.
+
IDENTITY_WELCOME=Welcome
IDENTITY_REGISTER=Register
IDENTITY_LOST_PASSWORD=Lost Password
@@ -156,6 +158,7 @@
IDENTITY_VERIFICATION_RETURN=Return to portal
IDENTITY_VERIFICATION_LOGIN=Login
+IDENTITY_VERIFICATION_STATUS_EROOR=Error while validating e-mail address.
IDENTITY_VERIFICATION_STATUS_FAILED=Can not validate the e-mail address.
IDENTITY_VERIFICATION_STATUS_VALIDATED=E-Mail address validated.
IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Your account has been activated. You may log in now.
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -34,6 +34,15 @@
</application>
<managed-bean>
+ <managed-bean-name>configurationbean</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>identityUIConfigurationService</property-name>
+ <value>#{applicationScope.IdentityUIConfigurationService}</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>metadataservice</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.identity.ui.common.MetaDataServiceBean</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
@@ -92,7 +101,7 @@
</managed-property>
<managed-property>
<property-name>defaultRoles</property-name>
- <value>#{applicationScope.IdentityUIConfigurationService.configuration.defaultRoles}</value>
+ <value>#{configurationbean.configuration.defaultRoles}</value>
</managed-property>
<managed-property>
<property-name>registrationService</property-name>
@@ -118,11 +127,11 @@
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>subscriptionMode</property-name>
- <value>#{applicationScope.IdentityUIConfigurationService.configuration.subscriptionMode}</value>
+ <value>#{configurationbean.configuration.subscriptionMode}</value>
</managed-property>
<managed-property>
<property-name>adminSubscriptionMode</property-name>
- <value>#{applicationScope.IdentityUIConfigurationService.configuration.adminSubscriptionMode}</value>
+ <value>#{configurationbean.configuration.adminSubscriptionMode}</value>
</managed-property>
<managed-property>
<property-name>identityUserBean</property-name>
@@ -161,7 +170,7 @@
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>passwordCharacters</property-name>
- <value>#{applicationScope.IdentityUIConfigurationService.configuration.passwordGenerationCharacters}</value>
+ <value>#{configurationbean.configuration.passwordGenerationCharacters}</value>
</managed-property>
<managed-property>
<property-name>identityUserBean</property-name>
@@ -276,14 +285,14 @@
<from-view-id>/WEB-INF/jsf/index.xhtml</from-view-id>
<navigation-case>
<from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/editProfile.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/WEB-INF/jsf/profile/*</from-view-id>
<navigation-case>
<from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/editProfile.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -7,7 +7,8 @@
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
<ul class="topnav">
<li>
@@ -31,5 +32,9 @@
<ui:insert name="content">Content</ui:insert>
</ui:define>
</ui:decorate>
-
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -7,7 +7,8 @@
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
@@ -31,5 +32,9 @@
</ui:define>
</ui:decorate>
-
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -9,7 +9,7 @@
<c:if test="#{portletPreferenceValue.captcha == true}">
<hr/>
<div id="captchaContainer" style="width: 200px; height: 100px">
- <h:graphicImage id="jcaptchaimp" url="/jcaptcha" />
+ <h:graphicImage id="jcaptcha" url="/jcaptcha" />
</div>
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" />
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml (from rev 8386, trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -0,0 +1,10 @@
+<ui:composition
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <div class="no-tab-container">
+ <ui:insert name="tab-container-content"/>
+ </div>
+
+</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -206,9 +206,12 @@
</h:panelGrid>
<hr/>
-<p style="text-align: right;">
- <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/>
- <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
-</p>
+ <p style="text-align: left;">
+ <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" />
+ </p>
+ <p style="text-align: right;">
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -45,16 +45,12 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
- <table style="width: 100%">
- <tr>
- <td style="text-align: left;">
+ <p style="text-align: left;">
<h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" />
- </td>
- <td style="text-align: right;">
+ </p>
+ <p style="text-align: right;">
<h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
- </td>
- </tr>
- </table>
+ </p>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -7,7 +7,8 @@
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
<ul class="topnav">
<li>
@@ -21,7 +22,8 @@
</li>
</ul>
</h:form>
-
+ <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:define name="tab-container-content">
<!-- Title -->
<ul class="objectpath">
<li class="selected">
@@ -31,4 +33,11 @@
<br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
+ </ui:define>
+ </ui:decorate>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -8,20 +8,18 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+ <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+ <ui:define name="title">
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
+ </ui:define>
+ <ui:define name="content">
+ <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
+ <ui:param name="manager" value="#{editprofilemgr}"/>
+ <ui:param name="adminMode" value="false"/>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
-<ui:define name="title">
- <li class="selected">
- <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
- </li>
-</ui:define>
-
-<ui:define name="content">
- <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
- <ui:param name="manager" value="#{editprofilemgr}"/>
- <ui:param name="adminMode" value="false"/>
- </ui:decorate>
-</ui:define>
-
-</ui:composition>
</div>
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml (from rev 8386, trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -0,0 +1,21 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ class="identity-ui">
+
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
+
+<c:choose>
+<c:when test="#{editprofilemgr.currentWindowState == 'maximized'}">
+ <!-- Show edit profile page -->
+ <ui:include src="/WEB-INF/jsf/profile/editProfile.xhtml" />
+</c:when>
+<c:otherwise>
+ <!-- Show view profile page -->
+ <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml" />
+</c:otherwise>
+</c:choose>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -7,25 +7,34 @@
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-
- <h:form>
- <ul class="topnav">
- <li>
- <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
- </li>
- <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
- </ul>
- </h:form>
-
- <!-- Title -->
+
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
- <ul class="objectpath">
+ <ul class="topnav">
+ <li>
+ <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
+ </li>
+ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
+ </ul>
+ </h:form>
+ <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:define name="tab-container-content">
+ <!-- Title -->
+ <h:form>
+ <ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
- </ul>
- </h:form>
- <br/>
- <!-- Content -->
- <ui:insert name="content">Content</ui:insert>
+ </ul>
+ </h:form>
+ <br/>
+ <!-- Content -->
+ <ui:insert name="content">Content</ui:insert>
+ </ui:define>
+ </ui:decorate>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
-
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -7,7 +7,8 @@
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li>
@@ -16,7 +17,8 @@
</li>
</ul>
</h:form>
-
+ <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:define name="tab-container-content">
<!-- Title -->
<ul class="objectpath">
<li class="selected">
@@ -26,6 +28,12 @@
<br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
+ </ui:define>
+ </ui:decorate>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
-
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -8,6 +8,8 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
<h:form>
<ul class="topnav">
<li>
@@ -24,7 +26,8 @@
</c:if>
</ul>
</h:form>
-
+ <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:define name="tab-container-content">
<!-- Title -->
<ul class="objectpath">
<li class="selected">
@@ -34,4 +37,11 @@
<br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
+ </ui:define>
+ </ui:decorate>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -8,30 +8,40 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
- <h:form>
- <ul class="topnav">
- <li id="currentTab">
- <h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
- </li>
- <li>
- <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
- </li>
+<c:choose>
+ <c:when test="#{configurationbean.validConfiguration}">
+ <h:form>
+ <ul class="topnav">
+ <li id="currentTab">
+ <h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
+ </li>
+ <li>
+ <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
+ </li>
<!-- check if we should enable lostPassword -->
- <c:if test="#{portletPreferenceValue.lostPassword == true}">
- <li>
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
- </li>
- </c:if>
- </ul>
- </h:form>
-
- <!-- Title -->
- <ul class="objectpath">
- <li class="selected">
- <ui:insert name="title">Title</ui:insert>
- </li>
- </ul>
- <br/>
- <!-- Content -->
- <ui:insert name="content">Content</ui:insert>
+ <c:if test="#{portletPreferenceValue.lostPassword == true}">
+ <li>
+ <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ </li>
+ </c:if>
+ </ul>
+ </h:form>
+ <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:define name="tab-container-content">
+ <!-- Title -->
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
+ <!-- Content -->
+ <ui:insert name="content">Content</ui:insert>
+ </ui:define>
+ </ui:decorate>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
+</c:choose>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -12,6 +12,9 @@
<b>
<c:choose>
+ <c:when test="#{portletRenderParameter.operation == 'validation_error'}">
+ <h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_ERROR}" />
+ </c:when>
<c:when test="#{portletRenderParameter.operation == 'validation_failed'}">
<h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_FAILED}" />
</c:when>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-20 16:31:12 UTC (rev 8386)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-20 16:38:15 UTC (rev 8387)
@@ -50,7 +50,7 @@
<preference>
<!-- Use captcha verification -->
<name>captcha</name>
- <value>true</value>
+ <value>false</value>
</preference>
<preference>
<!--
@@ -92,7 +92,7 @@
requires correct mail service configuration
-->
<name>resetPassword</name>
- <value>true</value>
+ <value>false</value>
</preference>
</portlet-preferences>
</portlet>
16 years, 9 months
- 1
- 0