tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1556750 - in /tomee/tomee/trunk: container/openejb-loader/pom.xml tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
Date Thu, 09 Jan 2014 07:20:02 GMT
Author: rmannibucau
Date: Thu Jan  9 07:20:02 2014
New Revision: 1556750

URL: http://svn.apache.org/r1556750
Log:
TOMEE-1104 tomcat 7.0.50 tld handling changed + avoid mvn warning

Modified:
    tomee/tomee/trunk/container/openejb-loader/pom.xml
    tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java

Modified: tomee/tomee/trunk/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/pom.xml?rev=1556750&r1=1556749&r2=1556750&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-loader/pom.xml Thu Jan  9 07:20:02 2014
@@ -45,6 +45,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
+		<version>2.3</version>
       </plugin>
     </plugins>
   </reporting>

Modified: tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?rev=1556750&r1=1556749&r2=1556750&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
(original)
+++ tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
Thu Jan  9 07:20:02 2014
@@ -24,7 +24,6 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.startup.TldConfig;
-import org.apache.catalina.startup.XmlErrorHandler;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.openejb.OpenEJBException;
@@ -34,6 +33,7 @@ import org.apache.openejb.loader.IO;
 import org.apache.openejb.util.URLs;
 import org.apache.openejb.util.reflection.Reflections;
 import org.apache.tomcat.JarScannerCallback;
+import org.apache.tomcat.util.descriptor.XmlErrorHandler;
 import org.apache.tomcat.util.file.Matcher;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.util.scan.Constants;
@@ -131,6 +131,8 @@ public class TomEEJarScanner extends Sta
                                 return Globals.STRICT_SERVLET_COMPLIANCE;
                             } else if ("getTldValidation".equals(method.getName())) {
                                 return Globals.STRICT_SERVLET_COMPLIANCE;
+                            } else if ("getXmlBlockExternal".equals(method.getName())) {
+                                return Globals.IS_SECURITY_ENABLED;
                             }
                             return null;
                         }



Mime
View raw message