You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2008/02/07 23:09:54 UTC
svn commit: r619663 - in
/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src:
java/org/apache/jetspeed/portlets/registration/resources/
java/org/apache/jetspeed/portlets/security/users/
java/org/apache/jetspeed/portlets/se...
Author: taylor
Date: Thu Feb 7 14:09:54 2008
New Revision: 619663
URL: http://svn.apache.org/viewvc?rev=619663&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-853 (Filter Portlet Selector by one or more roles)
also cleanup to User Registration localization (english, default only)
also pickup fix to UserDetails for delete error
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources.properties
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources_en.properties
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources.properties?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources.properties (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources.properties Thu Feb 7 14:09:54 2008
@@ -30,37 +30,37 @@
# stuff for the template
page.welcome=Welcome. Please fill out the following form to become a registered user.
-page.username=username:
-page.email.address=email address:
-page.password=password:
-page.passwordVerify=password (verify):
+page.username=Username
+page.email.address=Email Address
+page.password=Password
+page.passwordVerify=Password (verify)
page.button=Register Me
page.optional=<font color="blue" size="-2">(optional)</font>
# special added fields
-page.user.name= username
+page.user.name= Username
# for labeling all the PLT attribute fields
-page.user.bdate= birthday
-page.user.gender= gender
-page.user.employer= employer
-page.user.department= department
-page.user.jobtitle= job title
-page.user.name.prefix= title
-page.user.name.given= given name
-page.user.name.family= family name
-page.user.name.middle= middle name
-page.user.name.suffix= suffix
-page.user.name.nickName= nick name
-page.user.home-info.postal.name= postal name
-page.user.home-info.postal.street= street address
-page.user.home-info.postal.city= city
-page.user.home-info.postal.stateprov= state
-page.user.home-info.postal.postalcode= zip
-page.user.home-info.postal.country= country
-page.user.home-info.postal.organization= organization
-page.user.home-info.telecom.telephone.intcode= home international code
+page.user.bdate= Birthday
+page.user.gender= Gender
+page.user.employer= Employer
+page.user.department= Department
+page.user.jobtitle= Job Title
+page.user.name.prefix= Title
+page.user.name.given= First Name
+page.user.name.family= Last Name
+page.user.name.middle= Middle Name
+page.user.name.suffix= Suffix
+page.user.name.nickName= Nick Name
+page.user.home-info.postal.name= Postal Name
+page.user.home-info.postal.street= Street Address
+page.user.home-info.postal.city= City
+page.user.home-info.postal.stateprov= State
+page.user.home-info.postal.postalcode= Zip
+page.user.home-info.postal.country= Country
+page.user.home-info.postal.organization= Organization
+page.user.home-info.telecom.telephone.intcode= Home international code
page.user.home-info.telecom.telephone.loccode= home phone area code
page.user.home-info.telecom.telephone.number= home phone number
page.user.home-info.telecom.telephone.ext= home phone extension
@@ -82,16 +82,16 @@
page.user.home-info.telecom.pager.comment= home pager comment
page.user.home-info.online.email= home email
page.user.home-info.online.uri= home URL
-page.user.business-info.postal.name= business postal name
-page.user.business-info.postal.street= business street address
-page.user.business-info.postal.city= business city
-page.user.business-info.postal.stateprov= business state
-page.user.business-info.postal.postalcode= business zip
-page.user.business-info.postal.country= business country
-page.user.business-info.postal.organization= business name
+page.user.business-info.postal.name= Business Name
+page.user.business-info.postal.street= Business Street Address
+page.user.business-info.postal.city= Business City
+page.user.business-info.postal.stateprov= Business State
+page.user.business-info.postal.postalcode= Business Zip
+page.user.business-info.postal.country= Business Country
+page.user.business-info.postal.organization= Business Name
page.user.business-info.telecom.telephone.intcode= business telephone international code
page.user.business-info.telecom.telephone.loccode= business telephone area code
-page.user.business-info.telecom.telephone.number= business telephone number
+page.user.business-info.telecom.telephone.number= Business Telephone
page.user.business-info.telecom.telephone.ext= business telephone extension
page.user.business-info.telecom.telephone.comment= business telephone comment
page.user.business-info.telecom.fax.intcode= business fax international code
@@ -109,8 +109,8 @@
page.user.business-info.telecom.pager.number= business pager number
page.user.business-info.telecom.pager.ext= business pager extension
page.user.business-info.telecom.pager.comment= business page comment
-page.user.business-info.online.email= business email
-page.user.business-info.online.uri= business url
+page.user.business-info.online.email= Business Email
+page.user.business-info.online.uri= Business Website
# error invalid formats
@@ -118,149 +118,149 @@
error.invalid-format.user.name=username has an invalid format
error.invalid-format.user.business-info.online.email= email has an invalid format
-error.invalid-format.page.user.bdate= birthday field has an incorrect format
-error.invalid-format.page.user.gender= gender field has an incorrect format
-error.invalid-format.page.user.employer= employer field has an incorrect format
-error.invalid-format.page.user.department= department field has an incorrect format
-error.invalid-format.page.user.jobtitle= job title field has an incorrect format
-error.invalid-format.page.user.name.prefix= title field has an incorrect format
-error.invalid-format.page.user.name.given= given name field has an incorrect format
-error.invalid-format.page.user.name.family= family name field has an incorrect format
-error.invalid-format.page.user.name.middle= middle name field has an incorrect format
-error.invalid-format.page.user.name.suffix= suffix field has an incorrect format
-error.invalid-format.page.user.name.nickName= nick name field has an incorrect format
-error.invalid-format.page.user.home-info.postal.name= postal name field has an incorrect format
-error.invalid-format.page.user.home-info.postal.street= street address field has an incorrect format
-error.invalid-format.page.user.home-info.postal.city= city field has an incorrect format
-error.invalid-format.page.user.home-info.postal.stateprov= state field has an incorrect format
-error.invalid-format.page.user.home-info.postal.postalcode= zip field has an incorrect format
-error.invalid-format.page.user.home-info.postal.country= country field has an incorrect format
-error.invalid-format.page.user.home-info.postal.organization= organization field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.intcode= home international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.loccode= home phone area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.number= home phone number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.ext= home phone extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.comment= home phone comment field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.intcode= home fax international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.loccode= home fax area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.number= home fax number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.ext= home fax extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.comment= home fax comments field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.intcode= home mobile international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.loccode= home mobile area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.number= home mobile number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.ext= home mobile extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.comment= home mobile comments field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.intcode= home pager international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.loccode= home pager area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.number= home pager number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.ext= home pager extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.comment= home pager comment field has an incorrect format
-error.invalid-format.page.user.home-info.online.email= home email field has an incorrect format
-error.invalid-format.page.user.home-info.online.uri= home URL field has an incorrect format
-error.invalid-format.page.user.business-info.postal.name= business postal name field has an incorrect format
-error.invalid-format.page.user.business-info.postal.street= business street address field has an incorrect format
-error.invalid-format.page.user.business-info.postal.city= business city field has an incorrect format
-error.invalid-format.page.user.business-info.postal.stateprov= business state field has an incorrect format
-error.invalid-format.page.user.business-info.postal.postalcode= business zip field has an incorrect format
-error.invalid-format.page.user.business-info.postal.country= business country field has an incorrect format
-error.invalid-format.page.user.business-info.postal.organization= business name field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.intcode= business telephone international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.loccode= business telephone area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.number= business telephone number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.ext= business telephone extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.comment= business telephone comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.intcode= business fax international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.loccode= business fax area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.number= business fax number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.ext= business fax extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.comment= business fax comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.intcode= business mobile international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.loccode= business mobile area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.number= business mobile number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.ext= business mobile extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.comment= business mobile comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.intcode= business pager international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.loccode= business pager area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.number= business pager number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.ext= business pager extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.comment= business page comment field has an incorrect format
-error.invalid-format.page.user.business-info.online.email= business email field has an incorrect format
-error.invalid-format.page.user.business-info.online.uri= business url field has an incorrect format
+error.invalid-format.user.bdate= birthday field has an incorrect format
+error.invalid-format.user.gender= gender field has an incorrect format
+error.invalid-format.user.employer= employer field has an incorrect format
+error.invalid-format.user.department= department field has an incorrect format
+error.invalid-format.user.jobtitle= job title field has an incorrect format
+error.invalid-format.user.name.prefix= title field has an incorrect format
+error.invalid-format.user.name.given= given name field has an incorrect format
+error.invalid-format.user.name.family= family name field has an incorrect format
+error.invalid-format.user.name.middle= middle name field has an incorrect format
+error.invalid-format.user.name.suffix= suffix field has an incorrect format
+error.invalid-format.user.name.nickName= nick name field has an incorrect format
+error.invalid-format.user.home-info.postal.name= postal name field has an incorrect format
+error.invalid-format.user.home-info.postal.street= street address field has an incorrect format
+error.invalid-format.user.home-info.postal.city= city field has an incorrect format
+error.invalid-format.user.home-info.postal.stateprov= state field has an incorrect format
+error.invalid-format.user.home-info.postal.postalcode= zip field has an incorrect format
+error.invalid-format.user.home-info.postal.country= country field has an incorrect format
+error.invalid-format.user.home-info.postal.organization= organization field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.intcode= home international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.loccode= home phone area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.number= home phone number field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.ext= home phone extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.comment= home phone comment field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.intcode= home fax international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.loccode= home fax area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.number= home fax number field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.ext= home fax extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.comment= home fax comments field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.intcode= home mobile international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.loccode= home mobile area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.number= home mobile number field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.ext= home mobile extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.comment= home mobile comments field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.intcode= home pager international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.loccode= home pager area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.number= home pager number field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.ext= home pager extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.comment= home pager comment field has an incorrect format
+error.invalid-format.user.home-info.online.email= home email field has an incorrect format
+error.invalid-format.user.home-info.online.uri= home URL field has an incorrect format
+error.invalid-format.user.business-info.postal.name= business postal name field has an incorrect format
+error.invalid-format.user.business-info.postal.street= business street address field has an incorrect format
+error.invalid-format.user.business-info.postal.city= business city field has an incorrect format
+error.invalid-format.user.business-info.postal.stateprov= business state field has an incorrect format
+error.invalid-format.user.business-info.postal.postalcode= business zip field has an incorrect format
+error.invalid-format.user.business-info.postal.country= business country field has an incorrect format
+error.invalid-format.user.business-info.postal.organization= business name field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.intcode= business telephone international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.loccode= business telephone area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.number= business telephone number field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.ext= business telephone extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.comment= business telephone comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.intcode= business fax international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.loccode= business fax area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.number= business fax number field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.ext= business fax extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.comment= business fax comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.intcode= business mobile international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.loccode= business mobile area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.number= business mobile number field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.ext= business mobile extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.comment= business mobile comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.intcode= business pager international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.loccode= business pager area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.number= business pager number field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.ext= business pager extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.comment= business page comment field has an incorrect format
+error.invalid-format.user.business-info.online.email= business email field has an incorrect format
+error.invalid-format.user.business-info.online.uri= business url field has an incorrect format
# error lacking
error.lacking.verifyPassword= the verify password field is required
error.lacking.user.name=username is a required field
error.lacking.user.business-info.online.email= email is a required field
-error.lacking.page.user.bdate= birthday is a required field
-error.lacking.page.user.gender= gender is a required field
-error.lacking.page.user.employer= employer is a required field
-error.lacking.page.user.department= department is a required field
-error.lacking.page.user.jobtitle= job title is a required field
-error.lacking.page.user.name.prefix= title is a required field
-error.lacking.page.user.name.given= given name is a required field
-error.lacking.page.user.name.family= family name is a required field
-error.lacking.page.user.name.middle= middle name is a required field
-error.lacking.page.user.name.suffix= suffix is a required field
-error.lacking.page.user.name.nickName= nick name is a required field
-error.lacking.page.user.home-info.postal.name= postal name is a required field
-error.lacking.page.user.home-info.postal.street= street address is a required field
-error.lacking.page.user.home-info.postal.city= city is a required field
-error.lacking.page.user.home-info.postal.stateprov= state is a required field
-error.lacking.page.user.home-info.postal.postalcode= zip is a required field
-error.lacking.page.user.home-info.postal.country= country is a required field
-error.lacking.page.user.home-info.postal.organization= organization is a required field
-error.lacking.page.user.home-info.telecom.telephone.intcode= home international code is a required field
-error.lacking.page.user.home-info.telecom.telephone.loccode= home phone area code is a required field
-error.lacking.page.user.home-info.telecom.telephone.number= home phone number is a required field
-error.lacking.page.user.home-info.telecom.telephone.ext= home phone extension is a required field
-error.lacking.page.user.home-info.telecom.telephone.comment= home phone comment is a required field
-error.lacking.page.user.home-info.telecom.fax.intcode= home fax international code is a required field
-error.lacking.page.user.home-info.telecom.fax.loccode= home fax area code is a required field
-error.lacking.page.user.home-info.telecom.fax.number= home fax number is a required field
-error.lacking.page.user.home-info.telecom.fax.ext= home fax extension is a required field
-error.lacking.page.user.home-info.telecom.fax.comment= home fax comments is a required field
-error.lacking.page.user.home-info.telecom.mobile.intcode= home mobile international coe is a required field
-error.lacking.page.user.home-info.telecom.mobile.loccode= home mobile area code is a required field
-error.lacking.page.user.home-info.telecom.mobile.number= home mobile number is a required field
-error.lacking.page.user.home-info.telecom.mobile.ext= home mobile extension is a required field
-error.lacking.page.user.home-info.telecom.mobile.comment= home mobile comments is a required field
-error.lacking.page.user.home-info.telecom.pager.intcode= home pager international code is a required field
-error.lacking.page.user.home-info.telecom.pager.loccode= home pager area code is a required field
-error.lacking.page.user.home-info.telecom.pager.number= home pager number is a required field
-error.lacking.page.user.home-info.telecom.pager.ext= home pager extension is a required field
-error.lacking.page.user.home-info.telecom.pager.comment= home pager comment is a required field
-error.lacking.page.user.home-info.online.email= home email is a required field
-error.lacking.page.user.home-info.online.uri= home URL is a required field
-error.lacking.page.user.business-info.postal.name= business postal name is a required field
-error.lacking.page.user.business-info.postal.street= business street address is a required field
-error.lacking.page.user.business-info.postal.city= business city is a required field
-error.lacking.page.user.business-info.postal.stateprov= business state is a required field
-error.lacking.page.user.business-info.postal.postalcode= business zip is a required field
-error.lacking.page.user.business-info.postal.country= business country is a required field
-error.lacking.page.user.business-info.postal.organization= business name is a required field
-error.lacking.page.user.business-info.telecom.telephone.intcode= business telephone international code is a required field
-error.lacking.page.user.business-info.telecom.telephone.loccode= business telephone area code is a required field
-error.lacking.page.user.business-info.telecom.telephone.number= business telephone number is a required field
-error.lacking.page.user.business-info.telecom.telephone.ext= business telephone extension is a required field
-error.lacking.page.user.business-info.telecom.telephone.comment= business telephone comment is a required field
-error.lacking.page.user.business-info.telecom.fax.intcode= business fax international code is a required field
-error.lacking.page.user.business-info.telecom.fax.loccode= business fax area code is a required field
-error.lacking.page.user.business-info.telecom.fax.number= business fax number is a required field
-error.lacking.page.user.business-info.telecom.fax.ext= business fax extension is a required field
-error.lacking.page.user.business-info.telecom.fax.comment= business fax comment is a required field
-error.lacking.page.user.business-info.telecom.mobile.intcode= business mobile international code is a required field
-error.lacking.page.user.business-info.telecom.mobile.loccode= business mobile area code is a required field
-error.lacking.page.user.business-info.telecom.mobile.number= business mobile number is a required field
-error.lacking.page.user.business-info.telecom.mobile.ext= business mobile extension is a required field
-error.lacking.page.user.business-info.telecom.mobile.comment= business mobile comment is a required field
-error.lacking.page.user.business-info.telecom.pager.intcode= business pager international code is a required field
-error.lacking.page.user.business-info.telecom.pager.loccode= business pager area code is a required field
-error.lacking.page.user.business-info.telecom.pager.number= business pager number is a required field
-error.lacking.page.user.business-info.telecom.pager.ext= business pager extension is a required field
-error.lacking.page.user.business-info.telecom.pager.comment= business page comment is a required field
-error.lacking.page.user.business-info.online.email= business email is a required field
-error.lacking.page.user.business-info.online.uri= business url is a required field
+error.lacking.user.bdate= birthday is a required field
+error.lacking.user.gender= gender is a required field
+error.lacking.user.employer= employer is a required field
+error.lacking.user.department= department is a required field
+error.lacking.user.jobtitle= job title is a required field
+error.lacking.user.name.prefix= title is a required field
+error.lacking.user.name.given= given name is a required field
+error.lacking.user.name.family= family name is a required field
+error.lacking.user.name.middle= middle name is a required field
+error.lacking.user.name.suffix= suffix is a required field
+error.lacking.user.name.nickName= nick name is a required field
+error.lacking.user.home-info.postal.name= postal name is a required field
+error.lacking.user.home-info.postal.street= street address is a required field
+error.lacking.user.home-info.postal.city= city is a required field
+error.lacking.user.home-info.postal.stateprov= state is a required field
+error.lacking.user.home-info.postal.postalcode= zip is a required field
+error.lacking.user.home-info.postal.country= country is a required field
+error.lacking.user.home-info.postal.organization= organization is a required field
+error.lacking.user.home-info.telecom.telephone.intcode= home international code is a required field
+error.lacking.user.home-info.telecom.telephone.loccode= home phone area code is a required field
+error.lacking.user.home-info.telecom.telephone.number= home phone number is a required field
+error.lacking.user.home-info.telecom.telephone.ext= home phone extension is a required field
+error.lacking.user.home-info.telecom.telephone.comment= home phone comment is a required field
+error.lacking.user.home-info.telecom.fax.intcode= home fax international code is a required field
+error.lacking.user.home-info.telecom.fax.loccode= home fax area code is a required field
+error.lacking.user.home-info.telecom.fax.number= home fax number is a required field
+error.lacking.user.home-info.telecom.fax.ext= home fax extension is a required field
+error.lacking.user.home-info.telecom.fax.comment= home fax comments is a required field
+error.lacking.user.home-info.telecom.mobile.intcode= home mobile international coe is a required field
+error.lacking.user.home-info.telecom.mobile.loccode= home mobile area code is a required field
+error.lacking.user.home-info.telecom.mobile.number= home mobile number is a required field
+error.lacking.user.home-info.telecom.mobile.ext= home mobile extension is a required field
+error.lacking.user.home-info.telecom.mobile.comment= home mobile comments is a required field
+error.lacking.user.home-info.telecom.pager.intcode= home pager international code is a required field
+error.lacking.user.home-info.telecom.pager.loccode= home pager area code is a required field
+error.lacking.user.home-info.telecom.pager.number= home pager number is a required field
+error.lacking.user.home-info.telecom.pager.ext= home pager extension is a required field
+error.lacking.user.home-info.telecom.pager.comment= home pager comment is a required field
+error.lacking.user.home-info.online.email= home email is a required field
+error.lacking.user.home-info.online.uri= home URL is a required field
+error.lacking.user.business-info.postal.name= business postal name is a required field
+error.lacking.user.business-info.postal.street= business street address is a required field
+error.lacking.user.business-info.postal.city= business city is a required field
+error.lacking.user.business-info.postal.stateprov= business state is a required field
+error.lacking.user.business-info.postal.postalcode= business zip is a required field
+error.lacking.user.business-info.postal.country= business country is a required field
+error.lacking.user.business-info.postal.organization= business name is a required field
+error.lacking.user.business-info.telecom.telephone.intcode= business telephone international code is a required field
+error.lacking.user.business-info.telecom.telephone.loccode= business telephone area code is a required field
+error.lacking.user.business-info.telecom.telephone.number= business telephone number is a required field
+error.lacking.user.business-info.telecom.telephone.ext= business telephone extension is a required field
+error.lacking.user.business-info.telecom.telephone.comment= business telephone comment is a required field
+error.lacking.user.business-info.telecom.fax.intcode= business fax international code is a required field
+error.lacking.user.business-info.telecom.fax.loccode= business fax area code is a required field
+error.lacking.user.business-info.telecom.fax.number= business fax number is a required field
+error.lacking.user.business-info.telecom.fax.ext= business fax extension is a required field
+error.lacking.user.business-info.telecom.fax.comment= business fax comment is a required field
+error.lacking.user.business-info.telecom.mobile.intcode= business mobile international code is a required field
+error.lacking.user.business-info.telecom.mobile.loccode= business mobile area code is a required field
+error.lacking.user.business-info.telecom.mobile.number= business mobile number is a required field
+error.lacking.user.business-info.telecom.mobile.ext= business mobile extension is a required field
+error.lacking.user.business-info.telecom.mobile.comment= business mobile comment is a required field
+error.lacking.user.business-info.telecom.pager.intcode= business pager international code is a required field
+error.lacking.user.business-info.telecom.pager.loccode= business pager area code is a required field
+error.lacking.user.business-info.telecom.pager.number= business pager number is a required field
+error.lacking.user.business-info.telecom.pager.ext= business pager extension is a required field
+error.lacking.user.business-info.telecom.pager.comment= business page comment is a required field
+error.lacking.user.business-info.online.email= business email is a required field
+error.lacking.user.business-info.online.uri= business url is a required field
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources_en.properties?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources_en.properties (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/resources/UserRegistrationResources_en.properties Thu Feb 7 14:09:54 2008
@@ -3,264 +3,264 @@
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-email.subject.registration=Registration Confirmation
-
-error.lacking.first_name=You must enter a first name
-error.lacking.last_name=You must enter a last name
-error.lacking.username=You must enter a username
-error.email_invalid_format=Please enter a valid Email address.
-error.lacking.password=You must enter a password
-error.userid_already_exists=Requested User ID already exists. Please select another User Id.
-error.email_already_exists=The requested email address is already being used in the system. If you already have an account, consider using the forgotten password portlet to retreive your password.
-error.two_passwords_do_not_match=The two passwords do not match, please re-type them
-error.failed_to_add=Failed to add user.
-success.login_above=You have completed the user registration process. Please login above
-success.check_your_email= You have completed the user registration process. An email containing your username and password has been sent to you.
-
-# stuff for the template
-page.welcome=Welcome. Please fill out the following form to become a registered user.
-page.username=username:
-page.email.address=email address:
-page.password=password:
-page.passwordVerify=password (verify):
-page.button=Register Me
-
-page.optional=<font color="blue" size="-2">(optional)</font>
-
-# special added fields
-page.user.name= username
-
-# for labeling all the PLT attribute fields
-page.user.bdate= birthday
-page.user.gender= gender
-page.user.employer= employer
-page.user.department= department
-page.user.jobtitle= job title
-page.user.name.prefix= title
-page.user.name.given= given name
-page.user.name.family= family name
-page.user.name.middle= middle name
-page.user.name.suffix= suffix
-page.user.name.nickName= nick name
-page.user.home-info.postal.name= postal name
-page.user.home-info.postal.street= street address
-page.user.home-info.postal.city= city
-page.user.home-info.postal.stateprov= state
-page.user.home-info.postal.postalcode= zip
-page.user.home-info.postal.country= country
-page.user.home-info.postal.organization= organization
-page.user.home-info.telecom.telephone.intcode= home international code
-page.user.home-info.telecom.telephone.loccode= home phone area code
-page.user.home-info.telecom.telephone.number= home phone number
-page.user.home-info.telecom.telephone.ext= home phone extension
-page.user.home-info.telecom.telephone.comment= home phone comment
-page.user.home-info.telecom.fax.intcode= home fax international code
-page.user.home-info.telecom.fax.loccode= home fax area code
-page.user.home-info.telecom.fax.number= home fax number
-page.user.home-info.telecom.fax.ext= home fax extension
-page.user.home-info.telecom.fax.comment= home fax comments
-page.user.home-info.telecom.mobile.intcode= home mobile international coe
-page.user.home-info.telecom.mobile.loccode= home mobile area code
-page.user.home-info.telecom.mobile.number= home mobile number
-page.user.home-info.telecom.mobile.ext= home mobile extension
-page.user.home-info.telecom.mobile.comment= home mobile comments
-page.user.home-info.telecom.pager.intcode= home pager international code
-page.user.home-info.telecom.pager.loccode= home pager area code
-page.user.home-info.telecom.pager.number= home pager number
-page.user.home-info.telecom.pager.ext= home pager extension
-page.user.home-info.telecom.pager.comment= home pager comment
-page.user.home-info.online.email= home email
-page.user.home-info.online.uri= home URL
-page.user.business-info.postal.name= business postal name
-page.user.business-info.postal.street= business street address
-page.user.business-info.postal.city= business city
-page.user.business-info.postal.stateprov= business state
-page.user.business-info.postal.postalcode= business zip
-page.user.business-info.postal.country= business country
-page.user.business-info.postal.organization= business name
-page.user.business-info.telecom.telephone.intcode= business telephone international code
-page.user.business-info.telecom.telephone.loccode= business telephone area code
-page.user.business-info.telecom.telephone.number= business telephone number
-page.user.business-info.telecom.telephone.ext= business telephone extension
-page.user.business-info.telecom.telephone.comment= business telephone comment
-page.user.business-info.telecom.fax.intcode= business fax international code
-page.user.business-info.telecom.fax.loccode= business fax area code
-page.user.business-info.telecom.fax.number= business fax number
-page.user.business-info.telecom.fax.ext= business fax extension
-page.user.business-info.telecom.fax.comment= business fax comment
-page.user.business-info.telecom.mobile.intcode= business mobile international code
-page.user.business-info.telecom.mobile.loccode= business mobile area code
-page.user.business-info.telecom.mobile.number= business mobile number
-page.user.business-info.telecom.mobile.ext= business mobile extension
-page.user.business-info.telecom.mobile.comment= business mobile comment
-page.user.business-info.telecom.pager.intcode= business pager international code
-page.user.business-info.telecom.pager.loccode= business pager area code
-page.user.business-info.telecom.pager.number= business pager number
-page.user.business-info.telecom.pager.ext= business pager extension
-page.user.business-info.telecom.pager.comment= business page comment
-page.user.business-info.online.email= business email
-page.user.business-info.online.uri= business url
-
-# error invalid formats
-
-error.invalid-format.verifyPassword= the verify password field has an invalid format
-error.invalid-format.user.name=username has an invalid format
-error.invalid-format.user.business-info.online.email= email has an invalid format
-
-error.invalid-format.page.user.bdate= birthday field has an incorrect format
-error.invalid-format.page.user.gender= gender field has an incorrect format
-error.invalid-format.page.user.employer= employer field has an incorrect format
-error.invalid-format.page.user.department= department field has an incorrect format
-error.invalid-format.page.user.jobtitle= job title field has an incorrect format
-error.invalid-format.page.user.name.prefix= title field has an incorrect format
-error.invalid-format.page.user.name.given= given name field has an incorrect format
-error.invalid-format.page.user.name.family= family name field has an incorrect format
-error.invalid-format.page.user.name.middle= middle name field has an incorrect format
-error.invalid-format.page.user.name.suffix= suffix field has an incorrect format
-error.invalid-format.page.user.name.nickName= nick name field has an incorrect format
-error.invalid-format.page.user.home-info.postal.name= postal name field has an incorrect format
-error.invalid-format.page.user.home-info.postal.street= street address field has an incorrect format
-error.invalid-format.page.user.home-info.postal.city= city field has an incorrect format
-error.invalid-format.page.user.home-info.postal.stateprov= state field has an incorrect format
-error.invalid-format.page.user.home-info.postal.postalcode= zip field has an incorrect format
-error.invalid-format.page.user.home-info.postal.country= country field has an incorrect format
-error.invalid-format.page.user.home-info.postal.organization= organization field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.intcode= home international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.loccode= home phone area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.number= home phone number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.ext= home phone extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.telephone.comment= home phone comment field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.intcode= home fax international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.loccode= home fax area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.number= home fax number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.ext= home fax extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.fax.comment= home fax comments field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.intcode= home mobile international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.loccode= home mobile area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.number= home mobile number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.ext= home mobile extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.mobile.comment= home mobile comments field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.intcode= home pager international code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.loccode= home pager area code field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.number= home pager number field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.ext= home pager extension field has an incorrect format
-error.invalid-format.page.user.home-info.telecom.pager.comment= home pager comment field has an incorrect format
-error.invalid-format.page.user.home-info.online.email= home email field has an incorrect format
-error.invalid-format.page.user.home-info.online.uri= home URL field has an incorrect format
-error.invalid-format.page.user.business-info.postal.name= business postal name field has an incorrect format
-error.invalid-format.page.user.business-info.postal.street= business street address field has an incorrect format
-error.invalid-format.page.user.business-info.postal.city= business city field has an incorrect format
-error.invalid-format.page.user.business-info.postal.stateprov= business state field has an incorrect format
-error.invalid-format.page.user.business-info.postal.postalcode= business zip field has an incorrect format
-error.invalid-format.page.user.business-info.postal.country= business country field has an incorrect format
-error.invalid-format.page.user.business-info.postal.organization= business name field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.intcode= business telephone international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.loccode= business telephone area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.number= business telephone number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.ext= business telephone extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.telephone.comment= business telephone comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.intcode= business fax international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.loccode= business fax area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.number= business fax number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.ext= business fax extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.fax.comment= business fax comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.intcode= business mobile international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.loccode= business mobile area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.number= business mobile number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.ext= business mobile extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.mobile.comment= business mobile comment field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.intcode= business pager international code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.loccode= business pager area code field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.number= business pager number field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.ext= business pager extension field has an incorrect format
-error.invalid-format.page.user.business-info.telecom.pager.comment= business page comment field has an incorrect format
-error.invalid-format.page.user.business-info.online.email= business email field has an incorrect format
-error.invalid-format.page.user.business-info.online.uri= business url field has an incorrect format
-
-# error lacking
-error.lacking.verifyPassword= the verify password field is required
-error.lacking.user.name=username is a required field
-error.lacking.user.business-info.online.email= email is a required field
-
-error.lacking.page.user.bdate= birthday is a required field
-error.lacking.page.user.gender= gender is a required field
-error.lacking.page.user.employer= employer is a required field
-error.lacking.page.user.department= department is a required field
-error.lacking.page.user.jobtitle= job title is a required field
-error.lacking.page.user.name.prefix= title is a required field
-error.lacking.page.user.name.given= given name is a required field
-error.lacking.page.user.name.family= family name is a required field
-error.lacking.page.user.name.middle= middle name is a required field
-error.lacking.page.user.name.suffix= suffix is a required field
-error.lacking.page.user.name.nickName= nick name is a required field
-error.lacking.page.user.home-info.postal.name= postal name is a required field
-error.lacking.page.user.home-info.postal.street= street address is a required field
-error.lacking.page.user.home-info.postal.city= city is a required field
-error.lacking.page.user.home-info.postal.stateprov= state is a required field
-error.lacking.page.user.home-info.postal.postalcode= zip is a required field
-error.lacking.page.user.home-info.postal.country= country is a required field
-error.lacking.page.user.home-info.postal.organization= organization is a required field
-error.lacking.page.user.home-info.telecom.telephone.intcode= home international code is a required field
-error.lacking.page.user.home-info.telecom.telephone.loccode= home phone area code is a required field
-error.lacking.page.user.home-info.telecom.telephone.number= home phone number is a required field
-error.lacking.page.user.home-info.telecom.telephone.ext= home phone extension is a required field
-error.lacking.page.user.home-info.telecom.telephone.comment= home phone comment is a required field
-error.lacking.page.user.home-info.telecom.fax.intcode= home fax international code is a required field
-error.lacking.page.user.home-info.telecom.fax.loccode= home fax area code is a required field
-error.lacking.page.user.home-info.telecom.fax.number= home fax number is a required field
-error.lacking.page.user.home-info.telecom.fax.ext= home fax extension is a required field
-error.lacking.page.user.home-info.telecom.fax.comment= home fax comments is a required field
-error.lacking.page.user.home-info.telecom.mobile.intcode= home mobile international coe is a required field
-error.lacking.page.user.home-info.telecom.mobile.loccode= home mobile area code is a required field
-error.lacking.page.user.home-info.telecom.mobile.number= home mobile number is a required field
-error.lacking.page.user.home-info.telecom.mobile.ext= home mobile extension is a required field
-error.lacking.page.user.home-info.telecom.mobile.comment= home mobile comments is a required field
-error.lacking.page.user.home-info.telecom.pager.intcode= home pager international code is a required field
-error.lacking.page.user.home-info.telecom.pager.loccode= home pager area code is a required field
-error.lacking.page.user.home-info.telecom.pager.number= home pager number is a required field
-error.lacking.page.user.home-info.telecom.pager.ext= home pager extension is a required field
-error.lacking.page.user.home-info.telecom.pager.comment= home pager comment is a required field
-error.lacking.page.user.home-info.online.email= home email is a required field
-error.lacking.page.user.home-info.online.uri= home URL is a required field
-error.lacking.page.user.business-info.postal.name= business postal name is a required field
-error.lacking.page.user.business-info.postal.street= business street address is a required field
-error.lacking.page.user.business-info.postal.city= business city is a required field
-error.lacking.page.user.business-info.postal.stateprov= business state is a required field
-error.lacking.page.user.business-info.postal.postalcode= business zip is a required field
-error.lacking.page.user.business-info.postal.country= business country is a required field
-error.lacking.page.user.business-info.postal.organization= business name is a required field
-error.lacking.page.user.business-info.telecom.telephone.intcode= business telephone international code is a required field
-error.lacking.page.user.business-info.telecom.telephone.loccode= business telephone area code is a required field
-error.lacking.page.user.business-info.telecom.telephone.number= business telephone number is a required field
-error.lacking.page.user.business-info.telecom.telephone.ext= business telephone extension is a required field
-error.lacking.page.user.business-info.telecom.telephone.comment= business telephone comment is a required field
-error.lacking.page.user.business-info.telecom.fax.intcode= business fax international code is a required field
-error.lacking.page.user.business-info.telecom.fax.loccode= business fax area code is a required field
-error.lacking.page.user.business-info.telecom.fax.number= business fax number is a required field
-error.lacking.page.user.business-info.telecom.fax.ext= business fax extension is a required field
-error.lacking.page.user.business-info.telecom.fax.comment= business fax comment is a required field
-error.lacking.page.user.business-info.telecom.mobile.intcode= business mobile international code is a required field
-error.lacking.page.user.business-info.telecom.mobile.loccode= business mobile area code is a required field
-error.lacking.page.user.business-info.telecom.mobile.number= business mobile number is a required field
-error.lacking.page.user.business-info.telecom.mobile.ext= business mobile extension is a required field
-error.lacking.page.user.business-info.telecom.mobile.comment= business mobile comment is a required field
-error.lacking.page.user.business-info.telecom.pager.intcode= business pager international code is a required field
-error.lacking.page.user.business-info.telecom.pager.loccode= business pager area code is a required field
-error.lacking.page.user.business-info.telecom.pager.number= business pager number is a required field
-error.lacking.page.user.business-info.telecom.pager.ext= business pager extension is a required field
-error.lacking.page.user.business-info.telecom.pager.comment= business page comment is a required field
-error.lacking.page.user.business-info.online.email= business email is a required field
-error.lacking.page.user.business-info.online.uri= business url is a required field
-
-
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+email.subject.registration=Registration Confirmation
+
+error.lacking.first_name=You must enter a first name
+error.lacking.last_name=You must enter a last name
+error.lacking.username=You must enter a username
+error.email_invalid_format=Please enter a valid Email address.
+error.lacking.password=You must enter a password
+error.userid_already_exists=Requested User ID already exists. Please select another User Id.
+error.email_already_exists=The requested email address is already being used in the system. If you already have an account, consider using the forgotten password portlet to retreive your password.
+error.two_passwords_do_not_match=The two passwords do not match, please re-type them
+error.failed_to_add=Failed to add user.
+success.login_above=You have completed the user registration process. Please login above
+success.check_your_email= You have completed the user registration process. An email containing your username and password has been sent to you.
+
+# stuff for the template
+page.welcome=Welcome. Please fill out the following form to become a registered user.
+page.username=Username
+page.email.address=Email Address
+page.password=Password
+page.passwordVerify=Password (verify)
+page.button=Register Me
+
+page.optional=<font color="blue" size="-2">(optional)</font>
+
+# special added fields
+page.user.name= Username
+
+# for labeling all the PLT attribute fields
+page.user.bdate= Birthday
+page.user.gender= Gender
+page.user.employer= Employer
+page.user.department= Department
+page.user.jobtitle= Job Title
+page.user.name.prefix= Title
+page.user.name.given= First Name
+page.user.name.family= Last Name
+page.user.name.middle= Middle Name
+page.user.name.suffix= Suffix
+page.user.name.nickName= Nick Name
+page.user.home-info.postal.name= Postal Name
+page.user.home-info.postal.street= Street Address
+page.user.home-info.postal.city= City
+page.user.home-info.postal.stateprov= State
+page.user.home-info.postal.postalcode= Zip
+page.user.home-info.postal.country= Country
+page.user.home-info.postal.organization= Organization
+page.user.home-info.telecom.telephone.intcode= Home international code
+page.user.home-info.telecom.telephone.loccode= home phone area code
+page.user.home-info.telecom.telephone.number= home phone number
+page.user.home-info.telecom.telephone.ext= home phone extension
+page.user.home-info.telecom.telephone.comment= home phone comment
+page.user.home-info.telecom.fax.intcode= home fax international code
+page.user.home-info.telecom.fax.loccode= home fax area code
+page.user.home-info.telecom.fax.number= home fax number
+page.user.home-info.telecom.fax.ext= home fax extension
+page.user.home-info.telecom.fax.comment= home fax comments
+page.user.home-info.telecom.mobile.intcode= home mobile international coe
+page.user.home-info.telecom.mobile.loccode= home mobile area code
+page.user.home-info.telecom.mobile.number= home mobile number
+page.user.home-info.telecom.mobile.ext= home mobile extension
+page.user.home-info.telecom.mobile.comment= home mobile comments
+page.user.home-info.telecom.pager.intcode= home pager international code
+page.user.home-info.telecom.pager.loccode= home pager area code
+page.user.home-info.telecom.pager.number= home pager number
+page.user.home-info.telecom.pager.ext= home pager extension
+page.user.home-info.telecom.pager.comment= home pager comment
+page.user.home-info.online.email= home email
+page.user.home-info.online.uri= home URL
+page.user.business-info.postal.name= Business Name
+page.user.business-info.postal.street= Business Street Address
+page.user.business-info.postal.city= Business City
+page.user.business-info.postal.stateprov= Business State
+page.user.business-info.postal.postalcode= Business Zip
+page.user.business-info.postal.country= Business Country
+page.user.business-info.postal.organization= Business Name
+page.user.business-info.telecom.telephone.intcode= business telephone international code
+page.user.business-info.telecom.telephone.loccode= business telephone area code
+page.user.business-info.telecom.telephone.number= Business Telephone
+page.user.business-info.telecom.telephone.ext= business telephone extension
+page.user.business-info.telecom.telephone.comment= business telephone comment
+page.user.business-info.telecom.fax.intcode= business fax international code
+page.user.business-info.telecom.fax.loccode= business fax area code
+page.user.business-info.telecom.fax.number= business fax number
+page.user.business-info.telecom.fax.ext= business fax extension
+page.user.business-info.telecom.fax.comment= business fax comment
+page.user.business-info.telecom.mobile.intcode= business mobile international code
+page.user.business-info.telecom.mobile.loccode= business mobile area code
+page.user.business-info.telecom.mobile.number= business mobile number
+page.user.business-info.telecom.mobile.ext= business mobile extension
+page.user.business-info.telecom.mobile.comment= business mobile comment
+page.user.business-info.telecom.pager.intcode= business pager international code
+page.user.business-info.telecom.pager.loccode= business pager area code
+page.user.business-info.telecom.pager.number= business pager number
+page.user.business-info.telecom.pager.ext= business pager extension
+page.user.business-info.telecom.pager.comment= business page comment
+page.user.business-info.online.email= Business Email
+page.user.business-info.online.uri= Business Website
+
+# error invalid formats
+
+error.invalid-format.verifyPassword= the verify password field has an invalid format
+error.invalid-format.user.name=username has an invalid format
+error.invalid-format.user.business-info.online.email= email has an invalid format
+
+error.invalid-format.user.bdate= birthday field has an incorrect format
+error.invalid-format.user.gender= gender field has an incorrect format
+error.invalid-format.user.employer= employer field has an incorrect format
+error.invalid-format.user.department= department field has an incorrect format
+error.invalid-format.user.jobtitle= job title field has an incorrect format
+error.invalid-format.user.name.prefix= title field has an incorrect format
+error.invalid-format.user.name.given= given name field has an incorrect format
+error.invalid-format.user.name.family= family name field has an incorrect format
+error.invalid-format.user.name.middle= middle name field has an incorrect format
+error.invalid-format.user.name.suffix= suffix field has an incorrect format
+error.invalid-format.user.name.nickName= nick name field has an incorrect format
+error.invalid-format.user.home-info.postal.name= postal name field has an incorrect format
+error.invalid-format.user.home-info.postal.street= street address field has an incorrect format
+error.invalid-format.user.home-info.postal.city= city field has an incorrect format
+error.invalid-format.user.home-info.postal.stateprov= state field has an incorrect format
+error.invalid-format.user.home-info.postal.postalcode= zip field has an incorrect format
+error.invalid-format.user.home-info.postal.country= country field has an incorrect format
+error.invalid-format.user.home-info.postal.organization= organization field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.intcode= home international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.loccode= home phone area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.number= home phone number field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.ext= home phone extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.telephone.comment= home phone comment field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.intcode= home fax international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.loccode= home fax area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.number= home fax number field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.ext= home fax extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.fax.comment= home fax comments field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.intcode= home mobile international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.loccode= home mobile area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.number= home mobile number field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.ext= home mobile extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.mobile.comment= home mobile comments field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.intcode= home pager international code field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.loccode= home pager area code field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.number= home pager number field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.ext= home pager extension field has an incorrect format
+error.invalid-format.user.home-info.telecom.pager.comment= home pager comment field has an incorrect format
+error.invalid-format.user.home-info.online.email= home email field has an incorrect format
+error.invalid-format.user.home-info.online.uri= home URL field has an incorrect format
+error.invalid-format.user.business-info.postal.name= business postal name field has an incorrect format
+error.invalid-format.user.business-info.postal.street= business street address field has an incorrect format
+error.invalid-format.user.business-info.postal.city= business city field has an incorrect format
+error.invalid-format.user.business-info.postal.stateprov= business state field has an incorrect format
+error.invalid-format.user.business-info.postal.postalcode= business zip field has an incorrect format
+error.invalid-format.user.business-info.postal.country= business country field has an incorrect format
+error.invalid-format.user.business-info.postal.organization= business name field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.intcode= business telephone international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.loccode= business telephone area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.number= business telephone number field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.ext= business telephone extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.telephone.comment= business telephone comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.intcode= business fax international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.loccode= business fax area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.number= business fax number field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.ext= business fax extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.fax.comment= business fax comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.intcode= business mobile international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.loccode= business mobile area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.number= business mobile number field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.ext= business mobile extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.mobile.comment= business mobile comment field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.intcode= business pager international code field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.loccode= business pager area code field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.number= business pager number field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.ext= business pager extension field has an incorrect format
+error.invalid-format.user.business-info.telecom.pager.comment= business page comment field has an incorrect format
+error.invalid-format.user.business-info.online.email= business email field has an incorrect format
+error.invalid-format.user.business-info.online.uri= business url field has an incorrect format
+
+# error lacking
+error.lacking.verifyPassword= the verify password field is required
+error.lacking.user.name=username is a required field
+error.lacking.user.business-info.online.email= email is a required field
+
+error.lacking.user.bdate= birthday is a required field
+error.lacking.user.gender= gender is a required field
+error.lacking.user.employer= employer is a required field
+error.lacking.user.department= department is a required field
+error.lacking.user.jobtitle= job title is a required field
+error.lacking.user.name.prefix= title is a required field
+error.lacking.user.name.given= given name is a required field
+error.lacking.user.name.family= family name is a required field
+error.lacking.user.name.middle= middle name is a required field
+error.lacking.user.name.suffix= suffix is a required field
+error.lacking.user.name.nickName= nick name is a required field
+error.lacking.user.home-info.postal.name= postal name is a required field
+error.lacking.user.home-info.postal.street= street address is a required field
+error.lacking.user.home-info.postal.city= city is a required field
+error.lacking.user.home-info.postal.stateprov= state is a required field
+error.lacking.user.home-info.postal.postalcode= zip is a required field
+error.lacking.user.home-info.postal.country= country is a required field
+error.lacking.user.home-info.postal.organization= organization is a required field
+error.lacking.user.home-info.telecom.telephone.intcode= home international code is a required field
+error.lacking.user.home-info.telecom.telephone.loccode= home phone area code is a required field
+error.lacking.user.home-info.telecom.telephone.number= home phone number is a required field
+error.lacking.user.home-info.telecom.telephone.ext= home phone extension is a required field
+error.lacking.user.home-info.telecom.telephone.comment= home phone comment is a required field
+error.lacking.user.home-info.telecom.fax.intcode= home fax international code is a required field
+error.lacking.user.home-info.telecom.fax.loccode= home fax area code is a required field
+error.lacking.user.home-info.telecom.fax.number= home fax number is a required field
+error.lacking.user.home-info.telecom.fax.ext= home fax extension is a required field
+error.lacking.user.home-info.telecom.fax.comment= home fax comments is a required field
+error.lacking.user.home-info.telecom.mobile.intcode= home mobile international coe is a required field
+error.lacking.user.home-info.telecom.mobile.loccode= home mobile area code is a required field
+error.lacking.user.home-info.telecom.mobile.number= home mobile number is a required field
+error.lacking.user.home-info.telecom.mobile.ext= home mobile extension is a required field
+error.lacking.user.home-info.telecom.mobile.comment= home mobile comments is a required field
+error.lacking.user.home-info.telecom.pager.intcode= home pager international code is a required field
+error.lacking.user.home-info.telecom.pager.loccode= home pager area code is a required field
+error.lacking.user.home-info.telecom.pager.number= home pager number is a required field
+error.lacking.user.home-info.telecom.pager.ext= home pager extension is a required field
+error.lacking.user.home-info.telecom.pager.comment= home pager comment is a required field
+error.lacking.user.home-info.online.email= home email is a required field
+error.lacking.user.home-info.online.uri= home URL is a required field
+error.lacking.user.business-info.postal.name= business postal name is a required field
+error.lacking.user.business-info.postal.street= business street address is a required field
+error.lacking.user.business-info.postal.city= business city is a required field
+error.lacking.user.business-info.postal.stateprov= business state is a required field
+error.lacking.user.business-info.postal.postalcode= business zip is a required field
+error.lacking.user.business-info.postal.country= business country is a required field
+error.lacking.user.business-info.postal.organization= business name is a required field
+error.lacking.user.business-info.telecom.telephone.intcode= business telephone international code is a required field
+error.lacking.user.business-info.telecom.telephone.loccode= business telephone area code is a required field
+error.lacking.user.business-info.telecom.telephone.number= business telephone number is a required field
+error.lacking.user.business-info.telecom.telephone.ext= business telephone extension is a required field
+error.lacking.user.business-info.telecom.telephone.comment= business telephone comment is a required field
+error.lacking.user.business-info.telecom.fax.intcode= business fax international code is a required field
+error.lacking.user.business-info.telecom.fax.loccode= business fax area code is a required field
+error.lacking.user.business-info.telecom.fax.number= business fax number is a required field
+error.lacking.user.business-info.telecom.fax.ext= business fax extension is a required field
+error.lacking.user.business-info.telecom.fax.comment= business fax comment is a required field
+error.lacking.user.business-info.telecom.mobile.intcode= business mobile international code is a required field
+error.lacking.user.business-info.telecom.mobile.loccode= business mobile area code is a required field
+error.lacking.user.business-info.telecom.mobile.number= business mobile number is a required field
+error.lacking.user.business-info.telecom.mobile.ext= business mobile extension is a required field
+error.lacking.user.business-info.telecom.mobile.comment= business mobile comment is a required field
+error.lacking.user.business-info.telecom.pager.intcode= business pager international code is a required field
+error.lacking.user.business-info.telecom.pager.loccode= business pager area code is a required field
+error.lacking.user.business-info.telecom.pager.number= business pager number is a required field
+error.lacking.user.business-info.telecom.pager.ext= business pager extension is a required field
+error.lacking.user.business-info.telecom.pager.comment= business page comment is a required field
+error.lacking.user.business-info.online.email= business email is a required field
+error.lacking.user.business-info.online.uri= business url is a required field
+
+
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java Thu Feb 7 14:09:54 2008
@@ -654,6 +654,8 @@
{
Preferences attributes = user.getUserAttributes();
String subsite = attributes.get(User.USER_INFO_SUBSITE, null);
+ String firstName = attributes.get("user.name.given", "n/a");
+ String lastName = attributes.get("user.name.family", "n/a");
userManager.removeUser(userName);
PortletMessaging.publish(actionRequest, SecurityResources.TOPIC_USERS, SecurityResources.MESSAGE_REFRESH, "true");
if (subsite == null)
@@ -665,8 +667,6 @@
Folder folder = pageManager.getFolder(subsite);
pageManager.removeFolder(folder);
}
- String firstName = attributes.get("user.name.given", "n/a");
- String lastName = attributes.get("user.name.family", "n/a");
audit.logAdminAttributeActivity(actionRequest.getUserPrincipal().getName(),
getIPAddress(actionRequest), userName, AuditActivity.USER_DELETE, "", firstName, lastName, USER_ADMINISTRATION);
// remove selected user from USERS_TOPIC
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java Thu Feb 7 14:09:54 2008
@@ -47,6 +47,7 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.headerresource.HeaderResource;
+import org.apache.jetspeed.om.common.LocalizedField;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
@@ -238,7 +239,7 @@
{
PortletDefinitionComposite portlet =
getPortletFromParsedObject((ParsedObject)portlets.next());
- PortletInfo portletInfo = filterPortlet(portlet, locale);
+ PortletInfo portletInfo = filterPortlet(portlet, locale, request);
if (portletInfo != null)
{
cat.addPortlet(portletInfo);
@@ -276,7 +277,7 @@
else
portlet = getPortletFromParsedObject((ParsedObject)portlets.next());
- PortletInfo portletInfo = filterPortlet(portlet, locale);
+ PortletInfo portletInfo = filterPortlet(portlet, locale, request);
if (portletInfo != null)
{
list.add(portletInfo);
@@ -318,6 +319,30 @@
return list;
}
+ protected boolean filterByRole(PortletDefinitionComposite portlet, RenderRequest request)
+ {
+ boolean doFilter = false;
+ Collection c = portlet.getMetadata().getFields("selector.conditional.role");
+ if (c != null)
+ {
+ Iterator it = c.iterator();
+ if (it.hasNext())
+ {
+ LocalizedField roleField = (LocalizedField) it.next();
+ String role = roleField.getValue();
+ if (role != null)
+ {
+ if (role.equals("*"))
+ doFilter = true;
+ else
+ {
+ return (!request.isUserInRole(role));
+ }
+ }
+ }
+ }
+ return doFilter;
+ }
/**
* Filters portlets being added to the based on security checks and layout criteria
@@ -325,11 +350,14 @@
* @param portlet
* @return null if filtered, otherwise PortletInfo to be added to list
*/
- protected PortletInfo filterPortlet(PortletDefinitionComposite portlet, Locale locale)
+ protected PortletInfo filterPortlet(PortletDefinitionComposite portlet, Locale locale, RenderRequest request)
{
if (portlet == null)
return null;
-
+ if (filterByRole(portlet, request))
+ {
+ return null;
+ }
// Do not display Jetspeed Layout Applications
MutablePortletApplication pa = (MutablePortletApplication)portlet.getPortletApplicationDefinition();
if (pa.isLayoutApplication())
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml Thu Feb 7 14:09:54 2008
@@ -40,6 +40,7 @@
<js:security-constraint-ref>public-view</js:security-constraint-ref>
<dc:title>Login XHTML Portlet</dc:title>
<dc:creator>J2 Team</dc:creator>
+ <js:metadata name="selector.conditional.role">admin</js:metadata>
</portlet>
@@ -48,6 +49,7 @@
<js:security-constraint-ref>public-view</js:security-constraint-ref>
<dc:title>Portal Login Portlet</dc:title>
<dc:creator>J2 Team</dc:creator>
+ <js:metadata name="selector.conditional.role">admin</js:metadata>
</portlet>
<portlet>
@@ -81,21 +83,25 @@
<js:security-constraint-ref>AEUV</js:security-constraint-ref>
<js:metadata name="merge.portal.parameters.with.portlet.parameters">true</js:metadata>
<js:metadata name="merge.portal.parameters.before.portlet.parameters">true</js:metadata>
+ <js:metadata name="selector.conditional.role">admin</js:metadata>
</portlet>
<portlet>
<portlet-name>WelcomeToJetspeed</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
+ <js:metadata name="selector.conditional.role">*</js:metadata>
</portlet>
<portlet>
<portlet-name>AboutJetspeed</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
+ <js:metadata name="selector.conditional.role">*</js:metadata>
</portlet>
<portlet>
<portlet-name>JetspeedDeveloper</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
+ <js:metadata name="selector.conditional.role">*</js:metadata>
</portlet>
<portlet>
@@ -105,12 +111,14 @@
<portlet>
<portlet-name>DevelopersBrowser</portlet-name>
- <js:security-constraint-ref>devmgr</js:security-constraint-ref>
+ <js:security-constraint-ref>devmgr</js:security-constraint-ref>
+ <js:metadata name="selector.conditional.role">*</js:metadata>
</portlet>
<portlet>
<portlet-name>DeveloperDetails</portlet-name>
<js:security-constraint-ref>devmgr</js:security-constraint-ref>
+ <js:metadata name="selector.conditional.role">*</js:metadata>
</portlet>
<js:services>
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm?rev=619663&r1=619662&r2=619663&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm Thu Feb 7 14:09:54 2008
@@ -29,7 +29,7 @@
<tr><td colspan="2" >
$MESSAGES.getString('page.welcome')
#if($MSG )
- <p class="portlet-msg-error">$!MSG</p>
+ <p style='color:red'>$!MSG</p>
#end
</td></tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org