September 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8204 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/services/metadata and 19 other directories.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-10 07:22:54 -0400 (Mon, 10 Sep 2007) New Revision: 8204 Added: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/SendValidationMailAction.java trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 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/faces/PortletDelegatingPropertyResolver.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml trunk/core-identity/src/resources/portal-identity-sar/conf/schema/identity-ui-configuration.xsd 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/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 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/register/confirm.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml trunk/core-identity/src/resources/resource-bundles/Identity.properties Log: - minor UI enhancements Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -65,7 +65,7 @@ public static final String VALIDATION_VALIDATED = "validated"; /** jBPM process variables */ - public static final String VALIDATION_PORTAL_URL = "portalURL"; + public static final String PORTAL_URL = "portalURL"; public static final String VALIDATION_HASH = "validationHash"; public static final String VARIABLE_LOCALE = "locale"; public static final String VARIABLE_EMAIL = "email"; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -263,8 +263,8 @@ } catch (IdentityException e) { - log.error("cannot resolve property: " + uiComponent.getPropertyRef(), e); uiComponent = null; + throw new RuntimeException("cannot resolve property: " + uiComponent.getPropertyRef(), e); } } return uiComponent; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -203,7 +203,7 @@ Token token = processInstance.getRootToken(); // Setting required attributes for the workflow - processInstance.getContextInstance().setVariable(IdentityConstants.VALIDATION_PORTAL_URL, url); + processInstance.getContextInstance().setVariable(IdentityConstants.PORTAL_URL, url); processInstance.getContextInstance().setVariable(IdentityConstants.VARIABLE_USER, user); processInstance.getContextInstance().setVariable(IdentityConstants.VARIABLE_EMAIL, user.getProfileMap().get(User.INFO_USER_EMAIL_REAL)); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/SendValidationMailAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/SendValidationMailAction.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/SendValidationMailAction.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -91,7 +91,7 @@ ectx.getContextInstance().setVariable(IdentityConstants.VALIDATION_HASH, hash); // Building the validation URL - String portalURL = (String) ectx.getContextInstance().getVariable(IdentityConstants.VALIDATION_PORTAL_URL); + String portalURL = (String) ectx.getContextInstance().getVariable(IdentityConstants.PORTAL_URL); String activationLink = portalURL + "/" + IdentityConstants.VALIDATE_EMAIL + "/" + ectx.getProcessInstance().getId() + "/" + hash; emailMap.put("activationLink", activationLink); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -171,7 +171,7 @@ processInstance = jbpmContext.newProcessInstance(this.processName); Token token = processInstance.getRootToken(); - processInstance.getContextInstance().setVariable(IdentityConstants.VALIDATION_PORTAL_URL, url); + processInstance.getContextInstance().setVariable(IdentityConstants.PORTAL_URL, url); processInstance.getContextInstance().setVariable(IdentityConstants.VARIABLE_USER, new UserContainer(user)); processInstance.getContextInstance().setVariable(IdentityConstants.VARIABLE_EMAIL, email); processInstance.getContextInstance().setVariable(IdentityConstants.VARIABLE_LOCALE, locale); 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-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -24,14 +24,19 @@ import java.util.Locale; import java.util.Map; +import java.util.ResourceBundle; import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.portlet.WindowStateException; import org.jboss.logging.Logger; 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.workflow.ValidateEmailService; import org.jboss.portal.core.identity.ui.IdentityUIUser; import org.jboss.portal.core.identity.ui.common.IdentityUserBean; @@ -40,6 +45,7 @@ import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; +import org.jboss.portlet.JBossRenderResponse; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -55,6 +61,9 @@ /** . */ private String email; + + /** . */ + private WindowState windowState; /** . */ private IdentityUIUser uiUser; @@ -139,8 +148,46 @@ { this.validateEmailService = validateEmailService; } + + public String viewStart() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + ExternalContext ectx = ctx.getExternalContext(); + JBossActionResponse response = (JBossActionResponse) ectx.getResponse(); + try + { + if (windowState == null) + response.setWindowState(WindowState.NORMAL); + else + response.setWindowState(windowState); + } + catch (WindowStateException e) + { + log.error("",e); + } + return "start"; + } + + public String userEditProfile() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + ExternalContext ectx = ctx.getExternalContext(); + JBossActionRequest request = (JBossActionRequest) ectx.getRequest(); + this.windowState = request.getWindowState(); + JBossActionResponse response = (JBossActionResponse) ectx.getResponse(); + this.uiUser = new IdentityUIUser(ectx.getRemoteUser()); + try + { + response.setWindowState(WindowState.MAXIMIZED); + } + catch (WindowStateException e) + { + log.error("",e); + } + return "editProfile"; + } - public String editProfile() + public String adminEditProfile() { FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); @@ -164,33 +211,42 @@ } catch (RuntimeException e) { - e.printStackTrace(); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("RuntimeException")); + ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); + log.error("",e); } catch (IdentityException e) { - e.printStackTrace(); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("IdentityExeption")); + ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); + log.error("",e); } return "editProfile"; } public String changePassword() { + FacesContext ctx = FacesContext.getCurrentInstance(); + ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); if (this.password != null) { try { // Update password this.identityUserBean.updatePassword(this.currentUser, this.password); + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWOR_STATUS"))); } catch (Exception e) { log.error("error while updating password", e); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("Error")); + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"))); } } - return "start"; + else + { + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"))); + } + return "status"; } public String adminChangePassword() @@ -205,6 +261,8 @@ public String changeEmail() { + FacesContext ctx = FacesContext.getCurrentInstance(); + ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); if (this.email != null) { try @@ -215,15 +273,22 @@ Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale(); String portalURL = this.getPortalURL(); String validationStatus = this.validateEmailService.changeEmail(portalURL, user, email, locale); - log.debug(validationStatus); + if (IdentityConstants.REGISTRATION_PENDING.equals(validationStatus)) + { + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING"))); + } + else + { + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED"))); + } } catch (Exception e) { log.error("error while changing email", e); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("Error")); + ctx.addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_EMAIL_ERROR"))); } } - return "start"; + return "status"; } private String getPortalURL() Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -25,7 +25,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -49,6 +48,7 @@ import org.jboss.portal.faces.el.dynamic.DynamicBean; /** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ @@ -146,29 +146,32 @@ { if ( base instanceof UIComponentConfiguration && ((String)property).equals("values")) { + List list = new ArrayList(); FacesContext ctx = FacesContext.getCurrentInstance(); UIComponentConfiguration uiComponent = (UIComponentConfiguration) base; + // if not required add a empty SelectItem + if(! uiComponent.isRequired()) + list.add(new SelectItem("")); + if (IdentityConstants.COMPONENT_VALUE_LOCALE.equals(uiComponent.getPredefinedMapValues())) { - return StaticValues.getLocale(ctx); + list.addAll(StaticValues.getLocale(ctx)); + return list; } else if (IdentityConstants.COMPONENT_VALUE_THEME.equals(uiComponent.getPredefinedMapValues())) { - return StaticValues.getTheme(ctx); + list.addAll(StaticValues.getTheme(ctx)); + return list; } else if (IdentityConstants.COMPONENT_VALUE_TIMEZONE.equals(uiComponent.getPredefinedMapValues())) { - return StaticValues.getTimezone(); + list.addAll(StaticValues.getTimezone()); + return list; } else { // building dynamic value list - List list = new ArrayList(); Iterator i = uiComponent.getValues().keySet().iterator(); - // if not required add a empty SelectItem - if(! uiComponent.isRequired()) - list.add(new SelectItem("")); - while(i.hasNext()) { String key = (String) i.next(); @@ -216,11 +219,6 @@ { try { - String test = null; - if ( base instanceof HashSet) - { - test = "ok"; - } Field f = base.getClass().getField((String)property); if (Modifier.isReadableProperty(f)) { Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2007-09-10 11:22:54 UTC (rev 8204) @@ -53,7 +53,6 @@ public static List getTimezone() { List list = new ArrayList(); - list.add(new SelectItem("")); for (int i = 0; i < UserPortletConstants.TIME_ZONE_OFFSETS.length; i++) { if (UserPortletConstants.TIME_ZONE_OFFSETS[i] != null) @@ -73,7 +72,6 @@ public static List getTheme(FacesContext ctx) { List list = new ArrayList(); - list.add(new SelectItem("")); PortletContext pctx = (PortletContext) ctx.getExternalContext().getContext(); ThemeService themeService = (ThemeService) pctx.getAttribute("ThemeService"); for (Iterator i = themeService.getThemes().iterator(); i.hasNext();) @@ -94,7 +92,6 @@ public static List getLocale(FacesContext ctx) { List list = new ArrayList(); - list.add(new SelectItem("")); Locale currentLocale = ctx.getViewRoot().getLocale(); ArrayList locales = new ArrayList(LocaleManager.getLocales()); Collections.sort(locales, new LocaleComparator()); Modified: trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -23,7 +23,6 @@ <server> -  <mbean code="org.jboss.portal.core.identity.services.impl.IdentityCommandFactoryService" name="portal:commandFactory=IdentityUI" @@ -59,9 +58,11 @@ <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> portal:service=Module,type=IdentityServiceController </depends> +  <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> portal:service=Workflow,type=WorkflowService </depends> +  <attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute> </mbean> @@ -96,15 +97,17 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> - portal:service=Workflow,type=WorkflowService - </depends> <depends optional-attribute-name="IdentityUIConfigurationService" proxy-type="attribute"> portal:service=IdentityUIConfigurationService,type=IdentityUI </depends> <depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute"> portal:service=IdentityUserManagementService,type=IdentityUI </depends> +  + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> +  <attribute name="JNDIName">java:portal/RegistrationService</attribute> </mbean> @@ -114,15 +117,17 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> - portal:service=Workflow,type=WorkflowService - </depends> <depends optional-attribute-name="IdentityUIConfigurationService" proxy-type="attribute"> portal:service=IdentityUIConfigurationService,type=IdentityUI </depends> <depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute"> portal:service=IdentityUserManagementService,type=IdentityUI </depends> +  + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> +  <attribute name="JNDIName">java:portal/ValidateEmailService</attribute> </mbean> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -27,75 +27,62 @@ <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode> <overwrite-workflow>false</overwrite-workflow> <email-domain>jboss.org</email-domain> - <email-from>no-reply(a)jboss.com</email-from> + <email-from>do-no-reply(a)jboss.com</email-from> <password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters> <default-roles> <role>User</role> - <role>Admin</role> </default-roles>  <ui-components> - <ui-component name="nickname"> - <property-ref>user.name.nickName</property-ref> - <required>true</required> - - </ui-component> <ui-component name="givenname"> <property-ref>user.name.given</property-ref> - <required>true</required> </ui-component> <ui-component name="familyname"> <property-ref>user.name.family</property-ref> - <required>true</required> </ui-component> <ui-component name="location"> <property-ref>portal.user.location</property-ref> - <required>false</required> </ui-component> <ui-component name="occupation"> <property-ref>portal.user.occupation</property-ref> - <required>false</required> </ui-component> <ui-component name="extra"> <property-ref>portal.user.extra</property-ref> - <required>false</required> </ui-component> <ui-component name="signature"> <property-ref>portal.user.signature</property-ref> - <required>false</required> </ui-component> <ui-component name="interests"> <property-ref>portal.user.interests</property-ref> </ui-component> <ui-component name="icq"> <property-ref>portal.user.im.icq</property-ref> - <required>false</required> </ui-component> <ui-component name="aim"> <property-ref>portal.user.im.aim</property-ref> - <required>false</required> </ui-component> <ui-component name="msnm"> <property-ref>portal.user.im.msnm</property-ref> - <required>false</required> </ui-component> <ui-component name="yim"> <property-ref>portal.user.im.yim</property-ref> - <required>false</required> </ui-component> <ui-component name="skype"> <property-ref>portal.user.im.skype</property-ref> - <required>false</required> </ui-component> <ui-component name="xmmp"> <property-ref>portal.user.im.xmmp</property-ref> - <required>false</required> </ui-component> <ui-component name="homepage"> <property-ref>portal.user.homepage</property-ref> - <required>false</required> </ui-component> + <ui-component name="securityquestion"> + <property-ref>portal.user.security.question</property-ref> + </ui-component> + <ui-component name="securityanswer"> + <property-ref>portal.user.security.answer</property-ref> + </ui-component> <ui-component name="timezone"> <property-ref>portal.user.time-zone-offset</property-ref> <values> @@ -108,15 +95,12 @@ <value key="org.jboss.portal.core.identity.theme" /> </values> </ui-component> - <ui-component name="securityquestion"> - <property-ref>portal.user.security.question</property-ref> - <required>false</required> - </ui-component> - <ui-component name="securityanswer"> - <property-ref>portal.user.security.answer</property-ref> - <required>false</required> - </ui-component> - + <ui-component name="locale"> + <property-ref>portal.user.locale</property-ref> + <values> + <value key="org.jboss.portal.core.identity.locale" /> + </values> + </ui-component> <ui-component name="email"> <property-ref>user.business-info.online.email</property-ref> <validators> @@ -124,23 +108,18 @@ </validators> <required>true</required> </ui-component> - <ui-component name="locale"> - <property-ref>portal.user.locale</property-ref> - <values> - <value key="org.jboss.portal.core.identity.locale" /> - </values> - </ui-component> <ui-component name="registrationdate"> <property-ref>portal.user.registration-date</property-ref> - <required>true</required> </ui-component> <ui-component name="enabled"> <property-ref>portal.user.enabled</property-ref> - <required>true</required> </ui-component> <ui-component name="lastlogin"> <property-ref>portal.user.last-login-date</property-ref> - <required>false</required> </ui-component> + <ui-component name="nickname"> + <property-ref>user.name.nickName</property-ref> + <required>true</required> + </ui-component> </ui-components> </identity-ui-configuration> \ No newline at end of file Added: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE process-definition PUBLIC + "-//jBpm/jBpm Mapping DTD 2.0//EN" + "http://jbpm.org/dtd/processdefinition-2.0.dtd"> + +<process-definition name="custom"> + <start-state> + <transition to="end"> + <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/> + </transition> + </start-state> + + <end-state name="end"/> +</process-definition> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE process-definition PUBLIC "-//jBpm/jBpm Mapping DTD 2.0//EN" "http://jbpm.org/dtd/processdefinition-2.0.dtd"> @@ -14,7 +37,7 @@ <transition name="validated" to="end"> <action class="org.jboss.portal.core.identity.services.workflow.impl.UpdateEmailAction"/> </transition> - <transition name="timedOut" to="expired"/> + <transition name="timedOut" to="end"/> </state> <end-state name="end"/> </process-definition> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE process-definition PUBLIC "-//jBpm/jBpm Mapping DTD 2.0//EN" "http://jbpm.org/dtd/processdefinition-2.0.dtd"> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE process-definition PUBLIC "-//jBpm/jBpm Mapping DTD 2.0//EN" "http://jbpm.org/dtd/processdefinition-2.0.dtd"> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/schema/identity-ui-configuration.xsd =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/schema/identity-ui-configuration.xsd 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/schema/identity-ui-configuration.xsd 2007-09-10 11:22:54 UTC (rev 8204) @@ -21,7 +21,7 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - + <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" elementFormDefault="qualified"> 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-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -28,381 +28,395 @@ <faces-config> <application> - <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver> + <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver> <property-resolver>org.jboss.portal.core.identity.ui.faces.PortletDelegatingPropertyResolver</property-resolver> <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> </application> - <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> - </managed-bean> - <managed-bean> - <managed-bean-name>identityrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityRoleBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>roleModule</property-name> - <value>#{applicationScope.RoleModule}</value> - </managed-property> - <managed-property> - <property-name>membershipModule</property-name> - <value>#{applicationScope.MembershipModule}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>identityusermgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityUserBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - <managed-property> - <property-name>userModule</property-name> - <value>#{applicationScope.UserModule}</value> - </managed-property> - <managed-property> - <property-name>userProfileModule</property-name> - <value>#{applicationScope.UserProfileModule}</value> - </managed-property> - <managed-property> - <property-name>metaDataService</property-name> - <value>#{metadataservice}</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> + </managed-bean> + <managed-bean> + <managed-bean-name>identityrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityRoleBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>roleModule</property-name> + <value>#{applicationScope.RoleModule}</value> + </managed-property> + <managed-property> + <property-name>membershipModule</property-name> + <value>#{applicationScope.MembershipModule}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>identityusermgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.common.IdentityUserBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + <managed-property> + <property-name>userModule</property-name> + <value>#{applicationScope.UserModule}</value> + </managed-property> + <managed-property> + <property-name>userProfileModule</property-name> + <value>#{applicationScope.UserProfileModule}</value> + </managed-property> + <managed-property> + <property-name>metaDataService</property-name> + <value>#{metadataservice}</value> + </managed-property> + </managed-bean> - <managed-bean> - <managed-bean-name>editprofilemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditProfileAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>validateEmailService</property-name> - <value>#{applicationScope.ValidateEmailService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>userregistermgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateUserAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>defaultRoles</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.defaultRoles}</value> - </managed-property> - <managed-property> - <property-name>registrationService</property-name> - <value>#{applicationScope.RegistrationService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>assignrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.AssignRoleAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>useradministrationbean</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - <managed-property> - <property-name>registrationService</property-name> - <value>#{applicationScope.RegistrationService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>rolemanagementbean</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.admin.RoleManagementBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>editrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditRoleAction</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>lostpasswordmgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.LostPasswordAction</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>passwordCharacters</property-name> - <value>#{applicationScope.IdentityUIConfigurationService.configuration.passwordGenerationCharacters}</value> - </managed-property> - <managed-property> - <property-name>identityUserBean</property-name> - <value>#{identityusermgr}</value> - </managed-property> - <managed-property> - <property-name>identityMailService</property-name> - <value>#{applicationScope.IdentityMailService}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>createrolemgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateRoleAction</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>identityRoleBean</property-name> - <value>#{identityrolemgr}</value> - </managed-property> - </managed-bean> + <managed-bean> + <managed-bean-name>editprofilemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditProfileAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>validateEmailService</property-name> + <value>#{applicationScope.ValidateEmailService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>userregistermgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateUserAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>defaultRoles</property-name> + <value>#{applicationScope.IdentityUIConfigurationService.configuration.defaultRoles}</value> + </managed-property> + <managed-property> + <property-name>registrationService</property-name> + <value>#{applicationScope.RegistrationService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>assignrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.AssignRoleAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>useradministrationbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + <managed-property> + <property-name>registrationService</property-name> + <value>#{applicationScope.RegistrationService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>rolemanagementbean</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.admin.RoleManagementBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>editrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.EditRoleAction</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>lostpasswordmgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.LostPasswordAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>passwordCharacters</property-name> + <value>#{applicationScope.IdentityUIConfigurationService.configuration.passwordGenerationCharacters}</value> + </managed-property> + <managed-property> + <property-name>identityUserBean</property-name> + <value>#{identityusermgr}</value> + </managed-property> + <managed-property> + <property-name>identityMailService</property-name> + <value>#{applicationScope.IdentityMailService}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>createrolemgr</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.identity.ui.actions.CreateRoleAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>identityRoleBean</property-name> + <value>#{identityrolemgr}</value> + </managed-property> + </managed-bean> - <validator> - <validator-id>EmailValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.EmailValidator</validator-class> - </validator> - <validator> - <validator-id>UsernameValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class> - </validator> - <validator> - <validator-id>PasswordValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class> - </validator> - <validator> - <validator-id>CurrentPasswordValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.CurrentPasswordValidator</validator-class> - </validator> - <validator> - <validator-id>CaptchaValidator</validator-id> - <validator-class>org.jboss.portal.core.identity.ui.validators.CaptchaValidator</validator-class> - </validator> + <validator> + <validator-id>EmailValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.EmailValidator</validator-class> + </validator> + <validator> + <validator-id>UsernameValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class> + </validator> + <validator> + <validator-id>PasswordValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class> + </validator> + <validator> + <validator-id>CurrentPasswordValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.CurrentPasswordValidator</validator-class> + </validator> + <validator> + <validator-id>CaptchaValidator</validator-id> + <validator-class>org.jboss.portal.core.identity.ui.validators.CaptchaValidator</validator-class> + </validator> - <navigation-rule> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>lostPassword</from-outcome> - <to-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</from-view-id> - <navigation-case> - <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/lostPassword/status.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/register/register.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/register/confirm.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/register/confirm.xhtml</from-view-id> - <navigation-case> - <from-outcome>revise</from-outcome> - <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>registered</from-outcome> - <to-view-id>/WEB-INF/jsf/register/success.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>changePassword</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <navigation-case> - <from-outcome>changeEmail</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</to-view-id> - </navigation-case> - </navigation-rule> -<navigation-rule> - <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> - </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> - </navigation-case> - </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/WEB-INF/jsf/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>lostPassword</from-outcome> + <to-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/WEB-INF/jsf/lostPassword/status.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/register/register.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/WEB-INF/jsf/register/confirm.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/register/confirm.xhtml</from-view-id> + <navigation-case> + <from-outcome>revise</from-outcome> + <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>registered</from-outcome> + <to-view-id>/WEB-INF/jsf/register/success.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>changePassword</from-outcome> + <to-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <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> + </navigation-case> + </navigation-rule> + <navigation-rule> + <navigation-case> + <from-outcome>changeEmail</from-outcome> + <to-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <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> + </navigation-case> + </navigation-rule> + <navigation-rule> + <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> + </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> + </navigation-case> + </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>userAdmin</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> - <navigation-case> - <from-outcome>roleAdmin</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>createUser</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>searchUsers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> - <navigation-case> - <from-outcome>showPendingUsers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id> - <navigation-case> - <from-outcome>deleteUser</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/deleteUser.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> - <navigation-case> - <from-outcome>adminChangePassword</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> - <navigation-case> - <from-action>#{editprofilemgr.editProfile}</from-action> - <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{editprofilemgr.updateProfile}</from-action> - <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> - <navigation-case> - <from-action>#{assignrolemgr.assignRoles}</from-action> - <from-outcome>assignRoles</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/assignRoles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</from-view-id> - <navigation-case> - <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <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> - </navigation-case> - <navigation-case> - <from-outcome>registered</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> - </navigation-case> - </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>createRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/createRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>editRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/editRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>userAdmin</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>start</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>viewMembers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/roleMembers.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> - <navigation-case> - <from-outcome>deleteRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/deleteRole.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> - <navigation-case> - <from-outcome>resetPassword</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</from-view-id> - <navigation-case> - <from-action>#{lostpasswordmgr.doomed}</from-action> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <navigation-case> + <from-outcome>roleAdmin</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/roles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>createUser</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>searchUsers</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <navigation-case> + <from-outcome>showPendingUsers</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id> + <navigation-case> + <from-outcome>deleteUser</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/deleteUser.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> + <navigation-case> + <from-outcome>adminChangePassword</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <navigation-case> + <from-action>#{editprofilemgr.adminEditProfile}</from-action> + <from-outcome>editProfile</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-action>#{editprofilemgr.updateProfile}</from-action> + <from-outcome>editProfile</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <navigation-case> + <from-action>#{assignrolemgr.assignRoles}</from-action> + <from-outcome>assignRoles</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/assignRoles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</from-view-id> + <navigation-case> + <from-outcome>register</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <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> + </navigation-case> + <navigation-case> + <from-outcome>registered</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>createRole</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/roles/createRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>editRole</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/roles/editRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>viewMembers</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/roles/roleMembers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <navigation-case> + <from-outcome>deleteRole</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/roles/deleteRole.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> + <navigation-case> + <from-outcome>resetPassword</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</from-view-id> + <navigation-case> + <from-action>#{lostpasswordmgr.doomed}</from-action> <from-outcome>status</from-outcome> <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,7 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - #{bundle.IDENTITY_REGISTER_TITLE} + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -17,9 +17,6 @@ </ul> </h:form> -  - <h:message infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> -  <h4><ui:insert name="title">Title</ui:insert></h4> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,7 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> - #{bundle.IDENTITY_REGISTER_TITLE} + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,9 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> -<ui:define name="title">#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}</ui:define> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" /> +</ui:define> <ui:define name="content"> <h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -45,7 +45,6 @@ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> <h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/> -  <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/> <f:param name="processId" value="#{user.processId}" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,9 @@ <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> -<ui:define name="title">#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}</ui:define> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> +</ui:define> <ui:define name="content"> <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -65,7 +65,7 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> - <h:commandLink action="#{editprofilemgr.editProfile}"> + <h:commandLink action="#{editprofilemgr.adminEditProfile}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> | Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -17,9 +17,6 @@ </ul> </h:form> -  - <h:message infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> -  <h4><ui:insert name="title">Title</ui:insert></h4> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,22 @@ +<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"> + + <c:if test="#{portletPreferenceValue.captcha == true}"> + <hr/> + <h:graphicImage url="/jcaptcha" /> + <h:panelGrid columns="2"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA}" /> + <h:inputText id="validateCaptcha" value="" required="true"> + <f:validator validatorId="CaptchaValidator" /> + </h:inputText> + <h:panelGroup /> + <h:message for="validateCaptcha" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + </h:panelGrid> + </c:if> + +</div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -7,51 +7,11 @@ class="identity-ui"> <h:form> - <h:panelGrid columns="3" cellpadding="3"> - <c:choose> - <c:when test="#{adminMode == true}"> - <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> - <h:outputText id="username" value="#{manager.uiUser.username}"/> - <h:message for="username"/> - - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> - <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> - <f:validator validatorId="#{metadataservice.email.validator}"/> - </h:inputText> - <h:message for="#{metadataservice.email.name}"/> - - <c:choose> - <c:when test="#{portletPreferenceValue.resetPassword == true}"> - <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> - <h:commandLink action="resetPassword"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" /> - <f:param name="currentUser" value="#{manager.uiUser.username}" /> - </h:commandLink> - <h:panelGroup /> - </c:when> - <c:otherwise> - <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> - <h:commandLink action="#{manager.adminChangePassword}"> - <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /> - <f:param name="currentUser" value="#{manager.uiUser.username}" /> - </h:commandLink> - <h:panelGroup /> - </c:otherwise> - </c:choose> - </c:when> - <c:otherwise> + <ui:include src="/WEB-INF/jsf/common/userInfo.xhtml" /> - <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> - <h:outputText id="username" value="#{manager.uiUser.username}"/> - <h:panelGroup /> - - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> - <h:outputText id="email" value="#{manager.uiUser.attribute.email}"/> - <h:panelGroup /> - </c:otherwise> - </c:choose> - +  + <h:panelGrid columns="2" cellpadding="3"> <h:panelGroup/> <h:panelGroup> <ul class="topnav"> @@ -60,25 +20,27 @@ </li> </ul> </h:panelGroup> - <h:panelGroup/> <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> - <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}"> + <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> <f:selectItems value="#{metadataservice.timezone.values}" /> </h:selectOneMenu> - <h:message for="timezone" /> + <h:panelGroup /> + <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_THEME}"/> - <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}"> + <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> <f:selectItems value="#{metadataservice.theme.values}" /> </h:selectOneMenu> - <h:message for="theme" /> + <h:panelGroup /> + <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> - <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}"> + <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> <f:selectItems value="#{metadataservice.locale.values}" /> </h:selectOneMenu> - <h:message for="locale" /> + <h:panelGroup /> + <h:message for="locale" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGroup/> <h:panelGroup> @@ -88,19 +50,21 @@ </li> </ul> </h:panelGroup> - <h:panelGroup/> <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> - <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}"/> - <h:message for="givenname" /> + <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> + <h:panelGroup /> + <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> - <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}"/> - <h:message for="lastname"/> + <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> + <h:panelGroup /> + <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> - <h:inputText id="location" value="#{manager.uiUser.attribute.location}"/> - <h:message for="location"/> + <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> + <h:panelGroup /> + <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGroup/> <h:panelGroup> @@ -110,31 +74,36 @@ </li> </ul> </h:panelGroup> - <h:panelGroup/> <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> - <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}"/> - <h:message for="skype"/> + <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> + <h:panelGroup /> + <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_ICQ}"/> - <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}"/> - <h:message for="icq"/> + <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> + <h:panelGroup /> + <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_AIM}"/> - <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}"/> - <h:message for="aim"/> + <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> + <h:panelGroup /> + <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_MSNM}"/> - <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}"/> - <h:message for="msnm"/> + <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> + <h:panelGroup /> + <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_YIM}"/> - <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}"/> - <h:message for="yim"/> + <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> + <h:panelGroup /> + <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_XMMP}"/> - <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}"/> - <h:message for="xmmp"/> + <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> + <h:panelGroup /> + <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGroup/> <h:panelGroup> @@ -144,37 +113,41 @@ </li> </ul> </h:panelGroup> - <h:panelGroup/> <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> - <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}"/> - <h:message for="homepage"/> + <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> + <h:panelGroup /> + <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> - <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}"/> - <h:message for="occupation"/> + <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> + <h:panelGroup /> + <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> - <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" /> - <h:message for="interests"/> + <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> + <h:panelGroup /> + <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> <h:panelGroup> - <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" /><br/> + <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> </h:panelGroup> - <h:message for="signature"/> + <h:panelGroup /> + <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> <h:panelGroup> - <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" /><br/> + <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> </h:panelGroup> - <h:message for="extra"/> + <h:panelGroup /> + <h:message for="extra" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> - <hr/> - <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> + <hr/> + <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/> </h:form> - </div> \ No newline at end of file +</div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -7,43 +7,41 @@ class="identity-ui"> <h:form> - <h:panelGrid columns="3" cellpadding="3"> - + <h:panelGrid columns="2" cellpadding="3"> <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/> <h:inputText id="username" value="#{manager.uiUser.username}" required="true"> <f:validator validatorId="UsernameValidator"/> </h:inputText> - <h:message for="username"/> + <h:panelGroup /> + <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText for="#{metadataservice.email.name}" value="#{bundle.IDENTITY_EMAIL}"/> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}"/> </h:inputText> - <h:message for="#{metadataservice.email.name}"/> + <h:panelGroup /> + <h:message for="#{metadataservice.email.name}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText for="password" value="#{bundle.IDENTITY_PASSWORD}"/> <h:inputSecret id="password" value="#{manager.uiUser.password}" required="true"> <f:validateLength minimum="6"/> </h:inputSecret> - <h:message for="password"/> + <h:panelGroup /> + <h:message for="password" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText for="passwordCheck" value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/> <h:inputSecret id="passwordCheck" required="true"> <f:validator validatorId="PasswordValidator"/> </h:inputSecret> - <h:message for="passwordCheck"/> + <h:panelGroup /> + <h:message for="passwordCheck" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + </h:panelGrid> - <c:if test="#{portletPreferenceValue.captcha == true}"> + +  + <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> + <hr/> - <h:graphicImage url="/jcaptcha" /> - <h:panelGrid columns="3"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA}" /> - <h:inputText id="validateCaptcha" value="" required="true"> - <f:validator validatorId="CaptchaValidator" /> - </h:inputText> - <h:message for="validateCaptcha" /> - </h:panelGrid> - </c:if> - <hr/> <h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/> </h:form> </div> \ No newline at end of file Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,87 @@ + +<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"> + +<h:panelGrid columns="3" cellpadding="5" width="50%"> + <c:choose> + <c:when test="#{adminMode == true}"> + + <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> + <h:outputText id="username" value="#{manager.uiUser.username}"/> + <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> + <f:validator validatorId="#{metadataservice.email.validator}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + </h:inputText> + <h:message for="#{metadataservice.email.name}"/> + + <c:choose> + <c:when test="#{portletPreferenceValue.resetPassword == true}"> + <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> + <h:commandLink action="resetPassword"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" /> + <f:param name="currentUser" value="#{manager.uiUser.username}" /> + </h:commandLink> + <h:panelGroup /> + </c:when> + <c:otherwise> + <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> + <h:commandLink action="#{manager.adminChangePassword}"> + <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /> + <f:param name="currentUser" value="#{manager.uiUser.username}" /> + </h:commandLink> + <h:panelGroup /> + </c:otherwise> + </c:choose> + </c:when> + <c:otherwise> + + <h:outputText value="#{bundle.IDENTITY_USERNAME}"/> + <h:outputText id="username" value="#{manager.uiUser.username}"/> + <h:panelGroup /> + + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText id="email" value="#{manager.uiUser.attribute.email}"/> + <h:panelGroup /> + + <h:panelGroup /> + <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" /> + <h:panelGroup /> + + <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> + <h:commandLink action="changePassword"> + <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /> + <f:param name="currentUser" value="#{manager.uiUser.username}" /> + </h:commandLink> + <h:panelGroup /> + </c:otherwise> + </c:choose> +</h:panelGrid> +</div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,27 +9,21 @@ <ui:composition template="/WEB-INF/jsf/lostPassword/lostTemplate.xhtml"> <ui:define name="title"> - #{bundle.IDENTITY_LOST_PASSWORD_TITLE} + <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_TITLE}" /> </ui:define> <ui:define name="content"> <h:form> - <p>#{bundle.IDENTITY_LOST_PASSWORD_DESCRIPTION}</p> - <h:panelGrid columns="3" cellpadding="3"> + <p><h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_DESCRIPTION}" /></p> + <h:panelGrid columns="2" cellpadding="3"> <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/> - <h:inputText id="username" value="#{lostpasswordmgr.username}" /> - <h:message for="username" /> + <h:inputText id="username" value="#{lostpasswordmgr.username}" required="true"/> + <h:panelGroup /> + <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> - <c:if test="#{portletPreferenceValue.captcha == true}"> - <hr/> - <h:graphicImage id="captchaimage" url="/jcaptcha" /> - <h:panelGrid columns="3"> - <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA}" /> - <h:inputText id="validateCaptcha" value="" required="true"> - <f:validator validatorId="CaptchaValidator" /> - </h:inputText> - <h:message for="validateCaptcha" /> - </h:panelGrid> - </c:if> + +  + <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> + <hr/> <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/> </h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -21,9 +21,6 @@ </li> </ul> </h:form> - -  - <h:message infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <h4><ui:insert name="title">Title</ui:insert></h4> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -6,39 +6,34 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> <f:loadBundle var="bundle" basename="Identity" /> - <h:form> - <ul class="topnav"> - <li> - <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" action="changePassword"/> - </li> - <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" /></li> - </ul> - </h:form> +<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> - <h:form> - <h4> +<ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/> - </h4> - <h:panelGrid columns="3" cellpadding="3"> - <h:outputText for="currentPassword" value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/> +</ui:define> + +<ui:define name="content"> + <h:form> + <h:panelGrid columns="2" cellpadding="3"> + <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/> <h:inputSecret id="currentPassword" value="currentPassword" required="true"> <f:validator validatorId="CurrentPasswordValidator"/> </h:inputSecret> - <h:message for="currentPassword" /> + <h:panelGroup /> + <h:message for="currentPassword" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_NEW}"/> <h:inputText id="email" value="#{editprofilemgr.email}" required="true"> <f:validator validatorId="EmailValidator" /> </h:inputText> - <h:message for="email" /> + <h:panelGroup /> + <h:message for="email" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> <hr/> <h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/> </h:form> +</ui:define> + +</ui:composition> + </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -6,44 +6,42 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> <f:loadBundle var="bundle" basename="Identity" /> - <h:form> - <ul class="topnav"> - <li> - <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile"/> - </li> - <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /></li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail"/> - </li> - </ul> - </h:form> +<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}" /> +</ui:define> + +<ui:define name="content"> <h:form> - <h4>#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}</h4> - <h:panelGrid columns="3" cellpadding="3"> + <h:panelGrid columns="2" cellpadding="3"> <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/> <h:inputSecret id="currentPassword" value="currentPassword" required="true"> <f:validator validatorId="CurrentPasswordValidator"/> </h:inputSecret> - <h:message for="currentPassword" /> + <h:panelGroup /> + <h:message for="currentPassword" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/> <h:inputSecret id="password" required="true" value="#{editprofilemgr.password}"> <f:validateLength minimum="6"/> </h:inputSecret> - <h:message for="password"/> + <h:panelGroup /> + <h:message for="password" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:outputText value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/> <h:inputSecret id="passwordCheck" required="true"> <f:validator validatorId="PasswordValidator"/> </h:inputSecret> - <h:message for="passwordCheck"/> + <h:panelGroup /> + <h:message for="passwordCheck" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:panelGrid> <hr/> <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/> </h:form> +</ui:define> + +</ui:composition> + </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -8,25 +8,16 @@ <f:loadBundle var="bundle" basename="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> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" action="changePassword"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail"/> - </li> - </ul> - </h:form> +<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> +<ui:define name="title" /> + +<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:param name="adminMode" value="false"/> </ui:decorate> +</ui:define> - +</ui:composition> </div> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,27 @@ +<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="Identity" /> + + <h:form> + <ul class="topnav"> + <li> + <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="#{editprofilemgr.viewStart}"/> + </li> + <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li> + </ul> + </h:form> + +  + <h4><ui:insert name="title">Title</ui:insert></h4> + +  + <ui:insert name="content">Content</ui:insert> + + +</div> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,20 @@ +<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="Identity" /> + +<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> + +<ui:define name="title"> + <h:messages /> +</ui:define> + +<ui:define name="content" /> + +</ui:composition> +</div> \ No newline at end of file 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-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -8,23 +8,13 @@ <f:loadBundle var="bundle" basename="Identity" /> - <h:form> - <ul class="topnav"> - <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" action="changePassword"/> - </li> - <li> - <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail"/> - </li> - </ul> - </h:form> +<ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml"> - <h4><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></h4> - +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /> +</ui:define> + +<ui:define name="content"> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_USERNAME}:"/> <h:outputText value="#{editprofilemgr.uiUser.username}"/> @@ -37,9 +27,17 @@ <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"/> <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}"/> + + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"/> <h:outputText value="#{bundle.IDENTITY_LOCATION}:"/> <h:outputText value="#{editprofilemgr.uiUser.attribute.location}"/> </h:panelGrid> +</ui:define> + +</ui:composition> + + </div> Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -0,0 +1,27 @@ +<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="Identity" /> + + <h:form> + <ul class="topnav"> + <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li> + <li> + <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="#{editprofilemgr.userEditProfile}"/> + </li> + </ul> + </h:form> + +  + <h4><ui:insert name="title">Title</ui:insert></h4> + +  + <ui:insert name="content">Content</ui:insert> + + +</div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/confirm.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/confirm.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/confirm.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -8,7 +8,9 @@ <ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml"> -<ui:define name="title">#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}</ui:define> +<ui:define name="title"> + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> +</ui:define> <ui:define name="content"> <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,7 @@ <ui:composition template="/WEB-INF/jsf/startTemplate.xhtml"> <ui:define name="title"> - #{bundle.IDENTITY_NOT_LOGGED_IN} + <h:outputText value="#{bundle.IDENTITY_NOT_LOGGED_IN}" /> </ui:define> <ui:define name="content"> <h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -9,7 +9,7 @@ <ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml"> <ui:define name="title"> - #{bundle.IDENTITY_REGISTER_TITLE} + <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> </ui:define> <ui:define name="content"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -24,9 +24,6 @@ </c:if> </ul> </h:form> - -  - <h:message infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <h4><ui:insert name="title">Title</ui:insert></h4> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -24,9 +24,6 @@ </c:if> </ul> </h:form> - -  - <h:message infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <h4><ui:insert name="title">Title</ui:insert></h4> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-10 11:22:54 UTC (rev 8204) @@ -24,9 +24,9 @@ <c:when test="#{portletRenderParameter.operation == 'jbp_identity_validation_approval_workflow'}"> <h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL}" /> </c:when> - <c:when test="#{portletRenderParameter.operation == 'custom'}"> + <c:otherwise> <h:outputText value="#{bundle.IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM}" /> - </c:when> + </c:otherwise> </c:choose> </b> @@ -46,5 +46,4 @@ </c:if> </ul> </div> - </div> \ No newline at end of file Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-10 11:22:54 UTC (rev 8204) @@ -37,14 +37,12 @@ <instance> <instance-id>CoreIdentityAdminPortletInstance</instance-id> <portlet-ref>CoreIdentityAdminPortlet</portlet-ref> - </instance> </deployment> </deployments> \ No newline at end of file Modified: trunk/core-identity/src/resources/resource-bundles/Identity.properties =================================================================== --- trunk/core-identity/src/resources/resource-bundles/Identity.properties 2007-09-10 08:32:01 UTC (rev 8203) +++ trunk/core-identity/src/resources/resource-bundles/Identity.properties 2007-09-10 11:22:54 UTC (rev 8204) @@ -43,14 +43,20 @@ IDENTITY_LOST_PASSWORD_STATUS_404=No account found. +IDENTITY_EDIT_PROFILE_ERROR=Error while updating the profile. 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. IDENTITY_EDIT_EMAIL_TITLE=Change your email address IDENTITY_EDIT_EMAIL_NEW=New email address IDENTITY_EDIT_CHANGE_EMAIL=Change email +IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Could not change e-mail address +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=An validation e-mail has been sent to your address. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Your e-mail address has been changed. IDENTITY_EDIT_PROFILE_TITLE=Edit profile IDENTITY_VIEW_PROFILE_TITLE=View profile @@ -130,9 +136,9 @@ IDENTITY_VERIFICATION_LOGIN=Login 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 activaed. You may log in now. +IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Your account has been activated. You may log in now. IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Your e-mail address has been verified, but your account needs to be approved by the administrator. -IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Your e-mail address has been verified. +IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Your account has been activated. You may log in now. IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user. IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Sorry - This username is already taken.

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8203 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-10 04:32:01 -0400 (Mon, 10 Sep 2007) New Revision: 8203 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml Log: Merge from trunk: Modified profile-config.xml to remove usage 'mandatory' on fields Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-09-09 21:15:03 UTC (rev 8202) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-09-10 08:32:01 UTC (rev 8203) @@ -46,7 +46,7 @@ <name>user.name.given</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> - <usage>mandatory</usage> + <usage>optional</usage> <display-name xml:lang="en">Given Name</display-name> <description xml:lang="en">The user given name</description> <mapping> @@ -60,7 +60,7 @@ <name>user.name.family</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> - <usage>mandatory</usage> + <usage>optional</usage> <display-name xml:lang="en">Family name</display-name> <description xml:lang="en">The user family name</description> <mapping> @@ -91,7 +91,7 @@ <name>portal.user.email.fake</name> <type>java.lang.String</type> <access-mode>read-write</access-mode> - <usage>mandatory</usage> + <usage>optional</usage> <display-name xml:lang="en">Fake email</display-name> <description xml:lang="en">The user fake email</description> <mapping> @@ -105,7 +105,7 @@ <name>portal.user.registration-date</name> <type>java.util.Date</type> <access-mode>read-write</access-mode> - <usage>mandatory</usage> + <usage>optional</usage> <display-name xml:lang="en">Registration date</display-name> <description xml:lang="en">Registration date of user</description> <mapping> @@ -119,7 +119,7 @@ <name>portal.user.email.view-real</name> <type>java.lang.Boolean</type> <access-mode>read-write</access-mode> - <usage>mandatory</usage> + <usage>optional</usage> <display-name xml:lang="en">View real email</display-name> <description xml:lang="en">Is user real email displayed in public</description> <mapping>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8202 - in modules/common/trunk: mc/src/main/org/jboss/portal/common/mc/bootstrap and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-09 17:15:03 -0400 (Sun, 09 Sep 2007) New Revision: 8202 Added: modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/ActualBootstrap.java Modified: modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java Log: improved MC web bootstrap Modified: modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml =================================================================== --- modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-07 18:42:36 UTC (rev 8201) +++ modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-09 21:15:03 UTC (rev 8202) @@ -10,5 +10,9 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntryProperties /> </component> + <component name="VcsManagerConfiguration"> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="USE_PROJECT_VCS" value="false" /> + </component> </module> Added: modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/ActualBootstrap.java =================================================================== --- modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/ActualBootstrap.java (rev 0) +++ modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/ActualBootstrap.java 2007-09-09 21:15:03 UTC (rev 8202) @@ -0,0 +1,54 @@ +/****************************************************************************** + * 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.common.mc.bootstrap; + +import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ActualBootstrap extends BasicBootstrap +{ + + /** . */ + private final WebBootstrap callback; + + // I don't know why we need to declare it since super() does not declare it + public ActualBootstrap(WebBootstrap callback) throws Exception + { + super(); + + // + this.callback = callback; + } + + protected void bootstrap() throws Throwable + { + super.bootstrap(); + + // + callback.boostrap(); + } + +} Modified: modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java =================================================================== --- modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2007-09-07 18:42:36 UTC (rev 8201) +++ modules/common/trunk/mc/src/main/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2007-09-09 21:15:03 UTC (rev 8202) @@ -23,19 +23,18 @@ package org.jboss.portal.common.mc.bootstrap; import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; import org.jboss.kernel.spi.deployment.KernelDeployment; import org.jboss.kernel.spi.event.KernelEventListener; import org.jboss.kernel.spi.event.KernelEvent; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.kernel.spi.config.KernelConfig; import org.apache.log4j.Logger; import javax.servlet.ServletContext; import javax.servlet.ServletContextListener; import javax.servlet.ServletContextEvent; import java.net.URL; +import java.net.MalformedURLException; /** * A kernel bootstrap with a life cycle triggered by the <code>ServletContextListener</code> interface. @@ -51,6 +50,31 @@ public class WebBootstrap implements ServletContextListener, KernelEventListener { + /** + * The servlet context init parameter name for the bean resource location. For instance for a web application + * resource it could be <i>/WEB-INF/my-beans.xml</i>, for the web application classloader resource it could be + * <i>org/jboss/portal/my-beans.xml</i>. If no init parameter is declared then the litteral value + * <i>/WEB-INF/jboss-beans.xml</i> is used and the lookup is done in the servlet context resourcees. + */ + public static final String BEANS_RESOURCE_LOCATION_KEY = "jboss.portal.mc.beans_resource_location"; + + /** + * The servlet context init parameter name for the bean resource type which can be the servlet context + * or the web application classloader. If no value is specified the servlet context will be used for + * resource lookup. The legal values are <i>context</i> for the servlet context and <i>classloader</i> + * for the web application classloader. + */ + public static final String BEANS_RESOURCE_TYPE_KEY = "jboss.portal.mc.beans_resource_type"; + + /** Default value for the bean resource location. */ + public static final String DEFAULT_JBOSS_BEANS_RESOURCE_LOCATION = "/WEB-INF/jboss-beans.xml"; + + /** Servlet context resource type. */ + public static final String CONTEXT_RESOURCE_TYPE = "context"; + + /** Classloader resource type. */ + public static final String CLASSLOADER_RESOURCE_TYPE = "classloader"; + /** . */ private final static Logger log = Logger.getLogger(WebBootstrap.class); @@ -67,19 +91,16 @@ private boolean registered; /** . */ - private BootstrapExt bootstrap; + private ActualBootstrap bootstrap; public void contextInitialized(ServletContextEvent event) { servletContext = event.getServletContext(); - // For now we do it here - System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.log4j.Log4jLoggerPlugin"); - // try { - bootstrap = new BootstrapExt(); + bootstrap = new ActualBootstrap(this); // bootstrap.run(); @@ -145,7 +166,7 @@ } } - private void boostrap() throws Throwable + void boostrap() throws Throwable { // bootstrap.getKernel().getRegistry().registerListener(WebBootstrap.this, null, "ABC"); @@ -155,25 +176,70 @@ deployer = new BeanXMLDeployer(bootstrap.getKernel()); // - URL url = servletContext.getResource("/WEB-INF/jboss-beans.xml"); - deployment = deployer.deploy(url); + URL url = getBeansURL(); + + // + if (url != null) + { + log.debug("About to deploy beans url=" + url); + deployment = deployer.deploy(url); + } + else + { + log.error("No valid beans URL was determined"); + } } - private class BootstrapExt extends BasicBootstrap + protected URL getBeansURL() { + String location = servletContext.getInitParameter(BEANS_RESOURCE_LOCATION_KEY); + String type = servletContext.getInitParameter(BEANS_RESOURCE_TYPE_KEY); - // I don't know why we need to declare it since super() does not declare it - public BootstrapExt() throws Exception + // + if (location == null) { - super(); + location = DEFAULT_JBOSS_BEANS_RESOURCE_LOCATION; + type = CONTEXT_RESOURCE_TYPE; } + else if (type == null) + { + type = CONTEXT_RESOURCE_TYPE; + } - protected void bootstrap() throws Throwable + // + if (CONTEXT_RESOURCE_TYPE.equals(type)) { - super.bootstrap(); + try + { + return servletContext.getResource(location); + } + catch (MalformedURLException e) + { + log.error("Cannot obtain beans definition file from servlet context with location=" + location, e); + // + return null; + } + } + else if (CLASSLOADER_RESOURCE_TYPE.equals(type)) + { + URL resource = Thread.currentThread().getContextClassLoader().getResource(location); + // - boostrap(); + if (resource == null) + { + log.error("Cannot obtain bean definition file from thread context classloader with location=" + location); + } + + // + return resource; } + else + { + log.error("Cannot obtain bean definition file since the context type cannot be determined type=" + type); + + // + return null; + } } }

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8201 - trunk/cms.

by portal-commits＠lists.jboss.org

Author: prabhat.jha(a)jboss.com Date: 2007-09-07 14:42:36 -0400 (Fri, 07 Sep 2007) New Revision: 8201 Modified: trunk/cms/build.xml Log: prefer IPv4 when running test with jdk1.5 on linux. This supposedly is a java bug as per jgroups page. Modified: trunk/cms/build.xml =================================================================== --- trunk/cms/build.xml 2007-09-07 16:19:21 UTC (rev 8200) +++ trunk/cms/build.xml 2007-09-07 18:42:36 UTC (rev 8201) @@ -407,7 +407,8 @@  + --> + <jvmarg value="-Djava.net.preferIPv4Stack=true"/> </x-sysproperty> <x-test>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8200 - in trunk: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-09-07 12:19:21 -0400 (Fri, 07 Sep 2007) New Revision: 8200 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Cleaned-up markup a little. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 16:18:57 UTC (rev 8199) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 16:19:21 UTC (rev 8200) @@ -10,23 +10,9 @@ <% Collection instances = (Collection)request.getAttribute("INSTANCES"); Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); - boolean newContent = Boolean.TRUE == request.getAttribute("NEW_CONTENT"); %> -<% - if (newContent) - { -%> <span class="portlet-font">Portlet instance associated to this window:</span> -<% -} -else -{ -%> -<span class="portlet-font">Portlet instance associated to this window:</span> -<% - } -%> <div style="height:300px; width:300px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> <table style="width:100%;" cellspacing="0" cellpadding="0"> @@ -37,8 +23,8 @@ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); %> <portlet:actionURL var="url"> - <portlet:param name="content.action.select" value="true"/> - <portlet:param name="content.uri" value="<%= instance.getId() %>"/> + <portlet:param name="content.action.select" value="true"/> + <portlet:param name="content.uri" value="<%= instance.getId() %>"/> </portlet:actionURL> <tr class="<%= rowClass %>"> <td><a href="<%= url %>"><%= instance.getId() %> @@ -62,6 +48,7 @@ + Portlet portlet = null; try { @@ -78,6 +65,7 @@ + %> <div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> @@ -96,10 +84,12 @@ + } } + %> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 16:18:57 UTC (rev 8199) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 16:19:21 UTC (rev 8200) @@ -63,18 +63,16 @@ </tr> <tr> <td colspan="2" valign="top"> - <div> - <jbp:portlet - portletId="#{pageManager.selectedEditorPortletId}" - portletInvoker="#{pageManager.portletInvoker}" - actionListener="#{pageManager.assignWindow}" - supportedModes="edit_content" - supportedWindowStates="normal" - initialMode="edit_content" - initialWindowState="normal" - renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> - </div> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> </td> </tr> </table> @@ -92,8 +90,8 @@ <h:message for="layoutForm" errorClass="portlet-msg-error"/> <input id="blah" type="hidden" name="blah" value=""/> <table width="100%"> - <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> - <tbody> + <tbody> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> @@ -132,8 +130,8 @@ styleClass="portlet-form-button layout-button"/> </td> </tr> - </tbody> - </c:forEach> + </c:forEach> + </tbody> <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> <tbody> <tr>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8199 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-09-07 12:18:57 -0400 (Fri, 07 Sep 2007) New Revision: 8199 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Cleaning-up markup a little. Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 15:24:14 UTC (rev 8198) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 16:18:57 UTC (rev 8199) @@ -10,23 +10,9 @@ <% Collection instances = (Collection)request.getAttribute("INSTANCES"); Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); - boolean newContent = Boolean.TRUE == request.getAttribute("NEW_CONTENT"); %> -<% - if (newContent) - { -%> <span class="portlet-font">Portlet instance associated to this window:</span> -<% -} -else -{ -%> -<span class="portlet-font">Portlet instance associated to this window:</span> -<% - } -%> <div style="height:300px; width:300px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> <table style="width:100%;" cellspacing="0" cellpadding="0"> @@ -62,6 +48,7 @@ + Portlet portlet = null; try { @@ -78,6 +65,7 @@ + %> <div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> @@ -96,10 +84,12 @@ + } } + %> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 15:24:14 UTC (rev 8198) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 16:18:57 UTC (rev 8199) @@ -63,18 +63,16 @@ </tr> <tr> <td colspan="2" valign="top"> - <div> - <jbp:portlet - portletId="#{pageManager.selectedEditorPortletId}" - portletInvoker="#{pageManager.portletInvoker}" - actionListener="#{pageManager.assignWindow}" - supportedModes="edit_content" - supportedWindowStates="normal" - initialMode="edit_content" - initialWindowState="normal" - renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> - </div> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> </td> </tr> </table> @@ -92,8 +90,8 @@ <h:message for="layoutForm" errorClass="portlet-msg-error"/> <input id="blah" type="hidden" name="blah" value=""/> <table width="100%"> - <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> - <tbody> + <tbody> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> @@ -132,8 +130,8 @@ styleClass="portlet-form-button layout-button"/> </td> </tr> - </tbody> - </c:forEach> + </c:forEach> + </tbody> <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> <tbody> <tr>

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8198 - branches/JBoss_Portal_Branch_2_6/build.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-07 11:24:14 -0400 (Fri, 07 Sep 2007) New Revision: 8198 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml Log: - Include core-identity - remove the ha-bundled Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-07 14:36:29 UTC (rev 8197) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-07 15:24:14 UTC (rev 8198) @@ -228,7 +228,6 @@ <antcall target="package-normal"/> <antcall target="package-ha"/> <antcall target="package-normal-bundled"/> - <antcall target="package-ha-bundled"/> </target>  - +  - </target> -  <target name="zip">

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8197 - in docs/trunk/referenceGuide/en: modules and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-07 10:36:29 -0400 (Fri, 07 Sep 2007) New Revision: 8197 Added: docs/trunk/referenceGuide/en/images/setup/build_deploy.png docs/trunk/referenceGuide/en/images/setup/build_ds.png docs/trunk/referenceGuide/en/images/setup/build_ds_dir.png docs/trunk/referenceGuide/en/images/setup/dsfiles.png docs/trunk/referenceGuide/en/images/setup/package.png docs/trunk/referenceGuide/en/images/setup/svncodir.png Removed: docs/trunk/referenceGuide/en/images/setup/build_deploy.gif docs/trunk/referenceGuide/en/images/setup/build_ds.gif docs/trunk/referenceGuide/en/images/setup/build_ds_dir.gif docs/trunk/referenceGuide/en/images/setup/deploy_dir.gif docs/trunk/referenceGuide/en/images/setup/dsfiles.gif docs/trunk/referenceGuide/en/images/setup/inst_fin.gif docs/trunk/referenceGuide/en/images/setup/inst_lang.gif docs/trunk/referenceGuide/en/images/setup/inst_localhost.png docs/trunk/referenceGuide/en/images/setup/inst_name.gif docs/trunk/referenceGuide/en/images/setup/inst_packs.gif docs/trunk/referenceGuide/en/images/setup/inst_path.gif docs/trunk/referenceGuide/en/images/setup/inst_portal.gif docs/trunk/referenceGuide/en/images/setup/inst_secure.gif docs/trunk/referenceGuide/en/images/setup/package.gif docs/trunk/referenceGuide/en/images/setup/svncodir.gif Modified: docs/trunk/referenceGuide/en/modules/installation.xml docs/trunk/referenceGuide/en/modules/overview.xml docs/trunk/referenceGuide/en/modules/supported.xml Log: Updating the doc, installation guide and supported stuff Deleted: docs/trunk/referenceGuide/en/images/setup/build_deploy.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/build_deploy.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/build_deploy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/trunk/referenceGuide/en/images/setup/build_ds.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/build_ds.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/build_ds.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/trunk/referenceGuide/en/images/setup/build_ds_dir.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/build_ds_dir.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/build_ds_dir.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/trunk/referenceGuide/en/images/setup/deploy_dir.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/dsfiles.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/dsfiles.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/dsfiles.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/trunk/referenceGuide/en/images/setup/inst_fin.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_lang.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_localhost.png =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_name.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_packs.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_path.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_portal.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/inst_secure.gif =================================================================== (Binary files differ) Deleted: docs/trunk/referenceGuide/en/images/setup/package.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/package.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/package.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: docs/trunk/referenceGuide/en/images/setup/svncodir.gif =================================================================== (Binary files differ) Added: docs/trunk/referenceGuide/en/images/setup/svncodir.png =================================================================== (Binary files differ) Property changes on: docs/trunk/referenceGuide/en/images/setup/svncodir.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: docs/trunk/referenceGuide/en/modules/installation.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/installation.xml 2007-09-07 11:11:16 UTC (rev 8196) +++ docs/trunk/referenceGuide/en/modules/installation.xml 2007-09-07 14:36:29 UTC (rev 8197) @@ -5,30 +5,19 @@ <note>Pre-configured clustered versions are available from the <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">download page</ulink> - , in the same 3 flavors as the non-clustered version. The installation difference, being that they must be + , in the same 3 flavors as the non-clustered version. The installation differences, being that they must be deployed in the <emphasis>all</emphasis> - configuration in JBoss AS. Read + configuration in JBoss AS and all your instances must reference the same datasource. Read <xref linkend="clustering"/> for more details on how to customize your clustered install, once deployed. </note> <note> - Binary distributions of JBoss Portal include the WSRP service which is not automatically deployed with the - source distribution. WSRP is built upon the JBoss WS web service stack. As such, it has some additional - constraints. In particular, there is a known issue with the version 1.0.0.GA of JBoss WS (bundled with JBoss - Application Server 4.0.4.GA) that prevents the complete deployment of JBoss Portal's WSRP service if the user - is not online or behind a firewall/proxy. This, in turn, prevents the deployment of JBoss Portal. If you do not - need the WSRP service, you can remove the - <filename>portal-wsrp.sar</filename> - file from the - <filename>jboss-portal.sar</filename> - file. If you'd like to use the WSRP service, the JBoss WS issue has been - addressed in version 1.0.2.GA of JBoss WS. Please follow the instructions on - <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=WSRP_UpdateJBossWS">how to upgrade JBoss WS</ulink> - as found on - <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossPortal">JBoss Portal's wiki</ulink> - . + <title>Installation of JBoss Portal on former version of JBoss AS</title> + <para>If you need to install JBoss Portal on JBoss AS 4.0.x, please refer to the dedicated + <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=Portal26_AS40">wiki page</ulink>.</para> </note> + </para> <sect1 id="install_bundle"> <title>Installing from Bundled Download</title> @@ -86,7 +75,8 @@ , documentation (which you are already reading), and a set of preconfigured datasource descriptors that allow JBoss Portal to communicate with a database. </para> - <para>This installation method is preferred by those who already have JBoss Application Server installed.</para> + <para>This installation method is preferred by those who already have JBoss Application Server installed or those we need to install + the version ready for clustering.</para> <sect2> <title>Setting up your environment</title> <sect3 id="install_binarydownload"> @@ -100,7 +90,7 @@ Once downloaded and extracted, the folder hierarchy should look like this: <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/package.gif"/> + <imagedata align="center" valign="middle" fileref="images/setup/package.png"/> </imageobject> </mediaobject> We will be using files contained in this download in the further sections, so please download and extract @@ -110,19 +100,15 @@ <sect3> <title>Application Server Setup</title> <para>Of course you will need to install JBoss Application Server prior to installing JBoss - portal, if you didn't do so yet, please install JBoss EAP 4.2, JBoss AS 4.2.1 or JBoss AS 4.0.5 if - you have to. You can have access to the EAP version from the support portal or the other versions + portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.1. If you have a + subscription contract with Red Hat, can have access to the EAP + version from the <ulink url="http://network.jboss.com/">support portal</ulink>. + For the other versions you can get them <ulink url="http://labs.jboss.com/portal/jbossas/download/index.html" >here </ulink> . - <warning>Make sure to download the JBoss AS Zip version. - <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss - AS! - </emphasis> - We are currently working on aligning the Application installer with JBoss Portal. - </warning> </para> </sect3> <sect3> @@ -165,7 +151,7 @@ directory. <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/dsfiles.gif"/> + <imagedata align="center" valign="middle" fileref="images/setup/dsfiles.png"/> </imageobject> </mediaobject> </para> @@ -239,14 +225,14 @@ </listitem> <listitem> <para>From SVN, using the following URL: - <programlisting> - <![CDATA[http://anonsvn.jboss.org/repos/portal/trunk/]]> - </programlisting> + <itemizedlist> + <listitem>http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_6 : For the latest sources of the 2.6 branch</listitem> + <listitem>http://anonsvn.jboss.org/repos/portal/trunk/ : For the latest sources</listitem> + </itemizedlist> <note> For more information on Portal SVN, and accessing different versions of the Portal codebase, please visit - <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalSVNRepo">this wiki article</ulink> - . + <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalSVNRepo">this wiki article</ulink>. </note> </para> </listitem> @@ -256,35 +242,30 @@ After checking out of SVN or extracting the Source zip, your directory structure should look like this: <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/svncodir.gif"/> + <imagedata align="center" valign="middle" fileref="images/setup/svncodir.png"/> </imageobject> </mediaobject> <note> - The screenshot above, shows the downloaded source directory. Those of you checking out from SVN, will be - missing the - <emphasis>thirdparty</emphasis> - directory. This directory is created when you first run the build in the following steps. + <para>The screenshot above, shows the downloaded source directory. Those of you checking out from SVN, will get + an empty <emphasis>thirdparty</emphasis> directory. This directory will be filled when you first run the build + in the following steps.</para> </note> </para> </sect2> <sect2> - <title>Setting up your environment</title> + <title>Setting up the application server</title> <sect3> <title>Application Server Setup</title> <para>Of course you will need to install JBoss Application Server prior to installing JBoss - portal, if you didn't do so yet, please install JBoss EAP 4.2, JBoss AS 4.2.1 or JBoss AS 4.0.5 if - you have to. You can have access to the EAP version from the support portal or the other versions + portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.1. If you have a + subscription contract with Red Hat, can have access to the EAP + version from the <ulink url="http://network.jboss.com/">support portal</ulink>. + For the other versions you can get them <ulink url="http://labs.jboss.com/portal/jbossas/download/index.html" >here </ulink> . - <warning>Make sure to download the JBoss AS Zip version. - <emphasis role="bold">DO NOT ATTEMPT to deploy JBoss Portal on the installer version of JBoss - AS! - </emphasis> - We are currently working on aligning the Application installer with JBoss Portal. - </warning> </para> </sect3> <sect3 id="install_source_env"> @@ -314,6 +295,46 @@ <command>export JBOSS_HOME=/path/to/your/jboss/directory</command> </para> </sect3> + </sect2> + <sect2> + <title>Building/Deploying from Sources</title> + <para>To build and deploy the JBoss Portal service, go to + <filename>JBOSS_PORTAL_HOME_DIRECTORY/build</filename> + and type: + <programlisting>build deploy</programlisting> + <mediaobject> + <imageobject> + <imagedata align="center" valign="middle" fileref="images/setup/build_deploy.png"/> + </imageobject> + </mediaobject> + <note> + <para>During the first compilation, third-party libraries will be obtained from an online + repository, you need to be connected to Internet and if you are behind a proxy, you also + need to define your proxy address and host by adding: + <literal>JAVA_OPTS=-Dhttp.proxyHost=<Proxy Host> -Dhttp.proxyPort=<Proxy Port></literal> in your environment. + </para> + </note> + <note>To build the clustered version, you will need to go to + <filename>JBOSS_PORTAL_HOME_DIRECTORY/build</filename> + and type: + <command>build main</command> + Then, go to + <filename>JBOSS_PORTAL_HOME_DIRECTORY/core</filename> + and type: + <command>build deploy-ha</command> + This will copy the + <filename>jboss-portal-ha.sar</filename> + to your + <filename>all</filename> + configuration for you. + </note> + At the end of the build process, the + <filename>jboss-portal.sar</filename> + is copied to <filename>JBOSS_HOME/server/default/deploy</filename>. + </para> + </sect2> + <sect2> + <title>Setting up the database</title> <sect3> <title>Database Setup</title> <para>You will need a database for JBoss Portal to function, you can use any database @@ -359,7 +380,7 @@ <programlisting>build datasource</programlisting> <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/build_ds.gif"/> + <imagedata align="center" valign="middle" fileref="images/setup/build_ds.png"/> </imageobject> </mediaobject> </para> @@ -367,7 +388,7 @@ Once complete, the datasource build should produce the following directory and file structure: <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/build_ds_dir.gif"/> + <imagedata align="center" valign="middle" fileref="images/setup/build_ds_dir.png"/> </imageobject> </mediaobject> </para> @@ -397,48 +418,10 @@ </sect3> </sect2> <sect2> - <title>Building/Deploying from Sources</title> - <para>To build and deploy the JBoss Portal service, go to - <filename>JBOSS_PORTAL_HOME_DIRECTORY/build</filename> - and type: - <programlisting>build deploy</programlisting> - <mediaobject> - <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/build_deploy.gif"/> - </imageobject> - </mediaobject> - <note>To build the clustered version, you will need to go to - <filename>JBOSS_PORTAL_HOME_DIRECTORY/build</filename> - and type: - <command>build main</command> - Then, go to - <filename>JBOSS_PORTAL_HOME_DIRECTORY/core</filename> - and type: - <command>build deploy-ha</command> - This will copy the - <filename>jboss-portal-ha.sar</filename> - to your - <filename>all</filename> - configuration for you. - </note> - At the end of the build process, the - <filename>jboss-portal.sar</filename> - is copied to - <filename>JBOSS_HOME/server/default/deploy</filename> - : - <mediaobject> - <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/deploy_dir.gif"/> - </imageobject> - </mediaobject> - Please verify that your - <filename>JBOSS_HOME/server/default/deploy</filename> - directory, contains both necessary files before starting JBoss Application Server. - </para> + <title>Starting and running JBoss Portal</title> <para> <emphasis role="bold">Start the Server:</emphasis> - Go to JBOSS_HOME/bin and execute run.bat (run.sh, if - Linux) + Go to JBOSS_HOME/bin and execute run.bat (run.sh, if Linux) <note>During the first boot (ever), SQL errors in the log, like the one below, can be safely ignored. They are thrown when the portal checks for the existence of the initial tables, before it creates them for you. @@ -574,7 +557,7 @@ <para> <mediaobject> <imageobject> - <imagedata align="center" valign="middle" fileref="images/setup/inst_localhost.png"/> + <imagedata align="center" valign="middle" fileref="images/setup/default_ss.jpg"/> </imageobject> </mediaobject> </para> Modified: docs/trunk/referenceGuide/en/modules/overview.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/overview.xml 2007-09-07 11:11:16 UTC (rev 8196) +++ docs/trunk/referenceGuide/en/modules/overview.xml 2007-09-07 14:36:29 UTC (rev 8197) @@ -58,10 +58,6 @@ </ulink> | <ulink url="http://jboss.org/index.html?module=bb&op=viewforum&f=232">WSRP</ulink> - | - <ulink url="http://jboss.org/index.html?module=bb&op=viewforum&f=239">Eclipse Portlet - Plugin - </ulink> </para> </listitem> <listitem> Modified: docs/trunk/referenceGuide/en/modules/supported.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/supported.xml 2007-09-07 11:11:16 UTC (rev 8196) +++ docs/trunk/referenceGuide/en/modules/supported.xml 2007-09-07 14:36:29 UTC (rev 8197) @@ -26,6 +26,9 @@ <listitem>400 MHz CPU</listitem> </itemizedlist> </para> + <warning> + <para>JBoss Portal 2.6.2 is the last release to support JDK 1.4.</para> + </warning> </sect1> <sect1> <title>Supported Operating Systems</title> @@ -35,10 +38,13 @@ </sect1> <sect1> <title>JBoss Application Server</title> - <para>As of today JBoss Portal only works with JBoss Application Server.</para> - <para>JBoss AS 4.0.5.GA and JBoss AS 4.2.0.GA are supported.</para> + <para>JBoss Portal 2.6.2 is tested with JBoss AS 4.0.5, JBoss AS 4.2.1 and JBoss EAP 4.2. It is + highly recommended to use JBoss Portal 2.6.2 with JBoss Enterprise Application Platform 4.2 for + all who have access to it through the support portal and JBoss AS 4.2.1 for everybody else.</para> <warning> - <para> Versions before 4.0.4 of JBoss Application Server are not supported with this version of JBoss Portal.</para> + <para> Versions before 4.0.4 of JBoss Application Server are not supported with this version of JBoss Portal. + And JBoss AS 4.0.5 will not be supported in newer release of JBoss Portal. + </para> </warning> </sect1> <sect1 id="supportedversions-db">

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8196 - modules/identity/branches.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-09-07 07:11:16 -0400 (Fri, 07 Sep 2007) New Revision: 8196 Added: modules/identity/branches/proto/ Log: make a place to prototype new identity stuff Copied: modules/identity/branches/proto (from rev 8195, modules/identity/trunk)

18 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8195 - trunk/cms/src/main/org/jboss/portal/cms/hibernate/state.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-09-06 18:26:05 -0400 (Thu, 06 Sep 2007) New Revision: 8195 Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java Log: JBPORTAL-1626,JBPORTAL-1669 - FIrst access to a CMS HTML file through /content/ results in a NPE, Make the JBossCachePersistenceManager compatible with JBoss Cache 1.4.1 Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-09-06 22:07:41 UTC (rev 8194) +++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-09-06 22:26:05 UTC (rev 8195) @@ -470,17 +470,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof WSPNode) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -489,17 +480,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof VersionNode) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } return exists; } @@ -764,17 +746,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { - if (o instanceof WSPProp) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(propId), propId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -783,17 +756,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { - if (o instanceof VersionProp) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(propId), propId, - new Boolean(false)); - } + exists = true; + } } return exists; } @@ -1088,17 +1052,8 @@ + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof WSPRefs) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -1107,17 +1062,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof VersionRefs) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } return exists; }

18 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2007