Author: lukaszlenart
Date: Fri Jun 1 12:15:57 2012
New Revision: 1345102
URL: http://svn.apache.org/viewvc?rev=1345102&view=rev
Log:
WW-3834 adds missing @Inject annotations to enable OVal support for JPA
Modified:
struts/struts2/trunk/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
struts/struts2/trunk/plugins/oval/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java?rev=1345102&r1=1345101&r2=1345102&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
(original)
+++
struts/struts2/trunk/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
Fri Jun 1 12:15:57 2012
@@ -65,10 +65,11 @@ public class OValValidationInterceptor e
}
/**
- * Enable OVal support fopr JPA
+ * Enable OVal support for JPA
*/
- public void setValidateJPAAnnotations(boolean validateJPAAnnotations) {
- this.validateJPAAnnotations = validateJPAAnnotations;
+ @Inject(value = "struts.oval.validateJPAAnnotations")
+ public void setValidateJPAAnnotations(String validateJPAAnnotations) {
+ this.validateJPAAnnotations =
Boolean.parseBoolean(validateJPAAnnotations);
}
/**
Modified: struts/struts2/trunk/plugins/oval/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/src/main/resources/struts-plugin.xml?rev=1345102&r1=1345101&r2=1345102&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/oval/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/oval/src/main/resources/struts-plugin.xml Fri
Jun 1 12:15:57 2012
@@ -22,43 +22,47 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+ "http://struts.apache.org/dtds/struts-2.3.dtd";>
<struts>
- <bean type="org.apache.struts2.oval.interceptor.OValValidationManager"
class="org.apache.struts2.oval.interceptor.DefaultOValValidationManager" />
- <constant name="struts.oval.validateJPAAnnotations" value="false" />
-
+
+ <bean type="org.apache.struts2.oval.interceptor.OValValidationManager"
+
class="org.apache.struts2.oval.interceptor.DefaultOValValidationManager"/>
+
+ <constant name="struts.oval.validateJPAAnnotations" value="false"/>
+
<package name="oval-default" extends="struts-default">
- <interceptors>
- <interceptor name="ovalValidation"
class="org.apache.struts2.oval.interceptor.OValValidationInterceptor" />
+ <interceptors>
+ <interceptor name="ovalValidation"
class="org.apache.struts2.oval.interceptor.OValValidationInterceptor"/>
- <interceptor-stack name="ovalValidationStack">
- <interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="i18n"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="profiling"/>
- <interceptor-ref name="scopedModelDriven"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="checkbox"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">dojo\..*,^struts\..*</param>
- </interceptor-ref>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="ovalValidation">
- <param
name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param
name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- </interceptor-stack>
- </interceptors>
+ <interceptor-stack name="ovalValidationStack">
+ <interceptor-ref name="exception"/>
+ <interceptor-ref name="alias"/>
+ <interceptor-ref name="servletConfig"/>
+ <interceptor-ref name="i18n"/>
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="debugging"/>
+ <interceptor-ref name="profiling"/>
+ <interceptor-ref name="scopedModelDriven"/>
+ <interceptor-ref name="modelDriven"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="checkbox"/>
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="actionMappingParams"/>
+ <interceptor-ref name="params">
+ <param name="excludeParams">dojo\..*,^struts\..*</param>
+ </interceptor-ref>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="ovalValidation">
+ <param
name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param
name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ </interceptor-stack>
+ </interceptors>
</package>
+
</struts>
