You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by cn...@apache.org on 2015/06/12 10:53:31 UTC
[01/10] struts git commit: fixed some generics related warnings and
did a little re-formatting
Repository: struts
Updated Branches:
refs/heads/master fa9cac703 -> 48b064083
fixed some generics related warnings and did a little re-formatting
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f03969da
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f03969da
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f03969da
Branch: refs/heads/master
Commit: f03969dad8c66500a4d8a70ce9f675e401f14d64
Parents: 850da63
Author: cnenning <cn...@apache.org>
Authored: Wed Jun 10 14:27:17 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Wed Jun 10 14:27:17 2015 +0200
----------------------------------------------------------------------
.../interceptor/BeanValidationInterceptor.java | 5 +++--
.../interceptor/DefaultBeanValidationManager.java | 12 +++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f03969da/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index 162e8e6..1088889 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -109,7 +109,8 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
if (action instanceof ModelDriven) {
LOG.trace("Performing validation on model..");
- constraintViolations = validator.validate(((ModelDriven) action).getModel());
+ Object model = (Object)((ModelDriven<?>) action).getModel();
+ constraintViolations = validator.validate(model);
} else {
LOG.trace("Performing validation on action..");
constraintViolations = validator.validate(action);
@@ -173,7 +174,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
/**
* This is copied from DefaultActionInvocation
*/
- protected Method getActionMethod(Class actionClass, String methodName) throws NoSuchMethodException {
+ protected Method getActionMethod(Class<?> actionClass, String methodName) throws NoSuchMethodException {
Method method;
try {
http://git-wip-us.apache.org/repos/asf/struts/blob/f03969da/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
index f03e19e..81aebf8 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
@@ -55,7 +55,7 @@ public class DefaultBeanValidationManager
private static final Logger LOG = LogManager.getLogger(DefaultBeanValidationManager.class);
- protected Class<? extends ValidationProvider> providerClass;
+ protected Class<? extends ValidationProvider<? extends Configuration<?>>> providerClass;
private ValidatorFactory validationFactory;
@@ -68,7 +68,8 @@ public class DefaultBeanValidationManager
if (StringUtils.isNotBlank(providerClassName)) {
try {
- this.providerClass = (Class<? extends ValidationProvider>) Class.forName(providerClassName);
+ this.providerClass =
+ (Class<? extends ValidationProvider<? extends Configuration<?>>>) Class.forName(providerClassName);
LOG.info(this.providerClass.getName() + " validator found");
} catch (ClassNotFoundException e) {
LOG.error("Unable to find any bean validator implementation for " + providerClassName);
@@ -80,9 +81,10 @@ public class DefaultBeanValidationManager
LOG.info("********** No bean validator class defined - Falling back to default provider **********");
}
- Configuration configuration =
- (this.providerClass != null ? Validation.byProvider(this.providerClass).configure()
- : Validation.byDefaultProvider().configure());
+ Configuration<? extends Configuration<?>> configuration =
+ this.providerClass != null
+ ? Validation.byProvider(this.providerClass).configure()
+ : Validation.byDefaultProvider().configure();
if (BooleanUtils.toBoolean(ignoreXMLConfiguration)) {
configuration.ignoreXmlConfiguration();
LOG.info("XML configurations will be ignore by Validator, to enable XML based validation, set struts.beanValidation.ignoreXMLConfiguration to false.");
[07/10] struts git commit: using java.util.Date instead of
java.sql.Date
Posted by cn...@apache.org.
using java.util.Date instead of java.sql.Date
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f3a0dcaf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f3a0dcaf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f3a0dcaf
Branch: refs/heads/master
Commit: f3a0dcaf24a784699cc6859758b23283e21b35c4
Parents: 372ce96
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:39:04 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:39:04 2015 +0200
----------------------------------------------------------------------
.../struts2/showcase/validation/BeanValidationExampleAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f3a0dcaf/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java
index b9f2b35..67190e0 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java
@@ -33,7 +33,7 @@ import org.hibernate.validator.constraints.ScriptAssert;
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.*;
-import java.sql.Date;
+import java.util.Date;
/**
* <!-- START SNIPPET: beanValidatationExample -->
[06/10] struts git commit: using ObjectFactory instead of
Class.forName()
Posted by cn...@apache.org.
using ObjectFactory instead of Class.forName()
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/372ce960
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/372ce960
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/372ce960
Branch: refs/heads/master
Commit: 372ce960e2395cdbe89c16e142e4a4f2214f7fa1
Parents: 8128ca6
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:30:38 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:30:38 2015 +0200
----------------------------------------------------------------------
.../validation/interceptor/DefaultBeanValidationManager.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/372ce960/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
index b502c33..c54cca8 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
@@ -20,7 +20,9 @@
*/
package org.apache.struts.beanvalidation.validation.interceptor;
+import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.inject.Inject;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
@@ -62,14 +64,14 @@ public class DefaultBeanValidationManager
@Inject
public DefaultBeanValidationManager(
@Inject(value = ValidatorConstants.PROVIDER_CLASS, required = false) String providerClassName,
- @Inject(value = ValidatorConstants.IGNORE_XMLCONFIGURAITION, required = false)String ignoreXMLConfiguration) {
+ @Inject(value = ValidatorConstants.IGNORE_XMLCONFIGURAITION, required = false)String ignoreXMLConfiguration,
+ @Inject(required = true) ObjectFactory objectFactory) {
super();
LOG.info("Initializing bean validation factory to get a validator");
if (StringUtils.isNotBlank(providerClassName)) {
try {
- this.providerClass =
- (Class<? extends ValidationProvider<? extends Configuration<?>>>) Class.forName(providerClassName);
+ this.providerClass = objectFactory.getClassInstance(providerClassName);
LOG.info(this.providerClass.getName() + " validator found");
} catch (ClassNotFoundException e) {
LOG.error("Unable to find any bean validator implementation for " + providerClassName);
[03/10] struts git commit: added testcase for action with method
prefixed by 'do'
Posted by cn...@apache.org.
added testcase for action with method prefixed by 'do'
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f20570a4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f20570a4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f20570a4
Branch: refs/heads/master
Commit: f20570a470d3d1d6e3c5c26437d1b7b4031fc81f
Parents: c82b4d9
Author: cnenning <cn...@apache.org>
Authored: Wed Jun 10 14:50:16 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Wed Jun 10 14:50:16 2015 +0200
----------------------------------------------------------------------
.../BeanValidationInterceptorTest.java | 15 +++++++++++++
.../actions/FieldActionDoExecute.java | 23 ++++++++++++++++++++
.../src/test/resources/bean-validation-test.xml | 4 ++++
3 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f20570a4/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
index 11aa135..a049061 100644
--- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
+++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
@@ -24,7 +24,9 @@ import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+
import org.apache.struts.beanvalidation.actions.FieldAction;
+import org.apache.struts.beanvalidation.actions.FieldActionDoExecute;
import org.apache.struts.beanvalidation.actions.FieldMatchAction;
import org.apache.struts.beanvalidation.actions.ModelDrivenAction;
@@ -133,6 +135,19 @@ public class BeanValidationInterceptorTest extends XWorkTestCase {
assertEquals(2, actionErrors.size());
}
+ public void testFieldActionDoExecute() throws Exception {
+ ActionProxy baseActionProxy = actionProxyFactory.createActionProxy("bean-validation", "fieldActionDoExecute", null, null);
+ FieldActionDoExecute action = (FieldActionDoExecute) baseActionProxy.getAction();
+ action.setTest(" ");
+ baseActionProxy.execute();
+
+ Map<String, List<String>> fieldErrors = ((ValidationAware) baseActionProxy.getAction()).getFieldErrors();
+
+ assertNotNull(fieldErrors);
+ assertEquals(1, fieldErrors.size());
+ assertTrue(fieldErrors.get("test").size() > 0);
+ }
+
@Override
protected void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/struts/blob/f20570a4/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/FieldActionDoExecute.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/FieldActionDoExecute.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/FieldActionDoExecute.java
new file mode 100644
index 0000000..8bb510e
--- /dev/null
+++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/FieldActionDoExecute.java
@@ -0,0 +1,23 @@
+package org.apache.struts.beanvalidation.actions;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ValidationAwareSupport;
+
+public class FieldActionDoExecute extends ValidationAwareSupport {
+ @NotBlank(message = "canNotBeBlank")
+ private String test;
+
+ public String doExecute() {
+ return ActionSupport.SUCCESS;
+ }
+
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/f20570a4/plugins/bean-validation/src/test/resources/bean-validation-test.xml
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/test/resources/bean-validation-test.xml b/plugins/bean-validation/src/test/resources/bean-validation-test.xml
index 3e616aa..cb44a74 100644
--- a/plugins/bean-validation/src/test/resources/bean-validation-test.xml
+++ b/plugins/bean-validation/src/test/resources/bean-validation-test.xml
@@ -34,6 +34,10 @@
<interceptor-ref name="beanValidation"/>
<result type="void"/>
</action>
+ <action name="fieldActionDoExecute" class="org.apache.struts.beanvalidation.actions.FieldActionDoExecute">
+ <interceptor-ref name="beanValidation"/>
+ <result type="void"/>
+ </action>
</package>
</xwork>
[02/10] struts git commit: fixed some typos in javadoc
Posted by cn...@apache.org.
fixed some typos in javadoc
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c82b4d96
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c82b4d96
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c82b4d96
Branch: refs/heads/master
Commit: c82b4d96916a6f6a848b9c62806a58aa33a5ab7e
Parents: f03969d
Author: cnenning <cn...@apache.org>
Authored: Wed Jun 10 14:34:59 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Wed Jun 10 14:34:59 2015 +0200
----------------------------------------------------------------------
.../apache/struts/beanvalidation/constraints/FieldMatch.java | 2 +-
.../beanvalidation/validation/constant/ValidatorConstants.java | 2 +-
.../validation/interceptor/BeanValidationInterceptor.java | 4 ++--
.../validation/interceptor/BeanValidationManager.java | 2 +-
.../validation/interceptor/DefaultBeanValidationManager.java | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c82b4d96/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java
index 69bf7c8..db40c4b 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java
@@ -34,7 +34,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- * Validation annotation to validate that two fields are equals.
+ * Validation annotation to validate that two fields are equal.
* An array of fields and their matching confirmation fields can be supplied.
* <p/>
* Example, compare 1 pair of fields:
http://git-wip-us.apache.org/repos/asf/struts/blob/c82b4d96/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java
index a0e61f7..fb4c5cd 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java
@@ -21,7 +21,7 @@
package org.apache.struts.beanvalidation.validation.constant;
/**
- * <p>Class consisting various constant values being used within
+ * <p>Class consisting of various constant values being used within
* bean validation plugin </p>
* <p/>
* <p>
http://git-wip-us.apache.org/repos/asf/struts/blob/c82b4d96/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index 1088889..47ad6f3 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -43,8 +43,8 @@ import java.util.Set;
/**
* <p>
- * Bean Validation interceptor. This Interceptor do not itself provide any Bean validation functionality but
- * works as a bridge between Bean validation implementation's like Apache Bval or Hibernate Validator and Struts2 validation mechanism.
+ * Bean Validation interceptor. This Interceptor does not itself provide any Bean validation functionality but
+ * works as a bridge between Bean validation implementations like Apache Bval or Hibernate Validator and Struts2 validation mechanism.
* </p>
* <p>
* Interceptor will create a Validation Factory based on the provider class and will validate requested method or Action
http://git-wip-us.apache.org/repos/asf/struts/blob/c82b4d96/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java
index bb52754..973c32a 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java
@@ -25,7 +25,7 @@ import javax.validation.Validator;
/**
* <p>
* Validation manager which is responsible for providing instance of {@link Validator} based on the underlying validation provider.
- * For any JSR303 complaint implementation,{@link Validator} should be implemented in thread safe way.
+ * For any JSR303 complaint implementation, {@link Validator} should be implemented in thread safe way.
* </p>
*/
public interface BeanValidationManager {
http://git-wip-us.apache.org/repos/asf/struts/blob/c82b4d96/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
index 81aebf8..09676c1 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
@@ -35,13 +35,13 @@ import javax.validation.spi.ValidationProvider;
/**
* <p>
- * This is the central class for javax.validation (JSR-303) setup in a Struts2 : It bootstraps a
- * javax.validation.ValidationFactory and exposes it through the javax.validation.Validator interface and the. When
+ * This is the central class for javax.validation (JSR-303) in a Struts2 setup : It bootstraps a
+ * javax.validation.ValidationFactory and exposes it through the javax.validation.Validator interface. When
* talking to an instance of this bean we will be talking to the default Validator of the underlying ValidatorFactory.
* </p>
* <p>
* This is very convenient in that you don't have to perform yet another call on the factory, assuming that you will
- * almost always use the default Validator anyway.You need to pass provider class in order for this plugin to hook
+ * almost always use the default Validator anyway. You need to pass provider class in order for this plugin to hook
* itself to underlying validation Factory. Any of following Validation provider can be provided using
* <code>struts.beanValidation.providerClass</code>
* <ul>
[05/10] struts git commit: small updates to logging
Posted by cn...@apache.org.
small updates to logging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8128ca6b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8128ca6b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8128ca6b
Branch: refs/heads/master
Commit: 8128ca6b603457bbebf646baaafb80d0d98ec40a
Parents: adf7133
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:28:44 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:28:44 2015 +0200
----------------------------------------------------------------------
.../validation/interceptor/DefaultBeanValidationManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8128ca6b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
index 09676c1..b502c33 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
@@ -64,7 +64,7 @@ public class DefaultBeanValidationManager
@Inject(value = ValidatorConstants.PROVIDER_CLASS, required = false) String providerClassName,
@Inject(value = ValidatorConstants.IGNORE_XMLCONFIGURAITION, required = false)String ignoreXMLConfiguration) {
super();
- LOG.info("Initializing bean validation11 factory to get a validator");
+ LOG.info("Initializing bean validation factory to get a validator");
if (StringUtils.isNotBlank(providerClassName)) {
try {
@@ -78,7 +78,7 @@ public class DefaultBeanValidationManager
}
if (this.providerClass == null) {
- LOG.info("********** No bean validator class defined - Falling back to default provider **********");
+ LOG.warn("********** No bean validator class defined - Falling back to default provider **********");
}
Configuration<? extends Configuration<?>> configuration =
@@ -87,7 +87,7 @@ public class DefaultBeanValidationManager
: Validation.byDefaultProvider().configure();
if (BooleanUtils.toBoolean(ignoreXMLConfiguration)) {
configuration.ignoreXmlConfiguration();
- LOG.info("XML configurations will be ignore by Validator, to enable XML based validation, set struts.beanValidation.ignoreXMLConfiguration to false.");
+ LOG.info("XML configurations will be ignored by Validator, to enable XML based validation, set struts.beanValidation.ignoreXMLConfiguration to false.");
}
if (configuration != null) {
this.validationFactory = configuration.buildValidatorFactory();
[10/10] struts git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/struts into asf
Posted by cn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into asf
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/48b06408
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/48b06408
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/48b06408
Branch: refs/heads/master
Commit: 48b064083186ef241776c9550f3650a06ea3c894
Parents: a1abdd8 fa9cac7
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:52:54 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:52:54 2015 +0200
----------------------------------------------------------------------
apps/blank/README.txt | 16 -
apps/blank/pom.xml | 86 -
.../src/main/java/example/ExampleSupport.java | 30 -
.../blank/src/main/java/example/HelloWorld.java | 68 -
apps/blank/src/main/java/example/Login.java | 58 -
apps/blank/src/main/java/example/YesNo.java | 5 -
apps/blank/src/main/resources/LICENSE.txt | 174 --
apps/blank/src/main/resources/NOTICE.txt | 5 -
apps/blank/src/main/resources/example.xml | 25 -
.../main/resources/example/Login-validation.xml | 16 -
.../main/resources/example/package.properties | 7 -
.../resources/example/package_es.properties | 5 -
apps/blank/src/main/resources/log4j2.xml | 15 -
apps/blank/src/main/resources/struts.xml | 35 -
.../src/main/resources/velocity.properties | 1 -
.../blank/src/main/webapp/WEB-INF/jsp/error.jsp | 15 -
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 30 -
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 -
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 -
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 -
apps/blank/src/main/webapp/WEB-INF/web.xml | 39 -
apps/blank/src/main/webapp/index.html | 10 -
.../blank/src/test/java/example/ConfigTest.java | 96 -
.../src/test/java/example/HelloWorldTest.java | 37 -
apps/blank/src/test/java/example/LoginTest.java | 55 -
apps/jboss-blank/README.txt | 16 -
apps/jboss-blank/pom.xml | 69 -
.../src/main/java/example/ExampleSupport.java | 30 -
.../src/main/java/example/HelloWorld.java | 61 -
.../src/main/java/example/Login.java | 59 -
apps/jboss-blank/src/main/resources/LICENSE.txt | 174 --
apps/jboss-blank/src/main/resources/NOTICE.txt | 5 -
apps/jboss-blank/src/main/resources/example.xml | 25 -
.../main/resources/example/Login-validation.xml | 16 -
.../main/resources/example/package.properties | 5 -
.../resources/example/package_es.properties | 5 -
apps/jboss-blank/src/main/resources/log4j2.xml | 15 -
apps/jboss-blank/src/main/resources/struts.xml | 27 -
.../src/main/resources/velocity.properties | 1 -
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 -
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 -
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 -
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 -
.../jboss-blank/src/main/webapp/WEB-INF/web.xml | 37 -
apps/jboss-blank/src/main/webapp/index.html | 10 -
.../src/test/java/example/ConfigTest.java | 96 -
.../src/test/java/example/HelloWorldTest.java | 37 -
.../src/test/java/example/LoginTest.java | 55 -
apps/mailreader/README.txt | 23 -
apps/mailreader/pom.xml | 95 -
.../src/main/java/alternate.properties | 3 -
.../src/main/java/alternate_ja.properties | 1 -
.../src/main/java/mailreader-default.xml | 47 -
.../src/main/java/mailreader-support.xml | 63 -
.../java/mailreader2/ApplicationListener.java | 234 --
.../mailreader2/AuthenticationInterceptor.java | 52 -
.../src/main/java/mailreader2/Constants.java | 128 -
.../main/java/mailreader2/Login-validation.xml | 14 -
.../src/main/java/mailreader2/Login.java | 48 -
.../src/main/java/mailreader2/Logout.java | 35 -
.../java/mailreader2/MailreaderSupport.java | 583 -----
.../mailreader2/MailreaderSupport.properties | 97 -
.../mailreader2/MailreaderSupport_ja.properties | 89 -
.../mailreader2/MailreaderSupport_ru.properties | 89 -
...egistration-Registration_save-validation.xml | 28 -
.../mailreader2/Registration-validation.xml | 32 -
.../src/main/java/mailreader2/Registration.java | 122 -
...ubscription-Subscription_save-validation.xml | 23 -
.../mailreader2/Subscription-validation.xml | 11 -
.../src/main/java/mailreader2/Subscription.java | 145 -
.../src/main/java/mailreader2/Welcome.java | 49 -
apps/mailreader/src/main/java/struts.xml | 16 -
apps/mailreader/src/main/resources/LICENSE.txt | 174 --
apps/mailreader/src/main/resources/NOTICE.txt | 5 -
apps/mailreader/src/main/resources/log4j2.xml | 16 -
.../src/main/resources/velocity.properties | 1 -
.../src/main/webapp/META-INF/context.xml | 3 -
.../src/main/webapp/WEB-INF/database.xml | 9 -
.../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 -
.../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 -
.../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 -
.../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 -
.../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 -
.../main/webapp/WEB-INF/jsp/Registration.jsp | 115 -
.../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 -
.../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 -
apps/mailreader/src/main/webapp/WEB-INF/web.xml | 47 -
.../src/main/webapp/css/mailreader.css | 46 -
apps/mailreader/src/main/webapp/index.html | 10 -
.../mailreader/src/main/webapp/struts-power.gif | Bin 1798 -> 0 bytes
apps/mailreader/src/main/webapp/tour.html | 2470 ------------------
apps/pom.xml | 3 -
96 files changed, 6866 deletions(-)
----------------------------------------------------------------------
[09/10] struts git commit: adjusted h1 to match page title
Posted by cn...@apache.org.
adjusted h1 to match page title
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a1abdd87
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a1abdd87
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a1abdd87
Branch: refs/heads/master
Commit: a1abdd873db008a7f868d5c4c803a44534770282
Parents: 95ee8a7
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:51:37 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:51:37 2015 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a1abdd87/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
index 67f375f..2210b84 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
@@ -7,7 +7,7 @@
<body>
<div class="page-header">
- <h1>Field Validation Examples</h1>
+ <h1>Bean Validation Examples</h1>
</div>
<div class="container-fluid">
[04/10] struts git commit: added some more eclipse specific
directories to .gitignore
Posted by cn...@apache.org.
added some more eclipse specific directories to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/adf7133c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/adf7133c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/adf7133c
Branch: refs/heads/master
Commit: adf7133c76c9097c4173e02f4d41e3ad883b9d92
Parents: f20570a
Author: cnenning <cn...@apache.org>
Authored: Wed Jun 10 14:54:54 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Wed Jun 10 14:54:54 2015 +0200
----------------------------------------------------------------------
.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/adf7133c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a1e20c7..bcebcd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
.classpath
.project
.settings/
+.metadata/
+Servers/
# OSX
.DS_Store
[08/10] struts git commit: fixed display of last two fields
Posted by cn...@apache.org.
fixed display of last two fields
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/95ee8a78
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/95ee8a78
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/95ee8a78
Branch: refs/heads/master
Commit: 95ee8a780c841481d05ccff09dde14816bde94a7
Parents: f3a0dca
Author: cnenning <cn...@apache.org>
Authored: Fri Jun 12 10:46:00 2015 +0200
Committer: cnenning <cn...@apache.org>
Committed: Fri Jun 12 10:46:00 2015 +0200
----------------------------------------------------------------------
.../WEB-INF/validation/successFieldValidatorsExample.jsp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/95ee8a78/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
index 12cfa30..28358b2 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
@@ -48,8 +48,12 @@
<td><s:property value="stringLengthValidatorField" /></td>
</tr>
<tr>
- <td>Regex Validator Field: <s:property value="regexValidatorField" /></td>
- <td>Field Expression Validator Field: <s:property value="fieldExpressionValidatorField" /></td>
+ <td>Regex Validator Field:</td>
+ <td><s:property value="regexValidatorField" /></td>
+ </tr>
+ <tr>
+ <td>Field Expression Validator Field: </td>
+ <td><s:property value="fieldExpressionValidatorField" /></td>
</tr>
</table>
</div>