You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/26 21:06:38 UTC
svn commit: r1613707 [1/3] - in /tomee/tomee/trunk:
container/openejb-core/src/main/resources/
tck/cdi-tomee/src/test/resources/ tomee/tomee-catalina/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
tomee/tomee-catalina/src/main/java/org/...
Author: rmannibucau
Date: Sat Jul 26 19:06:37 2014
New Revision: 1613707
URL: http://svn.apache.org/r1613707
Log:
scan myfaces/jstl a single time
Added:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEEJasperInitializer.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
tomee/tomee/trunk/tck/cdi-tomee/src/test/resources/webapps-failing.xml
tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
tomee/tomee/trunk/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions Sat Jul 26 19:06:37 2014
@@ -59,6 +59,7 @@ dom4j
ecj-
el-api
eclipselink-
+ehcache-
FastInfoset
fleece-core
fleece-mapper
Modified: tomee/tomee/trunk/tck/cdi-tomee/src/test/resources/webapps-failing.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-tomee/src/test/resources/webapps-failing.xml?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-tomee/src/test/resources/webapps-failing.xml (original)
+++ tomee/tomee/trunk/tck/cdi-tomee/src/test/resources/webapps-failing.xml Sat Jul 26 19:06:37 2014
@@ -20,10 +20,6 @@
<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
<classes>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest"/>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest"/>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.ManagerTest"/>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest"/>
<class name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest"/>
</classes>
</test>
Modified: tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/pom.xml?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/pom.xml Sat Jul 26 19:06:37 2014
@@ -111,6 +111,11 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1613707&r1=1613706&r2=1613707&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Sat Jul 26 19:06:37 2014
@@ -54,6 +54,7 @@ import org.apache.tomcat.util.digester.D
import org.apache.tomee.catalina.realm.TomEEDataSourceRealm;
import org.apache.tomee.common.NamingUtil;
import org.apache.tomee.common.ResourceFactory;
+import org.apache.tomee.jasper.TomEEJasperInitializer;
import org.apache.tomee.loader.TomcatHelper;
import org.apache.xbean.finder.IAnnotationFinder;
@@ -450,8 +451,11 @@ public class OpenEJBContextConfig extend
}
}
iterator.remove();
+ } else if ("org.apache.jasper.servlet.JasperInitializer".equals(classname)) {
+ iterator.remove();
}
}
+ initializerClassMap.put(new TomEEJasperInitializer(), new HashSet<Class<?>>());
final ClassLoader loader = context.getLoader().getClassLoader();
Added: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEEJasperInitializer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEEJasperInitializer.java?rev=1613707&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEEJasperInitializer.java (added)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEEJasperInitializer.java Sat Jul 26 19:06:37 2014
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.jasper;
+
+import org.apache.jasper.servlet.JasperInitializer;
+import org.apache.jasper.servlet.TldScanner;
+
+import javax.servlet.ServletContext;
+
+// drop it and TomEETldScanner if tomcat is able to share tld scanning
+public class TomEEJasperInitializer extends JasperInitializer {
+ @Override
+ protected TldScanner newTldScanner(final ServletContext context, final boolean namespaceAware,
+ final boolean validate, final boolean blockExternal) {
+ return new TomEETldScanner(context, namespaceAware, validate, blockExternal);
+ }
+}