You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2009/07/02 23:41:10 UTC
svn commit: r790742 [2/2] - in
/geronimo/external/trunk/tomcat-parent-6.0.20: ./
catalina-ha/src/main/java/org/apache/catalina/ha/
catalina/src/main/java/org/apache/catalina/
catalina/src/main/java/org/apache/catalina/core/
catalina/src/main/java/org/a...
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml Thu Jul 2 21:41:08 2009
@@ -41,9 +41,9 @@
is="true"
type="boolean"/>
- <attribute name="annotationProcessor"
- description="Object that processes things like injection annotations"
- type="org.apache.AnnotationProcessor" />
+ <attribute name="instanceManager"
+ description="Object that creates and destroys servlets, filters, and listeners. Include dependency injection and postConstruct/preDestory handling"
+ type="org.apache.catalina.instanceManagement.InstanceManager" />
<attribute name="antiJARLocking"
description="Take care to not lock jar files"
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties Thu Jul 2 21:41:08 2009
@@ -25,7 +25,6 @@
invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
invokerServlet.noWrapper=Container has not called setWrapper() for this servlet
webdavservlet.jaxpfailed=JAXP initialization failed
-webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID {0} and SystemID {1} which was ignored
directory.filename=Filename
directory.lastModified=Last Modified
directory.parent=Up To {0}
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings.properties:783483-783555
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties:783483-783555
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/java/org/apache/el/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache/el:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache/el:783483-783555
/tomcat/trunk/java/org/apache/el:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper:783483-783555
/tomcat/trunk/java/org/apache/jasper:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/Constants.java?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/Constants.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/Constants.java Thu Jul 2 21:41:08 2009
@@ -205,4 +205,7 @@
System.getProperty("org.apache.catalina.SESSION_PARAMETER_NAME",
"jsessionid");
+ public static final boolean USE_INSTANCE_MANAGER_FOR_TAGS =
+ Boolean.valueOf(System.getProperty("org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS", "false")).booleanValue();
+
}
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/JspCompilationContext.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/JspCompilationContext.java?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/JspCompilationContext.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/JspCompilationContext.java Thu Jul 2 21:41:08 2009
@@ -609,12 +609,7 @@
try {
getJspLoader();
- String name;
- if (isTagFile()) {
- name = tagInfo.getTagClassName();
- } else {
- name = getServletPackageName() + "." + getServletClassName();
- }
+ String name = getFQCN();
servletClass = jspLoader.loadClass(name);
} catch (ClassNotFoundException cex) {
throw new JasperException(Localizer.getMessage("jsp.error.unable.load"),
@@ -627,6 +622,16 @@
return servletClass;
}
+ public String getFQCN() {
+ String name;
+ if (isTagFile()) {
+ name = tagInfo.getTagClassName();
+ } else {
+ name = getServletPackageName() + "." + getServletClassName();
+ }
+ return name;
+ }
+
// ==================== protected methods ====================
static Object outputDirLock = new Object();
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/compiler/Generator.java?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/compiler/Generator.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/compiler/Generator.java Thu Jul 2 21:41:08 2009
@@ -74,8 +74,8 @@
private static final String VAR_EXPRESSIONFACTORY =
System.getProperty("org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY", "_el_expressionfactory");
- private static final String VAR_ANNOTATIONPROCESSOR =
- System.getProperty("org.apache.jasper.compiler.Generator.VAR_ANNOTATIONPROCESSOR", "_jsp_annotationprocessor");
+ private static final String VAR_INSTANCEMANAGER =
+ System.getProperty("org.apache.jasper.compiler.Generator.VAR_INSTANCEMANAGER", "_jsp_instancemanager");
private ServletWriter out;
@@ -420,14 +420,14 @@
}
out.println(".getServletContext()).getExpressionFactory();");
- out.printin(VAR_ANNOTATIONPROCESSOR);
- out.print(" = (org.apache.AnnotationProcessor) ");
+ out.printin(VAR_INSTANCEMANAGER);
+ out.print(" = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(");
if (ctxt.isTagFile()) {
out.print("config");
} else {
out.print("getServletConfig()");
}
- out.println(".getServletContext().getAttribute(org.apache.AnnotationProcessor.class.getName());");
+ out.println(");");
out.popIndent();
out.printil("}");
@@ -531,8 +531,8 @@
out.printin("private javax.el.ExpressionFactory ");
out.print(VAR_EXPRESSIONFACTORY);
out.println(";");
- out.printin("private org.apache.AnnotationProcessor ");
- out.print(VAR_ANNOTATIONPROCESSOR);
+ out.printin("private org.apache.InstanceManager ");
+ out.print(VAR_INSTANCEMANAGER);
out.println(";");
out.println();
}
@@ -2202,11 +2202,11 @@
String tagHandlerClassName = JspUtil
.getCanonicalName(tagHandlerClass);
- out.printin(tagHandlerClassName);
- out.print(" ");
- out.print(tagHandlerVar);
- out.print(" = ");
if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
+ out.printin(tagHandlerClassName);
+ out.print(" ");
+ out.print(tagHandlerVar);
+ out.print(" = ");
out.print("(");
out.print(tagHandlerClassName);
out.print(") ");
@@ -2215,14 +2215,7 @@
out.print(tagHandlerClassName);
out.println(".class);");
} else {
- out.print("new ");
- out.print(tagHandlerClassName);
- out.println("();");
- out.printin("org.apache.jasper.runtime.AnnotationHelper.postConstruct(");
- out.print(VAR_ANNOTATIONPROCESSOR);
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
+ writeNewInstance(tagHandlerVar, tagHandlerClassName);
}
// includes setting the context
@@ -2280,8 +2273,7 @@
out.println("[0]++;");
}
out.printin(tagHandlerVar);
- out
- .println(".setBodyContent((javax.servlet.jsp.tagext.BodyContent) out);");
+ out.println(".setBodyContent((javax.servlet.jsp.tagext.BodyContent) out);");
out.printin(tagHandlerVar);
out.println(".doInitBody();");
@@ -2307,6 +2299,40 @@
n.setEndJavaLine(out.getJavaLine());
}
+ private void writeNewInstance(String tagHandlerVar, String tagHandlerClassName) {
+ if (Constants.USE_INSTANCE_MANAGER_FOR_TAGS) {
+ out.printin(tagHandlerClassName);
+ out.print(" ");
+ out.print(tagHandlerVar);
+ out.print(" = (");
+ out.print(tagHandlerClassName);
+ out.print(")");
+ out.print(VAR_INSTANCEMANAGER);
+ out.print(".newInstance(\"");
+ out.print(tagHandlerClassName);
+ out.println("\", this.getClass().getClassLoader());");
+ } else {
+ out.printin(tagHandlerClassName);
+ out.print(" ");
+ out.print(tagHandlerVar);
+ out.print(" = (");
+ out.print("new ");
+ out.print(tagHandlerClassName);
+ out.println("());");
+ out.printin(VAR_INSTANCEMANAGER);
+ out.print(".newInstance(");
+ out.print(tagHandlerVar);
+ out.println(");");
+ }
+ }
+
+ private void writeDestroyInstance(String tagHandlerVar) {
+ out.printin(VAR_INSTANCEMANAGER);
+ out.print(".destroyInstance(");
+ out.print(tagHandlerVar);
+ out.println(");");
+ }
+
private void generateCustomEnd(Node.CustomTag n, String tagHandlerVar,
String tagEvalVar, String tagPushBodyCountVar) {
@@ -2368,11 +2394,7 @@
} else {
out.printin(tagHandlerVar);
out.println(".release();");
- out.printin("org.apache.jasper.runtime.AnnotationHelper.preDestroy(");
- out.print(VAR_ANNOTATIONPROCESSOR);
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
+ writeDestroyInstance(tagHandlerVar);
}
}
if (isTagFile || isFragment) {
@@ -2415,11 +2437,7 @@
} else {
out.printin(tagHandlerVar);
out.println(".release();");
- out.printin("org.apache.jasper.runtime.AnnotationHelper.preDestroy(");
- out.print(VAR_ANNOTATIONPROCESSOR);
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
+ writeDestroyInstance(tagHandlerVar);
}
if (n.implementsTryCatchFinally()) {
@@ -2451,21 +2469,8 @@
String tagHandlerClassName = JspUtil
.getCanonicalName(tagHandlerClass);
- out.printin(tagHandlerClassName);
- out.print(" ");
- out.print(tagHandlerVar);
- out.print(" = ");
- out.print("new ");
- out.print(tagHandlerClassName);
- out.println("();");
+ writeNewInstance(tagHandlerVar, tagHandlerClassName);
- // Resource injection
- out.printin("org.apache.jasper.runtime.AnnotationHelper.postConstruct(");
- out.print(VAR_ANNOTATIONPROCESSOR);
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
-
generateSetters(n, tagHandlerVar, handlerInfo, true);
// JspIdConsumer (after context has been set)
@@ -2518,11 +2523,7 @@
syncScriptingVars(n, VariableInfo.AT_END);
// Resource injection
- out.printin("org.apache.jasper.runtime.AnnotationHelper.preDestroy(");
- out.print(VAR_ANNOTATIONPROCESSOR);
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
+ writeDestroyInstance(tagHandlerVar);
n.setEndJavaLine(out.getJavaLine());
}
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java Thu Jul 2 21:41:08 2009
@@ -21,7 +21,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
-import org.apache.AnnotationProcessor;
+import org.apache.InstanceManager;
import org.apache.jasper.Constants;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -42,7 +42,7 @@
// index of next available tag handler
private int current;
- protected AnnotationProcessor annotationProcessor = null;
+ protected InstanceManager instanceManager = null;
public static TagHandlerPool getTagHandlerPool( ServletConfig config) {
TagHandlerPool result=null;
@@ -78,8 +78,7 @@
}
this.handlers = new Tag[maxSize];
this.current = -1;
- this.annotationProcessor =
- (AnnotationProcessor) config.getServletContext().getAttribute(AnnotationProcessor.class.getName());
+ instanceManager = InstanceManagerFactory.getInstanceManager(config);
}
/**
@@ -112,7 +111,7 @@
* @throws JspException if a tag handler cannot be instantiated
*/
public Tag get(Class handlerClass) throws JspException {
- Tag handler = null;
+ Tag handler;
synchronized( this ) {
if (current >= 0) {
handler = handlers[current--];
@@ -123,9 +122,13 @@
// Out of sync block - there is no need for other threads to
// wait for us to construct a tag for this thread.
try {
- Tag instance = (Tag) handlerClass.newInstance();
- AnnotationHelper.postConstruct(annotationProcessor, instance);
- return instance;
+ if (Constants.USE_INSTANCE_MANAGER_FOR_TAGS) {
+ return (Tag) instanceManager.newInstance(handlerClass.getName(), handlerClass.getClassLoader());
+ } else {
+ Tag instance = (Tag) handlerClass.newInstance();
+ instanceManager.newInstance(instance);
+ return instance;
+ }
} catch (Exception e) {
throw new JspException(e.getMessage(), e);
}
@@ -147,13 +150,11 @@
}
// There is no need for other threads to wait for us to release
handler.release();
- if (annotationProcessor != null) {
- try {
- AnnotationHelper.preDestroy(annotationProcessor, handler);
- } catch (Exception e) {
- log.warn("Error processing preDestroy on tag instance of "
- + handler.getClass().getName(), e);
- }
+ try {
+ instanceManager.destroyInstance(handler);
+ } catch (Exception e) {
+ log.warn("Error processing preDestroy on tag instance of "
+ + handler.getClass().getName(), e);
}
}
@@ -164,13 +165,11 @@
public synchronized void release() {
for (int i = current; i >= 0; i--) {
handlers[i].release();
- if (annotationProcessor != null) {
- try {
- AnnotationHelper.preDestroy(annotationProcessor, handlers[i]);
- } catch (Exception e) {
- log.warn("Error processing preDestroy on tag instance of "
- + handlers[i].getClass().getName(), e);
- }
+ try {
+ instanceManager.destroyInstance(handlers[i]);
+ } catch (Exception e) {
+ log.warn("Error processing preDestroy on tag instance of "
+ + handlers[i].getClass().getName(), e);
}
}
}
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=790742&r1=790741&r2=790742&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Jul 2 21:41:08 2009
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.tagext.TagInfo;
-import org.apache.AnnotationProcessor;
+import org.apache.InstanceManager;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Options;
@@ -39,6 +39,7 @@
import org.apache.jasper.compiler.JavacErrorDetail;
import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.compiler.Localizer;
+import org.apache.jasper.runtime.InstanceManagerFactory;
import org.apache.jasper.runtime.JspSourceDependent;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -68,7 +69,6 @@
private Servlet theServlet;
private String jspUri;
- private Class servletClass;
private Class tagHandlerClass;
private JspCompilationContext ctxt;
private long available = 0L;
@@ -139,15 +139,10 @@
destroy();
Servlet servlet = null;
-
+
try {
- servletClass = ctxt.load();
- servlet = (Servlet) servletClass.newInstance();
- AnnotationProcessor annotationProcessor = (AnnotationProcessor) config.getServletContext().getAttribute(AnnotationProcessor.class.getName());
- if (annotationProcessor != null) {
- annotationProcessor.processAnnotations(servlet);
- annotationProcessor.postConstruct(servlet);
- }
+ InstanceManager instanceManager = InstanceManagerFactory.getInstanceManager(config);
+ servlet = (Servlet) instanceManager.newInstance(ctxt.getFQCN(), ctxt.getJspLoader());
} catch (IllegalAccessException e) {
throw new JasperException(e);
} catch (InstantiationException e) {
@@ -423,15 +418,13 @@
public void destroy() {
if (theServlet != null) {
theServlet.destroy();
- AnnotationProcessor annotationProcessor = (AnnotationProcessor) config.getServletContext().getAttribute(AnnotationProcessor.class.getName());
- if (annotationProcessor != null) {
- try {
- annotationProcessor.preDestroy(theServlet);
- } catch (Exception e) {
- // Log any exception, since it can't be passed along
- log.error(Localizer.getMessage("jsp.error.file.not.found",
- e.getMessage()), e);
- }
+ InstanceManager instanceManager = InstanceManagerFactory.getInstanceManager(config);
+ try {
+ instanceManager.destroyInstance(theServlet);
+ } catch (Exception e) {
+ // Log any exception, since it can't be passed along
+ log.error(Localizer.getMessage("jsp.error.file.not.found",
+ e.getMessage()), e);
}
}
}
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/juli/src/main/java/org/apache/juli/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java/org/apache/juli:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/juli/src/main/java/org/apache/juli:783483-783555
/tomcat/trunk/java/org/apache/juli:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main/java/org/apache/PeriodicEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/PeriodicEventListener.java:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/shared/src/main/java/org/apache/PeriodicEventListener.java:783483-783555
/tomcat/trunk/java/org/apache/PeriodicEventListener.java:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes:783483-783555
/tomcat/trunk/java/org/apache/catalina/tribes:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 21:41:08 2009
@@ -1 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util:783483-783555
/tomcat/trunk/java/org/apache/tomcat/util:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335