Author: emuckenhuber Date: 2007-09-21 09:14:29 -0400 (Fri, 21 Sep 2007) New Revision: 8404 Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.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/ui/admin/UserAdministrationBean.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 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/resetPassword.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml Log: - disabled e-mail text logging - cleanup Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-21 13:14:29 UTC (rev 8404) @@ -193,7 +193,7 @@ // Generating message this.generateEmailText(); - log.debug(this.emailText); + // log.debug(this.emailText); // Sending mail this.getMailModule().send(emailFrom, to , subject, emailText); 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-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-21 13:14:29 UTC (rev 8404) @@ -28,8 +28,6 @@ import java.util.Locale; import java.util.Map; -import javax.naming.NamingException; - import org.jboss.logging.Logger; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.core.identity.services.IdentityConstants; @@ -445,7 +443,13 @@ GraphSession graphSession = jbpmContext.getGraphSession(); ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName); if ( processDefinition != null ) + { processInstances = graphSession.findProcessInstances(processDefinition.getId()); + } + else + { + throw new CoreIdentityConfigurationException("Could not find process definition for process name: "+ processName); + } } return processInstances; } Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-21 13:14:29 UTC (rev 8404) @@ -30,7 +30,6 @@ import java.util.ResourceBundle; import javax.faces.application.FacesMessage; -import javax.faces.application.FacesMessage.Severity; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.model.DataModel; Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletVariableResolver.java 2007-09-21 13:14:29 UTC (rev 8404) @@ -31,7 +31,6 @@ import javax.faces.el.EvaluationException; import javax.faces.el.VariableResolver; import javax.portlet.PortletRequest; -import javax.portlet.PortletSession; import org.jboss.logging.Logger; Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-21 13:14:29 UTC (rev 8404) @@ -41,7 +41,7 @@ IDENTITY_REGISTER_REQUIRED_INFORMATION=indicates a required field. IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data? -IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password +IDENTITY_LOST_PASSWORD_DESCRIPTION=Please enter your username to reset your password. IDENTITY_LOST_PASSWORD_ERROR=Failed to reset password. IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=You will receive an e-mail with your new password. IDENTITY_LOST_PASSWORD_STATUS_404=No account found. @@ -118,7 +118,8 @@ IDENTITY_MANAGEMENT_DISABLE=Disable IDENTITY_MANAGEMENT_ENABLE=Enable IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password -IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email. +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent to his e-mail address. IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assign roles IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users @@ -164,7 +165,7 @@ 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. +IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken. IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating username. IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match. IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password. 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-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-21 13:14:29 UTC (rev 8404) @@ -76,10 +76,6 @@ </ui-component> <ui-component name="interests"> <property-ref>portal.user.interests</property-ref> - <values> - <value key="test">testing</value> - <value key="test2">testing2</value> - </values> </ui-component> <ui-component name="icq"> <property-ref>portal.user.im.icq</property-ref> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate.tpl 2007-09-21 13:14:29 UTC (rev 8404) @@ -1,11 +1,9 @@ Hello, -you tried to change your email address on ${emailDomain} +you tried to change your e-mail address on ${emailDomain} - Follow this link to verify your new address: ${activationLink} - Best regards, ${emailDomain} 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-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-21 13:14:29 UTC (rev 8404) @@ -61,7 +61,9 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> </f:facet> - <h:outputText value="#{user.email}"/> + <a href="mailto:#{user.email}"> + <h:outputText value="#{user.email}"/> + </a> </h:column> <h:column> <f:facet name="header"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-21 13:14:29 UTC (rev 8404) @@ -29,7 +29,7 @@ <div class="portlet-msg-body"> <h3> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " /> - <h:outputText value="#{lostpasswordmgr.username}" /> + <h:outputText value="#{lostpasswordmgr.username}" />. </h3> <p class="portlet-msg-alert"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /> Modified: 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 2007-09-21 12:50:09 UTC (rev 8403) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-21 13:14:29 UTC (rev 8404) @@ -87,4 +87,5 @@ </c:otherwise> </c:choose> </h:panelGrid> +<br/> </div> \ No newline at end of file