Author: thomas.heute(a)jboss.com Date: 2007-09-11 07:21:05 -0400 (Tue, 11 Sep 2007) New Revision: 8220 Added: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties Removed: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties trunk/core-identity/src/resources/resource-bundles/ Modified: trunk/core-identity/build.xml trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.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/actions/LostPasswordAction.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/validators/CaptchaValidator.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 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/userTemplate.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/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/viewProfile.xhtml 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/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 Log: Moved resource bundles Modified: trunk/core-identity/build.xml =================================================================== --- trunk/core-identity/build.xml 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/build.xml 2007-09-11 11:21:05 UTC (rev 8220) @@ -200,7 +200,6 @@ <!-- portal-core-identity-services-lib.jar --> <jar jarfile="${build.lib}/portal-core-identity-services-lib.jar"> <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**" /> - <fileset dir="${build.resources}/resource-bundles/" /> </jar> <!-- portal-identity.war --> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityMailServiceImpl.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -169,7 +169,7 @@ this.locale = locale; this.mailData.put(IdentityConstants.EMAIL_DOMAIN, emailDomain); - ResourceBundle bundle = ResourceBundle.getBundle("Identity", locale); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", locale); String subject = null; String to = (String) mailData.get(IdentityConstants.EMAIL_TO); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -132,7 +132,7 @@ String registrationStatus = "failed"; FacesContext ctx = FacesContext.getCurrentInstance(); String adminSubscription = (String) ev.getComponent().getId(); - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); if (uiUser.getUsername() != null && uiUser.getPassword() != null) { try 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -214,13 +214,13 @@ } catch (RuntimeException e) { - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); log.error("",e); } catch (IdentityException e) { - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR"))); log.error("",e); } @@ -242,7 +242,7 @@ public String changePassword() { FacesContext ctx = FacesContext.getCurrentInstance(); - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); if (this.password != null) { try @@ -277,7 +277,7 @@ public String changeEmail() { FacesContext ctx = FacesContext.getCurrentInstance(); - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); if (this.email != null) { try Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -118,7 +118,7 @@ public String doomed() { User user = null; - ResourceBundle bundle = ResourceBundle.getBundle("Identity", FacesContext.getCurrentInstance().getViewRoot() + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot() .getLocale()); // Used by the user management to reset passwords 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/PortletDelegatingPropertyResolver.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -176,7 +176,7 @@ { String key = (String) i.next(); String value = (String) uiComponent.getValues().get(key); - ResourceBundle bundle = ResourceBundle.getBundle("Identity", ctx.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale()); try { value = bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + key.toUpperCase()); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -42,7 +42,7 @@ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { Boolean tester = Boolean.FALSE; - ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale()); PortletRequest portletRequest = (PortletRequest) context.getExternalContext().getRequest(); String captchaId = portletRequest.getRequestedSessionId(); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -52,7 +52,7 @@ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { - ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale()); PortletContext portletContext = (PortletContext) context.getExternalContext().getContext(); userModule = (UserModule) portletContext.getAttribute("UserModule"); this.currentUser = context.getExternalContext().getRemoteUser(); Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -41,7 +41,7 @@ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { - ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("core.bundles.Identity", context.getViewRoot().getLocale()); if (value != null) { if (!(value instanceof String)) Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -39,7 +39,7 @@ { public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { - ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale()); UIComponent passwordComponent = component.findComponent("password"); if (passwordComponent != null && passwordComponent instanceof HtmlInputSecret) { Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2007-09-11 11:21:05 UTC (rev 8220) @@ -54,7 +54,7 @@ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { String username = (String) value; - ResourceBundle bundle = ResourceBundle.getBundle("Identity", context.getViewRoot().getLocale()); + ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale()); PortletContext portletContext = (PortletContext) context.getExternalContext().getContext(); userModule = (UserModule) portletContext.getAttribute("UserModule"); registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService"); Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles) Deleted: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:21:05 UTC (rev 8220) @@ -1,154 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -IDENTITY_WELCOME=Welcome -IDENTITY_REGISTER=Register -IDENTITY_LOST_PASSWORD=Lost Password -IDENTITY_NOT_LOGGED_IN=You are currently not logged in. -IDENTITY_CREATE_ACCOUNT=You can create an account. -IDENTITY_BUTTON_SUBMIT=Submit -IDENTITY_BUTTON_EDIT=Edit -IDENTITY_BUTTON_CANCEL=Cancel - -IDENTITY_REGISTER_TITLE=Basic user information -IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation -IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password -IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now. -IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration. - -IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data? -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. - - -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 - -IDENTITY_USERNAME=Username -IDENTITY_PASSWORD=Password -IDENTITY_EMAIL=E-Mail -IDENTITY_GIVENNAME=Firstname -IDENTITY_FAMILYNAME=Lastname -IDENTITY_SKYPE=Skype ID -IDENTITY_LOCATION=Location -IDENTITY_OCCUPATION=Occupation -IDENTITY_EXTRA=Extra -IDENTITY_SIGNATURE=Signature -IDENTITY_INTERESTS=Interests -IDENTITY_LOCALE=Locale -IDENTITY_ICQ=Icq ID -IDENTITY_AIM=Aim ID -IDENTITY_MSNM= MSN messenger ID -IDENTITY_YIM=Yahoo ID -IDENTITY_XMMP=Xmmp ID -IDENTITY_HOMEPAGE=Homepage -IDENTITY_TIMEZONE=Time zone offset -IDENTITY_THEME=Theme -IDENTITY_SECURITY_QUESTION=Security Question -IDENTITY_SECURITY_ANSWER=Security Answer -IDENTITY_LAST_LOGIN=Last login -IDENTITY_REIGSTRATION_DATE=Registration Date -IDENTITY_ENABLED=Enabled - -IDENTITY_CATEGORY_GENERAL=General Preferences -IDENTITY_CATEGORY_PERSONAL=Personal Information -IDENTITY_CATEGORY_INSTANT=Instant Message Identities -IDENTITY_CATEGORY_ADDITIONAL=Additional Information - -IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature of 255 characters max) -IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 characters max.) - -IDENTITY_MANAGEMENT_ACTION=Actions -IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Edit user -IDENTITY_MANAGEMENT_ACTION_ROLES=Roles -IDENTITY_MANAGEMENT_ACTION_DELETE=Delete -IDENTITY_MANAGEMENT_USER_MANAGEMENT=User Management -IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management -IDENTITY_MANAGEMENT_SEARCH_USER=Search users -IDENTITY_MANAGEMENT_CREATE_USER=Create new user account -IDENTITY_MANAGEMENT_ROLE=Role -IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name -IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members -IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles -IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role -IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role -IDENTITY_MANAGEMENT_CREATE_ROLE=Create role -IDENTITY_MANAGEMENT_DISABLE=Disable -IDENTITY_MANAGEMENT_ENABLE=Enable -IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password -IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user: -IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email. -IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user: -IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users -IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users - -IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations -IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id -IDENTITY_MANAGEMENT_PENDING_APPROVE=approve -IDENTITY_MANAGEMENT_PENDING_REJECT=reject - -IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha -IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object -IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription - -IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password -IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration -IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address - -IDENTITY_VERIFICATION_RETURN=Return to portal -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 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 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_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. -IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address. -IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password -IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect - -# Example usage for dynamic values -#IDENTIY_DYNAMIC_VALUE_TEST=test label -#IDENTIY_DYNAMIC_VALUE_TEST2=test label2 \ No newline at end of file Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties) =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties (rev 0) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-11 11:21:05 UTC (rev 8220) @@ -0,0 +1,154 @@ +################################################################################ +# 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. # +################################################################################ + +IDENTITY_WELCOME=Welcome +IDENTITY_REGISTER=Register +IDENTITY_LOST_PASSWORD=Lost Password +IDENTITY_NOT_LOGGED_IN=You are currently not logged in. +IDENTITY_CREATE_ACCOUNT=You can create an account. +IDENTITY_BUTTON_SUBMIT=Submit +IDENTITY_BUTTON_EDIT=Edit +IDENTITY_BUTTON_CANCEL=Cancel + +IDENTITY_REGISTER_TITLE=Basic user information +IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation +IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirm Password +IDENTITY_REGISTER_SUCCESS_TITLE=Your account has been successfully created. You may want to login now. +IDENTITY_REGISTER_PENDING_TITLE=An e-mail has been sent to your e-mail address to verify your registration. + +IDENTITY_LOST_PASSWORD_TITLE=Forgot your login data? +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. + + +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 + +IDENTITY_USERNAME=Username +IDENTITY_PASSWORD=Password +IDENTITY_EMAIL=E-Mail +IDENTITY_GIVENNAME=Firstname +IDENTITY_FAMILYNAME=Lastname +IDENTITY_SKYPE=Skype ID +IDENTITY_LOCATION=Location +IDENTITY_OCCUPATION=Occupation +IDENTITY_EXTRA=Extra +IDENTITY_SIGNATURE=Signature +IDENTITY_INTERESTS=Interests +IDENTITY_LOCALE=Locale +IDENTITY_ICQ=Icq ID +IDENTITY_AIM=Aim ID +IDENTITY_MSNM= MSN messenger ID +IDENTITY_YIM=Yahoo ID +IDENTITY_XMMP=Xmmp ID +IDENTITY_HOMEPAGE=Homepage +IDENTITY_TIMEZONE=Time zone offset +IDENTITY_THEME=Theme +IDENTITY_SECURITY_QUESTION=Security Question +IDENTITY_SECURITY_ANSWER=Security Answer +IDENTITY_LAST_LOGIN=Last login +IDENTITY_REIGSTRATION_DATE=Registration Date +IDENTITY_ENABLED=Enabled + +IDENTITY_CATEGORY_GENERAL=General Preferences +IDENTITY_CATEGORY_PERSONAL=Personal Information +IDENTITY_CATEGORY_INSTANT=Instant Message Identities +IDENTITY_CATEGORY_ADDITIONAL=Additional Information + +IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature of 255 characters max) +IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 characters max.) + +IDENTITY_MANAGEMENT_ACTION=Actions +IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Edit user +IDENTITY_MANAGEMENT_ACTION_ROLES=Roles +IDENTITY_MANAGEMENT_ACTION_DELETE=Delete +IDENTITY_MANAGEMENT_USER_MANAGEMENT=User Management +IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Role Management +IDENTITY_MANAGEMENT_SEARCH_USER=Search users +IDENTITY_MANAGEMENT_CREATE_USER=Create new user account +IDENTITY_MANAGEMENT_ROLE=Role +IDENTITY_MANAGEMENT_ROLE_DISPLAY=Display name +IDENTITY_MANAGEMENT_ROLE_MEMBERS=Members +IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Assigned roles +IDENTITY_MANAGEMENT_CREATE_ROLE=Create new role +IDENTITY_MANAGEMENT_EDIT_ROLE=Edit role +IDENTITY_MANAGEMENT_CREATE_ROLE=Create role +IDENTITY_MANAGEMENT_DISABLE=Disable +IDENTITY_MANAGEMENT_ENABLE=Enable +IDENTITY_MANAGEMENT_RESET_PASSWORD=Reset password +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Reset password for user: +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=The user will get a random password sent by email. +IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user: +IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users +IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users + +IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations +IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id +IDENTITY_MANAGEMENT_PENDING_APPROVE=approve +IDENTITY_MANAGEMENT_PENDING_REJECT=reject + +IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha +IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object +IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription + +IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password +IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration +IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address + +IDENTITY_VERIFICATION_RETURN=Return to portal +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 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 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_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. +IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address. +IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Invalid password +IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect + +# Example usage for dynamic values +#IDENTIY_DYNAMIC_VALUE_TEST=test label +#IDENTIY_DYNAMIC_VALUE_TEST2=test label2 \ No newline at end of file Deleted: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:21:05 UTC (rev 8220) @@ -1,25 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -IDENTITY_WELCOME=Willkommen -IDENTITY_VIEW_PROFILE_TITLE=Profilansicht \ No newline at end of file Copied: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties (from rev 8219, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties) =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties (rev 0) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_de.properties 2007-09-11 11:21:05 UTC (rev 8220) @@ -0,0 +1,25 @@ +################################################################################ +# 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. # +################################################################################ + +IDENTITY_WELCOME=Willkommen +IDENTITY_VIEW_PROFILE_TITLE=Profilansicht \ No newline at end of file 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -5,7 +5,7 @@ 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" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -5,7 +5,7 @@ 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" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> Modified: 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 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> Modified: 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 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml"> Modified: 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 2007-09-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <h:form> <ul class="topnav"> 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-11 11:12:01 UTC (rev 8219) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/validationStatus/jbp_status.xhtml 2007-09-11 11:21:05 UTC (rev 8220) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> - <f:loadBundle var="bundle" basename="Identity" /> + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> <div style="height: 200px; padding-top: 30px; vertical-align:top; text-align: center;">