You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/09/24 14:48:18 UTC
svn commit: r1000848 - in
/myfaces/extensions/scripting/branches/1_0_prepare_2:
extscript-core-root/extscript-myfaces2-extensions/
extscript-examples/myfaces20-example/
extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myface...
Author: werpu
Date: Fri Sep 24 12:48:17 2010
New Revision: 1000848
URL: http://svn.apache.org/viewvc?rev=1000848&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-144
removing the ext-val references because they cannot be carried over to the release thanks to snapshots not being releaseable
Modified:
myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-myfaces2-extensions/pom.xml
myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/pom.xml
myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java
myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Person.java
Modified: myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-myfaces2-extensions/pom.xml?rev=1000848&r1=1000847&r2=1000848&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-myfaces2-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-myfaces2-extensions/pom.xml Fri Sep 24 12:48:17 2010
@@ -60,13 +60,14 @@
<version>1.8.0</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
<artifactId>myfaces-extval-bean-validation</artifactId>
<version>${extval.version}</version>
<scope>provided</scope>
</dependency>
-
+ -->
</dependencies>
<build>
Modified: myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/pom.xml?rev=1000848&r1=1000847&r2=1000848&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/pom.xml Fri Sep 24 12:48:17 2010
@@ -100,12 +100,13 @@
and/or MyFaces ext-val
-->
-
+ <!--
<dependency>
<groupId>org.apache.myfaces.extensions.validator</groupId>
<artifactId>myfaces-extval-core</artifactId>
<version>${extval.version}</version>
</dependency>
+ -->
<!--
<dependency>
@@ -114,14 +115,15 @@
<version>${extval.version}</version>
</dependency>
-->
-
+
+<!--
<dependency>
<groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
<artifactId>myfaces-extval-bean-validation</artifactId>
<version>${extval.version}</version>
</dependency>
+-->
-
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
Modified: myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java?rev=1000848&r1=1000847&r2=1000848&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java (original)
+++ myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java Fri Sep 24 12:48:17 2010
@@ -19,11 +19,9 @@
package org.apache.myfaces.javaloader.beanvalidationtesting;
-import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
-import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
-import org.apache.myfaces.javaloader.beanvalidationtesting.group.Admin;
-import org.apache.myfaces.javaloader.beanvalidationtesting.group.Name;
-import org.apache.myfaces.javaloader.beanvalidationtesting.group.User;
+//import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
+//import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
+import org.apache.myfaces.javaloader.beanvalidationtesting.group.*;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
@@ -44,12 +42,13 @@ import javax.validation.groups.Default;
@RequestScoped
public class Controller {
-
+ //to enable it use ext-val 2.0.4 (snapshot)
+ /*
@BeanValidation.List({
@BeanValidation(useGroups = Default.class),
@BeanValidation(viewIds = "/beanValidation.xhtml", useGroups = User.class)
- })
+ })*/
private Person person = new Person();
Modified: myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Person.java?rev=1000848&r1=1000847&r2=1000848&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Person.java (original)
+++ myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Person.java Fri Sep 24 12:48:17 2010
@@ -22,7 +22,7 @@ package org.apache.myfaces.javaloader.be
import org.apache.myfaces.javaloader.beanvalidationtesting.group.Admin;
import org.apache.myfaces.javaloader.beanvalidationtesting.group.Name;
import org.apache.myfaces.javaloader.beanvalidationtesting.group.User;
-import org.hibernate.validator.constraints.NotEmpty;
+//import org.hibernate.validator.constraints.NotEmpty;
/**
* A small testcase of ext-scripting in combination
@@ -32,22 +32,27 @@ import org.hibernate.validator.constrain
* @version $Revision$ $Date$
*/
-import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
+//import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+//import javax.validation.constraints.NotNull;
+//import javax.validation.constraints.Size;
+
+
+/**
+ * to enable it use ext-val 2.0.4-SNAPSHOT+
+ */
+//@NameConstraint(groups = Name.class)
-@NameConstraint(groups = Name.class)
public class Person {
- @NotNull(payload = ViolationSeverity.Warn.class)
+ //@NotNull(payload = ViolationSeverity.Warn.class)
private String firstName;
//demo for bean validation based validation support
- @NotNull
+ /* @NotNull
@Size.List({
@Size(min = 3, max = 8, groups = User.class),
@Size(min = 3, max = 12, groups = Admin.class)
- })
+ })*/
private String lastName;
public String getFirstName() {