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/14 23:27:19 UTC
svn commit: r686048 [4/6] - in
/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces: ./ 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/a...
Modified: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/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_layout_myfaces/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverterAdapter.java Thu Aug 14 14:27:15 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_layout_myfaces/examples/feature-set_01/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 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_layout_myfaces/examples/feature-set_01/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/feature-set_01/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/feature-set_01/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/feature-set_01/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/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_layout_myfaces/examples/feature-set_01/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java Thu Aug 14 14:27:15 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_layout_myfaces/examples/hello_jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 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_layout_myfaces/examples/hello_jpa/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_jpa/src/main/java/org/apache/myfaces/blank/domain/Person.java Thu Aug 14 14:27:15 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_layout_myfaces/examples/hello_world/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 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_layout_myfaces/examples/hello_world/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_world/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_world/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_world/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Thu Aug 14 14:27:15 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_layout_myfaces/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/examples/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Added: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt?rev=686048&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt (added)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt Thu Aug 14 14:27:15 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt?rev=686048&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt (added)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt Thu Aug 14 14:27:15 2008
@@ -0,0 +1,16 @@
+=========================================================================
+== NOTICE file corresponding to section 4(d) of the Apache License, ==
+== Version 2.0, in this case for the Apache MyFaces Maven Plugins ==
+=========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+
+ - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
+and are licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement"
+
+See the LICENSE.txt file for information on all licenses
+associated with this software.
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml?rev=686048&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml (added)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml Thu Aug 14 14:27:15 2008
@@ -0,0 +1,277 @@
+<?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.
+-->
+<!--
+ - Parent pom of all the myfaces extensions validator subprojects
+ that help to build other myfaces projects.
+ -->
+<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>
+
+ <parent>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>6</version>
+ </parent>
+
+ <groupId>org.apache.myfaces.extensions.validator</groupId>
+ <artifactId>myfaces-extval-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache MyFaces Extensions-Validator Project Parent</name>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/EXTVAL</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>continuum</system>
+ <url>http://myfaces.zones.apache.org:8080/continuum</url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <sendOnSuccess>true</sendOnSuccess>
+ <configuration>
+ <address>commits@myfaces.apache.org</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+
+ <inceptionYear>2008</inceptionYear>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <!--
+ - Copy LICENSE.txt and NOTICE.txt so that they are included
+ - in the -javadoc jar file for the component.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc.resources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/apidocs/META-INF">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ - Make a checkstyle violation a compile error. Note that if a compile error occurs,
+ - further information can be found in target/site/checkstyle.html (present even when
+ - just the compile goal and not the site goal has been run). Note also that child
+ - projects may redeclare this plugin and provide different configuration settings
+ - to use different checks (more or less strict than the default).
+ -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>verify-style</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configLocation>default/myfaces-checks-standard.xml</configLocation>
+ <headerLocation>default/myfaces-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+
+
+ <plugin>
+ <!-- Set compile source at 1.5, since the target JSF impl is 1.2 -->
+ <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>
+ </build>
+
+ <repositories>
+ <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>
+ </repositories>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <configLocation>default/myfaces-checks-normal.xml</configLocation>
+ <headerLocation>default/myfaces-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/</url>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>apache.snapshots</id>
+ <name>Apache Maven Snapshot Repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <site>
+ <id>apache-site</id>
+ <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator</url>
+ </site>
+ </distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <!--
+ NOTE: Execute this profile like
+ mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -Prelease
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <id>getting-scm.revision</id>
+ <goals>
+ <goal>update</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <build.version>1.0.1-SNAPSHOT</build.version>
+ <jsf.version>1.1.5</jsf.version>
+ </properties>
+</project>
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/validation-modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 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_layout_myfaces/validation-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/validation-modules/property-validation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 14:27:15 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_layout_myfaces/validation-modules/property-validation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/pom.xml?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/pom.xml Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java Thu Aug 14 14:27:15 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_layout_myfaces/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_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=686048&r1=686047&r2=686048&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Thu Aug 14 14:27:15 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());
}
}
}