This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch WW-5337-exclusion-performance
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 72a5d213327ab612029e5f58d1131ae116098c1f
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Aug 21 23:38:15 2023 +1000

    WW-5337 Update struts-excluded-classes.xml to not have trailing periods
---
 .../src/main/resources/struts-excluded-classes.xml | 84 +++++++++++-----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/core/src/main/resources/struts-excluded-classes.xml 
b/core/src/main/resources/struts-excluded-classes.xml
index 6e4957273..72df88c89 100644
--- a/core/src/main/resources/struts-excluded-classes.xml
+++ b/core/src/main/resources/struts-excluded-classes.xml
@@ -55,52 +55,52 @@
     <!-- constant name="struts.excludedPackageNamePatterns" 
value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / -->
     <!-- constant name="struts.devMode.excludedPackageNamePatterns" 
value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / -->
 
-    <!-- this is simpler version of the above used with string comparison -->
+    <!-- All classes within the following packages and their sub-packages are 
excluded -->
     <constant name="struts.excludedPackageNames"
               value="
-                ognl.,
-                java.io.,
-                java.net.,
-                java.nio.,
-                javax.,
-                freemarker.core.,
-                freemarker.template.,
-                freemarker.ext.jsp.,
-                freemarker.ext.rhino.,
-                sun.misc.,
-                sun.reflect.,
-                javassist.,
-                org.apache.velocity.,
-                org.objectweb.asm.,
-                org.springframework.context.,
-                com.opensymphony.xwork2.inject.,
-                com.opensymphony.xwork2.ognl.,
-                com.opensymphony.xwork2.security.,
-                com.opensymphony.xwork2.util.,
-                org.apache.tomcat.,
-                org.apache.catalina.core.,
-                org.wildfly.extension.undertow.deployment."/>
+                ognl,
+                java.io,
+                java.net,
+                java.nio,
+                javax,
+                freemarker.core,
+                freemarker.template,
+                freemarker.ext.jsp,
+                freemarker.ext.rhino,
+                sun.misc,
+                sun.reflect,
+                javassist,
+                org.apache.velocity,
+                org.objectweb.asm,
+                org.springframework.context,
+                com.opensymphony.xwork2.inject,
+                com.opensymphony.xwork2.ognl,
+                com.opensymphony.xwork2.security,
+                com.opensymphony.xwork2.util,
+                org.apache.tomcat,
+                org.apache.catalina.core,
+                org.wildfly.extension.undertow.deployment"/>
 
     <constant name="struts.devMode.excludedPackageNames"
               value="
-                ognl.,
-                java.io.,
-                java.net.,
-                java.nio.,
-                javax.,
-                freemarker.core.,
-                freemarker.template.,
-                freemarker.ext.jsp.,
-                freemarker.ext.rhino.,
-                sun.misc.,
-                sun.reflect.,
-                javassist.,
-                org.apache.velocity.,
-                org.objectweb.asm.,
-                org.springframework.context.,
-                com.opensymphony.xwork2.inject.,
-                com.opensymphony.xwork2.ognl.,
-                com.opensymphony.xwork2.security.,
-                com.opensymphony.xwork2.util."/>
+                ognl,
+                java.io,
+                java.net,
+                java.nio,
+                javax,
+                freemarker.core,
+                freemarker.template,
+                freemarker.ext.jsp,
+                freemarker.ext.rhino,
+                sun.misc,
+                sun.reflect,
+                javassist,
+                org.apache.velocity,
+                org.objectweb.asm,
+                org.springframework.context,
+                com.opensymphony.xwork2.inject,
+                com.opensymphony.xwork2.ognl,
+                com.opensymphony.xwork2.security,
+                com.opensymphony.xwork2.util"/>
 
 </struts>

Reply via email to