Author: dblevins
Date: Tue Apr 24 03:17:29 2012
New Revision: 1329535
URL: http://svn.apache.org/viewvc?rev=1329535&view=rev
Log:
TOMEE-164: Optimization on reading built-in tld files
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1329535&r1=1329534&r2=1329535&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Tue Apr 24 03:17:29 2012
@@ -29,6 +29,7 @@ import org.apache.openejb.jee.FacesConfi
import org.apache.openejb.jee.HandlerChains;
import org.apache.openejb.jee.JavaWsdlMapping;
import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.Listener;
import org.apache.openejb.jee.TldTaglib;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.jee.Webservices;
@@ -646,6 +647,16 @@ public class ReadDescriptors implements
}
public static TldTaglib readTldTaglib(URL url) throws OpenEJBException {
+ // TOMEE-164 Optimization on reading built-in tld files
+ if (url.getPath().contains("jstl-1.2.jar")) return new TldTaglib();
+ if (url.getPath().contains("myfaces-impl")) {
+ final TldTaglib taglib = new TldTaglib();
+ final Listener listener = new Listener();
+
listener.setListenerClass("org.apache.myfaces.webapp.StartupServletContextListener");
+ taglib.getListener().add(listener);
+ return taglib;
+ }
+
TldTaglib tldTaglib;
try {
tldTaglib = (TldTaglib)
JaxbJavaee.unmarshalTaglib(TldTaglib.class, IO.read(url));
Modified:
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1329535&r1=1329534&r2=1329535&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Tue Apr 24 03:17:29 2012
@@ -86,7 +86,7 @@ public class Container {
final ExecutorService executor = Executors.newFixedThreadPool(4, new
DaemonThreadFactory("warmup"));
executor.execute(new JaxbJavaeeLoad(WebApp.class));
- executor.execute(new JaxbJavaeeLoad(TldTaglib.class));
+// executor.execute(new JaxbJavaeeLoad(TldTaglib.class));
executor.execute(new Runnable() {
@Override
public void run() {
