You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/06/14 09:44:57 UTC
svn commit: r1492984 - in /tomcat/trunk/java/org/apache/catalina:
deploy/WebXml.java startup/ContextConfig.java
Author: markt
Date: Fri Jun 14 07:44:57 2013
New Revision: 1492984
URL: http://svn.apache.org/r1492984
Log:
Make flag that indicates if JAR is from webapp or container visible to
fragment processing code.
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1492984&r1=1492983&r2=1492984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri Jun 14 07:44:57 2013
@@ -597,6 +597,16 @@ public class WebXml {
public void setJarName(String jarName) { this.jarName = jarName; }
public String getJarName() { return jarName; }
+ // Is this JAR part of the application or is it a container JAR? Assume it
+ // is.
+ private boolean webappJar = true;
+ public void setWebappJar(boolean webappJar) {
+ this.webappJar = webappJar;
+ }
+ public boolean getWebappJar() {
+ return webappJar;
+ }
+
@Override
public String toString() {
StringBuilder buf = new StringBuilder(32);
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1492984&r1=1492983&r2=1492984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Jun 14 07:44:57 2013
@@ -2731,6 +2731,8 @@ public class ContextConfig implements Li
InputStream is = null;
WebXml fragment = new WebXml();
+ fragment.setWebappJar(isWebapp);
+
try {
jar = JarFactory.newInstance(url);
is = jar.getInputStream(FRAGMENT_LOCATION);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org