faces-config.xml: porting validators and converters declaration to JSF2.

php-coder · php-coder · commit e88266ebbf29 · 2010-07-19T00:42:32.000+07:00
diff --git a/src/ru/mystamps/site/converters/TrimSpacesConverter.java b/src/ru/mystamps/site/converters/TrimSpacesConverter.java
@@ -2,8 +2,10 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.convert.FacesConverter;
 import javax.faces.convert.Converter;
 
+@FacesConverter(value="TrimSpaces")
 public class TrimSpacesConverter implements Converter {
 	
 	@Override
diff --git a/src/ru/mystamps/site/validators/ActivationKeyExistsValidator.java b/src/ru/mystamps/site/validators/ActivationKeyExistsValidator.java
@@ -6,6 +6,7 @@
 import javax.faces.component.EditableValueHolder;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
@@ -16,6 +17,7 @@
 import ru.mystamps.db.UsersActivation;
 import ru.mystamps.site.utils.Messages;
 
+@FacesValidator(value="ActivationKeyExists")
 public class ActivationKeyExistsValidator implements Validator {
 	
 	private Logger log = null;
diff --git a/src/ru/mystamps/site/validators/LoginNotExistsValidator.java b/src/ru/mystamps/site/validators/LoginNotExistsValidator.java
@@ -6,6 +6,7 @@
 import javax.faces.component.EditableValueHolder;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
@@ -16,6 +17,7 @@
 import ru.mystamps.db.Users;
 import ru.mystamps.site.utils.Messages;
 
+@FacesValidator(value="LoginNotExists")
 public class LoginNotExistsValidator implements Validator {
 	
 	private Logger log = null;
diff --git a/webapp/WEB-INF/faces-config.xml b/webapp/WEB-INF/faces-config.xml
@@ -20,21 +20,6 @@
 		<message-bundle>ru.mystamps.i18n.Messages</message-bundle>
 		<message-bundle>ru.mystamps.i18n.ErrorMessages</message-bundle>
 		
-		<converter>
-			<converter-id>ru.mystamps.site.converters.TrimSpaces</converter-id>
-			<converter-class>ru.mystamps.site.converters.TrimSpacesConverter</converter-class>
-		</converter>
-		
-		<validator>
-			<validator-id>ru.mystamps.site.validators.LoginNotExists</validator-id>
-			<validator-class>ru.mystamps.site.validators.LoginNotExistsValidator</validator-class>
-		</validator>
-		
-		<validator>
-			<validator-id>ru.mystamps.site.validators.ActivationKeyExists</validator-id>
-			<validator-class>ru.mystamps.site.validators.ActivationKeyExistsValidator</validator-class>
-		</validator>
-		
 		<locale-config>
 			<default-locale>ru</default-locale>
 			<supported-locale>ru</supported-locale>
diff --git a/webapp/activate_user.jsp b/webapp/activate_user.jsp
@@ -35,16 +35,14 @@
 								<t:validateRegExpr
 									pattern="[-_a-zA-Z0-9]+"
 									message="#{e.tv_invalid_login}" />
-								<f:validator
-									validatorId="ru.mystamps.site.validators.LoginNotExists" />
+								<f:validator validatorId="LoginNotExists" />
 							</h:inputText>
 							<h:message id="login_error" for="login" styleClass="error" />
 							
 							<h:outputLabel for="name" value="#{m.t_name}" />
 							<h:panelGroup />
 							<h:inputText id="name" value="#{activate.name}">
-								<f:converter
-									converterId="ru.mystamps.site.converters.TrimSpaces" />
+								<f:converter converterId="TrimSpaces" />
 								<f:validateLength
 									maximum="#{initParam['NAME_MAX_LENGTH']}" />
 								<t:validateRegExpr
@@ -86,8 +84,7 @@
 								<t:validateRegExpr
 									pattern="[0-9a-z]+"
 									message="#{e.tv_invalid_key}" />
-								<f:validator
-									validatorId="ru.mystamps.site.validators.ActivationKeyExists" />
+								<f:validator validatorId="ActivationKeyExists" />
 							</h:inputText>
 							<h:message id="act_key_error" for="act_key" styleClass="error" />
 							
