struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [10/50] git commit: Defines excluded classes
Date Fri, 27 Jun 2014 11:23:38 GMT
Defines excluded classes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f84efa5f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f84efa5f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f84efa5f

Branch: refs/heads/feature/WW-4295-localization
Commit: f84efa5f42a31ecbcbe3eba28653a57829e598b8
Parents: cdfb94d
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Sat May 3 20:18:44 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Sat May 3 20:18:44 2014 +0200

----------------------------------------------------------------------
 core/src/main/resources/struts-default.xml         | 2 +-
 xwork-core/src/test/resources/xwork-param-test.xml | 2 +-
 xwork-core/src/test/resources/xwork-test-beans.xml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 7cb687e..0e4c419 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -38,7 +38,7 @@
 
 <struts>
 
-    <constant name="struts.excludedProperties" value="getClass,class,hashCode,toString,clone,equals,finalize,notify,notifyAll,wait"
/>
+    <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter"
/>
 
     <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
     <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory"
/>

http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/xwork-core/src/test/resources/xwork-param-test.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-param-test.xml b/xwork-core/src/test/resources/xwork-param-test.xml
index 3ca616a..01787f7 100644
--- a/xwork-core/src/test/resources/xwork-param-test.xml
+++ b/xwork-core/src/test/resources/xwork-param-test.xml
@@ -4,5 +4,5 @@
 
 <xwork>
 	<constant name="devMode" value="true" />
-    <constant name="ognlExcludedProperties" value="getClass,class,hashCode,toString,clone,equals,finalize,notify,notifyAll,wait"
/>
+    <constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime" />
 </xwork>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/xwork-core/src/test/resources/xwork-test-beans.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-test-beans.xml b/xwork-core/src/test/resources/xwork-test-beans.xml
index 3fa5b28..7268ef7 100644
--- a/xwork-core/src/test/resources/xwork-test-beans.xml
+++ b/xwork-core/src/test/resources/xwork-test-beans.xml
@@ -3,11 +3,11 @@
         "http://struts.apache.org/dtds/xwork-2.0.dtd">
 
 <xwork>
-<!-- 
+<!--
 	<bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
 	<bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
 	<constant name="devMode" value="false" />
-	
+
 	<bean type="com.opensymphony.xwork2.util.ValueStackFactory"
     	  class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
     <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
@@ -15,11 +15,11 @@
     <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
           class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
     <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
-    <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" 
+    <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
     	  class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer" />
 -->
     <!--  static injections -->
-    <!-- 
+    <!--
     <bean class="com.opensymphony.xwork2.ognl.OgnlValueStack" static="true"/>
     <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" static="true"/>
     <bean class="com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory" static="true"
/>


Mime
View raw message