Author: jboynes
Date: Sun Jul 21 19:51:31 2013
New Revision: 1505464
URL: http://svn.apache.org/r1505464
Log:
Add a ServletContainerInitializer for Jasper.
Does nothing yet except log that it is being executed.
Added:
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java (with
props)
tomcat/trunk/res/META-INF/jasper.jar/
tomcat/trunk/res/META-INF/jasper.jar/services/
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/conf/catalina.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1505464&r1=1505463&r2=1505464&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jul 21 19:51:31 2013
@@ -754,7 +754,8 @@
<!-- Jasper Implementation JAR File -->
<jarIt jarfile="${jasper.jar}"
filesDir="${tomcat.classes}"
- filesId="files.jasper" />
+ filesId="files.jasper"
+ meta-inf="${tomcat.manifests}/jasper.jar"/>
<!-- Jasper EL Implementation JAR File -->
<jarIt jarfile="${jasper-el.jar}"
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1505464&r1=1505463&r2=1505464&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Sun Jul 21 19:51:31 2013
@@ -92,7 +92,7 @@ tomcat.util.scan.StandardJarScanFilter.j
bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,\
catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
-jasper.jar,jasper-el.jar,ecj-*.jar,\
+jasper-el.jar,ecj-*.jar,\
tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
tomcat-jni.jar,tomcat-spdy.jar,\
tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1505464&r1=1505463&r2=1505464&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Sun
Jul 21 19:51:31 2013
@@ -395,4 +395,6 @@ jsp.tldCache.noTldInJar=No TLD files wer
jsp.tldCache.noTldSummary=At least one JAR was scanned for TLDs yet contained
no TLDs. Enable debug logging for this logger for a complete list of JARs that
were scanned but no TLDs were found in them. Skipping unneeded JARs during
scanning can improve startup time and JSP compilation time.
#ELInterpreter
-jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate
ELInterpreter class [{0}]
\ No newline at end of file
+jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate
ELInterpreter class [{0}]
+
+org.apache.jasper.servlet.JasperInitializer.onStartup=Initializing Jasper for
context [{0}]
Added: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1505464&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java (added)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Sun Jul
21 19:51:31 2013
@@ -0,0 +1,42 @@
+/*
+ * 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.jasper.servlet;
+
+import java.util.Set;
+
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.jasper.compiler.Localizer;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ * Initializer for the Jasper JSP Engine.
+ */
+public class JasperInitializer implements ServletContainerInitializer {
+ private static final String MSG =
"org.apache.jasper.servlet.JasperInitializer";
+ private static final Log LOG = LogFactory.getLog(JasperInitializer.class);
+
+ @Override
+ public void onStartup(Set<Class<?>> types, ServletContext context) throws
ServletException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(Localizer.getMessage(MSG + ".onStartup",
context.getServletContextName()));
+ }
+ }
+}
Propchange: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer?rev=1505464&view=auto
==============================================================================
---
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
(added)
+++
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
Sun Jul 21 19:51:31 2013
@@ -0,0 +1 @@
+org.apache.jasper.servlet.JasperInitializer
Added: tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml?rev=1505464&view=auto
==============================================================================
--- tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml (added)
+++ tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml Sun Jul 21 19:51:31
2013
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd";
+ version="3.1"
+ metadata-complete="true">
+ <name>org_apache_jasper</name>
+ <distributable/>
+</web-fragment>
\ No newline at end of file
Propchange: tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
