You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/08/15 04:13:30 UTC
svn commit: r686110 [4/6] - in
/myfaces/extensions/validator/branches/jsf_1.1: ./ core/
core/src/main/java/org/apache/myfaces/extensions/validator/
core/src/main/java/org/apache/myfaces/extensions/validator/core/
core/src/main/java/org/apache/myfaces/e...
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class ShortConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.ShortConverter {
- private Converter smartConverter;
+public class ShortConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.ShortConverter
+{
+ private Converter smartConverter;
- public ShortConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.ShortConverter());
- }
+ public ShortConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.ShortConverter());
+ }
- public ShortConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public ShortConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Propchange: myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java Thu Aug 14 19:13:27 2008
@@ -18,18 +18,19 @@
*/
package org.apache.myfaces.extensions.validator.demo.domain;
-import org.apache.myfaces.extensions.validator.baseval.annotation.Length;
-import org.apache.myfaces.extensions.validator.baseval.annotation.Regex;
import org.apache.myfaces.extensions.validator.crossval.annotation.DateIs;
import org.apache.myfaces.extensions.validator.crossval.annotation.DateIsType;
import org.apache.myfaces.extensions.validator.crossval.annotation.NotEquals;
+import org.apache.myfaces.extensions.validator.baseval.annotation.Length;
+import org.apache.myfaces.extensions.validator.baseval.annotation.Regex;
import javax.persistence.Column;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date;
-public class Person {
+public class Person
+{
@Length(minimum = 2)
@Column(nullable = false, length = 20)
@NotEquals("lastName")
@@ -63,67 +64,83 @@
@Column(nullable = false)
private int numberOfSiblings;
- public String getFirstName() {
+ public String getFirstName()
+ {
return firstName;
}
- public void setFirstName(String firstName) {
+ public void setFirstName(String firstName)
+ {
this.firstName = firstName;
}
- public String getLastName() {
+ public String getLastName()
+ {
return lastName;
}
- public void setLastName(String lastName) {
+ public void setLastName(String lastName)
+ {
this.lastName = lastName;
}
- public String getPassword() {
+ public String getPassword()
+ {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(String password)
+ {
this.password = password;
}
- public Date getBirthday() {
+ public Date getBirthday()
+ {
return birthday;
}
- public void setBirthday(Date birthday) {
+ public void setBirthday(Date birthday)
+ {
this.birthday = birthday;
}
- public Date getFinalExam() {
+ public Date getFinalExam()
+ {
return finalExam;
}
- public void setFinalExam(Date finalExam) {
+ public void setFinalExam(Date finalExam)
+ {
this.finalExam = finalExam;
}
- public String getNickName() {
+ public String getNickName()
+ {
return nickName;
}
- public void setNickName(String nickName) {
+ public void setNickName(String nickName)
+ {
this.nickName = nickName;
}
- public String getEmail() {
+ public String getEmail()
+ {
return email;
}
- public void setEmail(String email) {
+ public void setEmail(String email)
+ {
this.email = email;
}
- public int getNumberOfSiblings() {
+ public int getNumberOfSiblings()
+ {
return numberOfSiblings;
}
- public void setNumberOfSiblings(int numberOfSiblings) {
+ public void setNumberOfSiblings(int numberOfSiblings)
+ {
this.numberOfSiblings = numberOfSiblings;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java Thu Aug 14 19:13:27 2008
@@ -18,16 +18,18 @@
*/
package org.apache.myfaces.extensions.validator.demo.gui.beans;
-import org.apache.myfaces.custom.emailvalidator.EmailValidator;
+import org.apache.myfaces.extensions.validator.demo.domain.Person;
+
+import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
+import org.apache.myfaces.extensions.validator.crossval.annotation.NotEquals;
import org.apache.myfaces.extensions.validator.baseval.annotation.JoinValidation;
import org.apache.myfaces.extensions.validator.baseval.annotation.LongRange;
import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
import org.apache.myfaces.extensions.validator.baseval.annotation.Validator;
-import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
-import org.apache.myfaces.extensions.validator.crossval.annotation.NotEquals;
-import org.apache.myfaces.extensions.validator.demo.domain.Person;
+import org.apache.myfaces.custom.emailvalidator.EmailValidator;
-public class RegistrationPage {
+public class RegistrationPage
+{
//the old password of the person isn't used within the page
//-> validate with value of the model
@@ -52,12 +54,14 @@
private Person person;
- public String finish() {
+ public String finish()
+ {
this.person.setPassword(this.password);
return "home";
}
- public String updateNickName() {
+ public String updateNickName()
+ {
this.person.setNickName(this.newNickName);
return "home";
}
@@ -65,64 +69,78 @@
//combine gui related annotations with the annoations of the domain model
@JoinValidation("#{person.email}")
@Validator(EmailValidator.class)
- public String getEmail() {
+ public String getEmail()
+ {
return this.person.getEmail();
}
- public void setEmail(String email) {
+ public void setEmail(String email)
+ {
this.person.setEmail(email);
}
@JoinValidation("#{person.numberOfSiblings}")
@LongRange(maximum = 20)
- public int getNumberOfSiblings() {
+ public int getNumberOfSiblings()
+ {
return this.person.getNumberOfSiblings();
}
- public void setNumberOfSiblings(int numberOfSiblings) {
+ public void setNumberOfSiblings(int numberOfSiblings)
+ {
this.person.setNumberOfSiblings(numberOfSiblings);
}
/*
* generated
*/
- public String getOldPassword() {
+ public String getOldPassword()
+ {
return oldPassword;
}
- public void setOldPassword(String oldPassword) {
+ public void setOldPassword(String oldPassword)
+ {
this.oldPassword = oldPassword;
}
- public String getPassword() {
+ public String getPassword()
+ {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(String password)
+ {
this.password = password;
}
- public String getPasswordRepeated() {
+ public String getPasswordRepeated()
+ {
return passwordRepeated;
}
- public void setPasswordRepeated(String passwordRepeated) {
+ public void setPasswordRepeated(String passwordRepeated)
+ {
this.passwordRepeated = passwordRepeated;
}
- public Person getPerson() {
+ public Person getPerson()
+ {
return person;
}
- public void setPerson(Person person) {
+ public void setPerson(Person person)
+ {
this.person = person;
}
- public String getNewNickName() {
+ public String getNewNickName()
+ {
return newNickName;
}
- public void setNewNickName(String newNickName) {
+ public void setNewNickName(String newNickName)
+ {
this.newNickName = newNickName;
}
}
Propchange: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Thu Aug 14 19:13:27 2008
@@ -15,43 +15,46 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.myfaces.blank;
-import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
import org.apache.myfaces.blank.domain.Person;
/**
* A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
*
*/
-public class HelloWorldController {
+public class HelloWorldController
+{
-
//properties
private Person person;
-
+
/**
* default empty constructor
*/
- public HelloWorldController(){
+ public HelloWorldController()
+ {
}
-
+
//-------------------getter & setter
- public Person getPerson() {
+ public Person getPerson()
+ {
return person;
}
- public void setPerson(Person person) {
+ public void setPerson(Person person)
+ {
this.person = person;
}
/**
* Method that is backed to a submit button of a form.
*/
- public String send(){
+ public String send()
+ {
//do real logic, return a string which will be used for the navigation system of JSF
return "success";
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java Thu Aug 14 19:13:27 2008
@@ -15,20 +15,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.myfaces.blank.domain;
import javax.persistence.Column;
-public class Person {
+public class Person
+{
@Column(nullable = false, length = 10)
private String name;
- public String getName() {
+ public String getName()
+ {
return name;
}
- public void setName(String name) {
+ public void setName(String name)
+ {
this.name = name;
}
}
Propchange: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Thu Aug 14 19:13:27 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.myfaces.blank;
import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
@@ -24,32 +24,37 @@
* A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
*
*/
-public class HelloWorldController {
+public class HelloWorldController
+{
-
//properties
@Required
private String name;
-
+
/**
* default empty constructor
*/
- public HelloWorldController(){
+ public HelloWorldController()
+ {
}
-
+
//-------------------getter & setter
- public String getName() {
+ public String getName()
+ {
return name;
}
- public void setName(String name) {
+
+ public void setName(String name)
+ {
this.name = name;
}
-
+
/**
* Method that is backed to a submit button of a form.
*/
- public String send(){
+ public String send()
+ {
//do real logic, return a string which will be used for the navigation system of JSF
return "success";
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -13,8 +32,8 @@
<parent>
<groupId>org.apache.myfaces.extensions.validator</groupId>
- <artifactId>validator-project</artifactId>
- <version>${build.version}</version>
+ <artifactId>myfaces-extval-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modules>
Propchange: myfaces/extensions/validator/branches/jsf_1.1/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,58 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<groupId>org.apache.myfaces.extensions.validator</groupId>
- <artifactId>validator-project</artifactId>
-
- <name>MyFaces Extensions-Validator Project</name>
+ <artifactId>myfaces-extval-module</artifactId>
<version>${build.version}</version>
+ <packaging>pom</packaging>
+ <name>Apache MyFaces Extensions-Validator Module</name>
+ <url>http://myfaces.apache.org/extensions/validator</url>
<modules>
+ <module>parent</module>
<module>core</module>
<module>validation-modules</module>
<module>examples</module>
</modules>
- <repositories>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- </repositories>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>false</optimize>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<properties>
<build.version>1.0.1-SNAPSHOT</build.version>
<jsf.version>1.1.5</jsf.version>
Propchange: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -13,8 +32,8 @@
<parent>
<groupId>org.apache.myfaces.extensions.validator</groupId>
- <artifactId>validator-project</artifactId>
- <version>${build.version}</version>
+ <artifactId>myfaces-extval-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modules>
Propchange: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java Thu Aug 14 19:13:27 2008
@@ -25,12 +25,21 @@
/**
* @author Gerhard Petracek
*/
-public class InitStaticStrategyMappingsPhaseListener extends AbstractStartupConfigListener {
+public class InitStaticStrategyMappingsPhaseListener extends
+ AbstractStartupConfigListener
+{
- protected void init() {
+ protected void init()
+ {
String jpaBasedValidation = WebXmlParameter.DEACTIVATE_JPA_BASED_VALIDATION;
- if (jpaBasedValidation == null || !jpaBasedValidation.equalsIgnoreCase("true")) {
- ExtValUtils.getInformationProviderBean().addStaticStrategyMappingSource(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".jpa_strategy_mappings");
+ if (jpaBasedValidation == null
+ || !jpaBasedValidation.equalsIgnoreCase("true"))
+ {
+ ExtValUtils
+ .getInformationProviderBean()
+ .addStaticStrategyMappingSource(
+ ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME
+ + ".jpa_strategy_mappings");
}
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java Thu Aug 14 19:13:27 2008
@@ -25,8 +25,11 @@
*
* @author Gerhard Petracek
*/
-public interface WebXmlParameter {
+public interface WebXmlParameter
+{
//TODO docu
- static final String VALIDATION_MESSAGES_JPA = WebXmlUtils.getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
- static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils.getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
+ static final String VALIDATION_MESSAGES_JPA = WebXmlUtils
+ .getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
+ static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils
+ .getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java Thu Aug 14 19:13:27 2008
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface DoubleRange {
+public @interface DoubleRange
+{
double minimum() default 0;
double maximum() default Double.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java Thu Aug 14 19:13:27 2008
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface JoinValidation {
+public @interface JoinValidation
+{
String[] value();
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java Thu Aug 14 19:13:27 2008
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Length {
+public @interface Length
+{
int minimum() default 0;
int maximum() default Integer.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java Thu Aug 14 19:13:27 2008
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface LongRange {
+public @interface LongRange
+{
long minimum() default 0;
long maximum() default Long.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java Thu Aug 14 19:13:27 2008
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Regex {
+public @interface Regex
+{
String[] value();
String validationErrorMsgKey() default "no_match";
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java Thu Aug 14 19:13:27 2008
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Required {
+public @interface Required
+{
String validationErrorMsgKey() default "field_required";
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java Thu Aug 14 19:13:27 2008
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Validator {
+public @interface Validator
+{
Class[] value();
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java Thu Aug 14 19:13:27 2008
@@ -29,25 +29,35 @@
/**
* @author Gerhard Petracek
*/
-public class DefaultPropertyScanningAnnotationExtractor extends DefaultComponentAnnotationExtractor {
+public class DefaultPropertyScanningAnnotationExtractor extends
+ DefaultComponentAnnotationExtractor
+{
@Override
- public List<AnnotationEntry> extractAnnotations(FacesContext facesContext, Object object) {
+ public List<AnnotationEntry> extractAnnotations(FacesContext facesContext,
+ Object object)
+ {
//should never occur
- if (!(object instanceof String)) {
+ if (!(object instanceof String))
+ {
return new ArrayList<AnnotationEntry>();
}
String valueBindingExpression = ((String) object).trim();
int beanPropertyBorder = valueBindingExpression.lastIndexOf(".");
- String property = valueBindingExpression.substring(beanPropertyBorder + 1, valueBindingExpression.lastIndexOf("}"));
-
- valueBindingExpression = valueBindingExpression.substring(0, beanPropertyBorder) + "}";
+ String property = valueBindingExpression
+ .substring(beanPropertyBorder + 1, valueBindingExpression
+ .lastIndexOf("}"));
+
+ valueBindingExpression = valueBindingExpression.substring(0,
+ beanPropertyBorder)
+ + "}";
List<AnnotationEntry> annotationEntries = new ArrayList<AnnotationEntry>();
- Class entityClass = ELUtils.getTypeOfValueBindingForExpression(facesContext, valueBindingExpression);
+ Class entityClass = ELUtils.getTypeOfValueBindingForExpression(
+ facesContext, valueBindingExpression);
//create template entry
AnnotationEntry templateEntry = new AnnotationEntry();
@@ -59,9 +69,12 @@
/*
* find and add annotations
*/
- if (entityClass != null) {
- addPropertyAccessAnnotations(entityClass, property, annotationEntries, templateEntry);
- addFieldAccessAnnotations(entityClass, property, annotationEntries, templateEntry);
+ if (entityClass != null)
+ {
+ addPropertyAccessAnnotations(entityClass, property,
+ annotationEntries, templateEntry);
+ addFieldAccessAnnotations(entityClass, property, annotationEntries,
+ templateEntry);
}
return annotationEntries;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java Thu Aug 14 19:13:27 2008
@@ -21,15 +21,20 @@
/**
* @author Gerhard Petracek
*/
-public class DefaultValidationErrorMessageResolver extends org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver {
- private static String BASE_NAME = null;
+public class DefaultValidationErrorMessageResolver
+ extends
+ org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver
+{
+ private static String baseName = null;
@Override
- protected String getBaseName() {
- if (BASE_NAME == null) {
- BASE_NAME = super.getBaseName();
+ protected String getBaseName()
+ {
+ if (baseName == null)
+ {
+ baseName = super.getBaseName();
}
- return BASE_NAME;
+ return baseName;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Thu Aug 14 19:13:27 2008
@@ -24,16 +24,23 @@
/**
* @author Gerhard Petracek
*/
-public class JpaValidationErrorMessageResolver extends AbstractValidationErrorMessageResolver {
+public class JpaValidationErrorMessageResolver extends
+ AbstractValidationErrorMessageResolver
+{
private static final String CUSTOM_BASE_NAME = WebXmlParameter.VALIDATION_MESSAGES_JPA;
- private static final String BASE_NAME = JpaValidationErrorMessageResolver.class.getPackage().getName().replace(".message.resolver", ".message.bundle") + ".jpa_messages";
+ private static final String BASE_NAME = JpaValidationErrorMessageResolver.class
+ .getPackage().getName().replace(".message.resolver",
+ ".message.bundle")
+ + ".jpa_messages";
- protected String getCustomBaseName() {
+ protected String getCustomBaseName()
+ {
return CUSTOM_BASE_NAME;
}
- protected String getBaseName() {
+ protected String getBaseName()
+ {
return BASE_NAME;
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java Thu Aug 14 19:13:27 2008
@@ -30,16 +30,22 @@
/**
* @author Gerhard Petracek
*/
-public class DoubleRangeStrategy extends AbstractValidatorAdapter {
+public class DoubleRangeStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
- DoubleRange annotation = annotationEntry.getAnnotation(DoubleRange.class);
+ DoubleRange annotation = annotationEntry
+ .getAnnotation(DoubleRange.class);
DoubleRangeValidator doubleRangeValidator = new DoubleRangeValidator();
doubleRangeValidator.setMinimum(annotation.minimum());
doubleRangeValidator.setMaximum(annotation.maximum());
- doubleRangeValidator.validate(facesContext, uiComponent, convertedObject);
+ doubleRangeValidator.validate(facesContext, uiComponent,
+ convertedObject);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Thu Aug 14 19:13:27 2008
@@ -33,22 +33,37 @@
/**
* @author Gerhard Petracek
*/
-public class JoinValidationStrategy extends AbstractValidatorAdapter {
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+public class JoinValidationStrategy extends AbstractValidatorAdapter
+{
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
AnnotationExtractor extractor = new DefaultPropertyScanningAnnotationExtractor();
- String[] targetExpressions = annotationEntry.getAnnotation(JoinValidation.class).value();
+ String[] targetExpressions = annotationEntry.getAnnotation(
+ JoinValidation.class).value();
ValidationStrategy validationStrategy;
- for (String targetExpression : targetExpressions) {
- for (AnnotationEntry entry : extractor.extractAnnotations(facesContext, targetExpression)) {
- validationStrategy = FactoryUtils.getValidationStrategyFactory().create(entry.getAnnotation());
+ for (String targetExpression : targetExpressions)
+ {
+ for (AnnotationEntry entry : extractor.extractAnnotations(
+ facesContext, targetExpression))
+ {
+ validationStrategy = FactoryUtils
+ .getValidationStrategyFactory().create(
+ entry.getAnnotation());
- if (validationStrategy != null) {
- validationStrategy.validate(facesContext, uiComponent, entry, convertedObject);
- } else {
- logger.trace("no validation strategy found for " + entry.getAnnotation().annotationType().getName());
+ if (validationStrategy != null)
+ {
+ validationStrategy.validate(facesContext, uiComponent,
+ entry, convertedObject);
+ }
+ else
+ {
+ logger.trace("no validation strategy found for "
+ + entry.getAnnotation().annotationType().getName());
}
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java Thu Aug 14 19:13:27 2008
@@ -33,7 +33,8 @@
/**
* @author Gerhard Petracek
*/
-public class JpaValidationStrategy extends AbstractValidationStrategy {
+public class JpaValidationStrategy extends AbstractValidationStrategy
+{
private static final String VALIDATE_REQUIRED = "required";
private static final String VALIDATE_LENGTH = "length";
@@ -41,76 +42,112 @@
private String violation;
private int maxLength;
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Annotation annotation = annotationEntry.getAnnotation();
- if (annotation instanceof Column) {
+ if (annotation instanceof Column)
+ {
validateColumnAnnotation((Column) annotation, convertedObject);
- } else if (annotation instanceof Basic) {
+ }
+ else if (annotation instanceof Basic)
+ {
validateBasicAnnotation((Basic) annotation, convertedObject);
- } else if (annotation instanceof OneToOne) {
+ }
+ else if (annotation instanceof OneToOne)
+ {
validateOneToOneAnnotation((OneToOne) annotation, convertedObject);
- } else if (annotation instanceof ManyToOne) {
+ }
+ else if (annotation instanceof ManyToOne)
+ {
validateManyToOneAnnotation((ManyToOne) annotation, convertedObject);
}
}
- private void validateColumnAnnotation(Column column, Object convertedObject) throws ValidatorException {
- if (!column.nullable()) {
+ private void validateColumnAnnotation(Column column, Object convertedObject)
+ throws ValidatorException
+ {
+ if (!column.nullable())
+ {
checkRequiredConvertedObject(convertedObject);
}
- if (convertedObject == null) {
+ if (convertedObject == null)
+ {
return;
}
- if (convertedObject instanceof String && column.length() < ((String) convertedObject).length()) {
+ if (convertedObject instanceof String
+ && column.length() < ((String) convertedObject).length())
+ {
this.violation = VALIDATE_LENGTH;
this.maxLength = column.length();
throw new ValidatorException(getValidationErrorFacesMassage(null));
}
}
- private void validateBasicAnnotation(Basic basic, Object convertedObject) throws ValidatorException {
- if (!basic.optional()) {
+ private void validateBasicAnnotation(Basic basic, Object convertedObject)
+ throws ValidatorException
+ {
+ if (!basic.optional())
+ {
checkRequiredConvertedObject(convertedObject);
}
}
- private void validateOneToOneAnnotation(OneToOne oneToOne, Object convertedObject) {
- if (!oneToOne.optional()) {
+ private void validateOneToOneAnnotation(OneToOne oneToOne,
+ Object convertedObject)
+ {
+ if (!oneToOne.optional())
+ {
//TODO
checkRequiredConvertedObject(convertedObject);
}
}
- private void validateManyToOneAnnotation(ManyToOne manyToOne, Object convertedObject) {
- if (!manyToOne.optional()) {
+ private void validateManyToOneAnnotation(ManyToOne manyToOne,
+ Object convertedObject)
+ {
+ if (!manyToOne.optional())
+ {
//TODO
checkRequiredConvertedObject(convertedObject);
}
}
- private void checkRequiredConvertedObject(Object convertedObject) throws ValidatorException {
- if (convertedObject == null || convertedObject.equals("")) {
+ private void checkRequiredConvertedObject(Object convertedObject)
+ throws ValidatorException
+ {
+ if (convertedObject == null || convertedObject.equals(""))
+ {
this.violation = VALIDATE_REQUIRED;
throw new ValidatorException(getValidationErrorFacesMassage(null));
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
- if (VALIDATE_LENGTH.equals(this.violation)) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
+ if (VALIDATE_LENGTH.equals(this.violation))
+ {
return "field_too_long";
- } else {
+ }
+ else
+ {
return "field_required";
}
}
- protected String getErrorMessageDetails(Annotation annotation) {
+ protected String getErrorMessageDetails(Annotation annotation)
+ {
String message = super.getErrorMessageDetails(annotation);
- if (VALIDATE_LENGTH.equals(this.violation)) {
+ if (VALIDATE_LENGTH.equals(this.violation))
+ {
return message.replace("{0}", "" + this.maxLength);
- } else {
+ }
+ else
+ {
return message;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java Thu Aug 14 19:13:27 2008
@@ -30,9 +30,13 @@
/**
* @author Gerhard Petracek
*/
-public class LengthStrategy extends AbstractValidatorAdapter {
+public class LengthStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Length annotation = annotationEntry.getAnnotation(Length.class);
LengthValidator lengthValidator = new LengthValidator();
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java Thu Aug 14 19:13:27 2008
@@ -30,9 +30,13 @@
/**
* @author Gerhard Petracek
*/
-public class LongRangeStrategy extends AbstractValidatorAdapter {
+public class LongRangeStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
LongRange annotation = annotationEntry.getAnnotation(LongRange.class);
LongRangeValidator longRangeValidator = new LongRangeValidator();
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java Thu Aug 14 19:13:27 2008
@@ -32,28 +32,33 @@
/**
* @author Gerhard Petracek
*/
-public class RegexStrategy extends AbstractValidationStrategy {
+public class RegexStrategy extends AbstractValidationStrategy
+{
protected void processValidation(FacesContext facesContext,
- UIComponent uiComponent,
- AnnotationEntry annotationEntry,
- Object convertedObject) throws ValidatorException {
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Regex annotation = annotationEntry.getAnnotation(Regex.class);
- for (String expression : annotation.value()) {
- if (convertedObject == null || !Pattern.compile(expression).matcher(convertedObject.toString()).matches()) {
- throw new ValidatorException(
- new FacesMessage(
- FacesMessage.SEVERITY_ERROR,
- getErrorMessageSummary(annotation),
- getErrorMessageDetails(annotation)
- .replace("{0}", expression)));
+ for (String expression : annotation.value())
+ {
+ if (convertedObject == null
+ || !Pattern.compile(expression).matcher(
+ convertedObject.toString()).matches())
+ {
+ throw new ValidatorException(new FacesMessage(
+ FacesMessage.SEVERITY_ERROR,
+ getErrorMessageSummary(annotation),
+ getErrorMessageDetails(annotation).replace("{0}",
+ expression)));
}
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
return ((Regex) annotation).validationErrorMsgKey();
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java Thu Aug 14 19:13:27 2008
@@ -30,15 +30,23 @@
/**
* @author Gerhard Petracek
*/
-public class RequiredStrategy extends AbstractValidationStrategy {
+public class RequiredStrategy extends AbstractValidationStrategy
+{
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
- if (convertedObject == null || convertedObject.equals("")) {
- throw new ValidatorException(getValidationErrorFacesMassage(annotationEntry.getAnnotation()));
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
+ if (convertedObject == null || convertedObject.equals(""))
+ {
+ throw new ValidatorException(
+ getValidationErrorFacesMassage(annotationEntry
+ .getAnnotation()));
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
return ((Required) annotation).validationErrorMsgKey();
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java Thu Aug 14 19:13:27 2008
@@ -30,17 +30,25 @@
/**
* @author Gerhard Petracek
*/
-public class ValidatorStrategy extends AbstractValidatorAdapter {
+public class ValidatorStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
- Class[] validatorClasses = annotationEntry.getAnnotation(Validator.class).value();
+ Class[] validatorClasses = annotationEntry.getAnnotation(
+ Validator.class).value();
javax.faces.validator.Validator validator;
- for (Class validatorClassName : validatorClasses) {
- validator = (javax.faces.validator.Validator) ClassUtils.tryToInstantiateClass(validatorClassName);
+ for (Class validatorClassName : validatorClasses)
+ {
+ validator = (javax.faces.validator.Validator) ClassUtils
+ .tryToInstantiateClass(validatorClassName);
- if (validator == null) {
+ if (validator == null)
+ {
logger.warn(validatorClassName.getName() + " not found");
continue;
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Thu Aug 14 19:13:27 2008
@@ -32,55 +32,87 @@
/**
* @author Gerhard Petracek
*/
-public class CrossValidationPhaseListener implements PhaseListener {
+public class CrossValidationPhaseListener implements PhaseListener
+{
private boolean isInitialized = false;
- public void afterPhase(PhaseEvent event) {
+ public void afterPhase(PhaseEvent event)
+ {
- try {
- CrossValidationStorage crossValidationStorage = CrossValidationUtils.getOrInitCrossValidationStorage();
- for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
- try {
- entry.getValidationStrategy().processCrossValidation(entry, crossValidationStorage);
- } catch (ValidatorException e) {
+ try
+ {
+ CrossValidationStorage crossValidationStorage = CrossValidationUtils
+ .getOrInitCrossValidationStorage();
+ for (CrossValidationStorageEntry entry : crossValidationStorage
+ .getCrossValidationStorageEntries())
+ {
+ try
+ {
+ entry.getValidationStrategy().processCrossValidation(entry,
+ crossValidationStorage);
+ }
+ catch (ValidatorException e)
+ {
FacesMessage facesMessage = e.getFacesMessage();
- if (facesMessage != null && facesMessage.getSummary() != null && facesMessage.getDetail() != null) {
+ if (facesMessage != null
+ && facesMessage.getSummary() != null
+ && facesMessage.getDetail() != null)
+ {
UIComponent component = entry.getComponent();
String clientId = null;
//TODO
- if (component != null) {
- clientId = component.getClientId(event.getFacesContext());
+ if (component != null)
+ {
+ clientId = component.getClientId(event
+ .getFacesContext());
}
- event.getFacesContext().addMessage(clientId, facesMessage);
+ event.getFacesContext().addMessage(clientId,
+ facesMessage);
}
event.getFacesContext().renderResponse();
- } catch (MissingResourceException e) {
- event.getFacesContext().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "custom validation message not found", e.toString()));
+ }
+ catch (MissingResourceException e)
+ {
+ event.getFacesContext().addMessage(
+ null,
+ new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ "custom validation message not found", e
+ .toString()));
event.getFacesContext().renderResponse();
throw e;
}
}
- } finally {
+ }
+ finally
+ {
CrossValidationUtils.resetCrossValidationStorage();
}
}
- public void beforePhase(PhaseEvent event) {
- if (!isInitialized) {
- if (WebXmlParameter.DEACTIVATE_CROSSVALIDATION != null && WebXmlParameter.DEACTIVATE_CROSSVALIDATION.equalsIgnoreCase("true")) {
+ public void beforePhase(PhaseEvent event)
+ {
+ if (!isInitialized)
+ {
+ if (WebXmlParameter.DEACTIVATE_CROSSVALIDATION != null
+ && WebXmlParameter.DEACTIVATE_CROSSVALIDATION
+ .equalsIgnoreCase("true"))
+ {
ExtValUtils.deregisterPhaseListener(this);
- } else {
+ }
+ else
+ {
isInitialized = true;
}
}
}
- public PhaseId getPhaseId() {
+ public PhaseId getPhaseId()
+ {
return PhaseId.ANY_PHASE;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java Thu Aug 14 19:13:27 2008
@@ -24,18 +24,24 @@
/**
* @author Gerhard Petracek
*/
-public class CrossValidationStorage {
- private List<CrossValidationStorageEntry> crossValidationStorageEntries = new ArrayList<CrossValidationStorageEntry>();
+public class CrossValidationStorage
+{
+ private List<CrossValidationStorageEntry> crossValidationStorageEntries =
+ new ArrayList<CrossValidationStorageEntry>();
- public void add(CrossValidationStorageEntry entry) {
+ public void add(CrossValidationStorageEntry entry)
+ {
this.crossValidationStorageEntries.add(entry);
}
- public List<CrossValidationStorageEntry> getCrossValidationStorageEntries() {
+ public List<CrossValidationStorageEntry> getCrossValidationStorageEntries()
+ {
return crossValidationStorageEntries;
}
- public void setCrossValidationStorageEntries(List<CrossValidationStorageEntry> crossValidationStorageEntries) {
+ public void setCrossValidationStorageEntries(
+ List<CrossValidationStorageEntry> crossValidationStorageEntries)
+ {
this.crossValidationStorageEntries = crossValidationStorageEntries;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java Thu Aug 14 19:13:27 2008
@@ -26,7 +26,8 @@
/**
* @author Gerhard Petracek
*/
-public class CrossValidationStorageEntry {
+public class CrossValidationStorageEntry
+{
private AnnotationEntry annotationEntry;
//for complex components (e.g. a table) stores the object of entry (#{entry.property})
private Object bean;
@@ -34,43 +35,53 @@
private Object convertedObject;
private CrossValidationStrategy validationStrategy;
- public AnnotationEntry getAnnotationEntry() {
+ public AnnotationEntry getAnnotationEntry()
+ {
return annotationEntry;
}
- public void setAnnotationEntry(AnnotationEntry annotationEntry) {
+ public void setAnnotationEntry(AnnotationEntry annotationEntry)
+ {
this.annotationEntry = annotationEntry;
}
- public Object getBean() {
+ public Object getBean()
+ {
return bean;
}
- public void setBean(Object bean) {
+ public void setBean(Object bean)
+ {
this.bean = bean;
}
- public UIComponent getComponent() {
+ public UIComponent getComponent()
+ {
return component;
}
- public void setComponent(UIComponent component) {
+ public void setComponent(UIComponent component)
+ {
this.component = component;
}
- public Object getConvertedObject() {
+ public Object getConvertedObject()
+ {
return convertedObject;
}
- public void setConvertedObject(Object convertedObject) {
+ public void setConvertedObject(Object convertedObject)
+ {
this.convertedObject = convertedObject;
}
- public CrossValidationStrategy getValidationStrategy() {
+ public CrossValidationStrategy getValidationStrategy()
+ {
return validationStrategy;
}
- public void setValidationStrategy(CrossValidationStrategy validationStrategy) {
+ public void setValidationStrategy(CrossValidationStrategy validationStrategy)
+ {
this.validationStrategy = validationStrategy;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java Thu Aug 14 19:13:27 2008
@@ -25,6 +25,8 @@
*
* @author Gerhard Petracek
*/
-public interface WebXmlParameter {
- static final String DEACTIVATE_CROSSVALIDATION = WebXmlUtils.getInitParameter("DEACTIVATE_CROSSVALIDATION");
+public interface WebXmlParameter
+{
+ static final String DEACTIVATE_CROSSVALIDATION = WebXmlUtils
+ .getInitParameter("DEACTIVATE_CROSSVALIDATION");
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java Thu Aug 14 19:13:27 2008
@@ -28,10 +28,11 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
//TODO DateIsEntry (value, type)
-public @interface DateIs {
+public @interface DateIs
+{
String[] valueOf();
/*
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java Thu Aug 14 19:13:27 2008
@@ -21,6 +21,8 @@
/**
* @author Gerhard Petracek
*/
-public enum DateIsType {
- before, after, same //TODO: beforeOrSame, afterOrSame
+public enum DateIsType
+{
+ before, after, same
+ //TODO: beforeOrSame, afterOrSame
}