luehe 2003/08/06 13:04:05
Modified: jasper2/src/share/org/apache/jasper Options.java
EmbeddedServletOptions.java
jasper2/src/share/org/apache/jasper/runtime
TagHandlerPool.java
Log:
- Replaced JspServlet's "tagPoolSize" config param with the correct
"tagpoolMaxSize" in web.xml
- Removed getTagPoolSize() from Options, because tag pool size is no
longer needed at compile time
Revision Changes Path
1.16 +3 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Options.java 22 Jul 2003 21:04:45 -0000 1.15
+++ Options.java 6 Aug 2003 20:04:05 -0000 1.16
@@ -94,11 +94,6 @@
*/
public boolean isPoolingEnabled();
- /**
- * Returns the size used by all tag handler pools.
- */
- public int getTagPoolSize();
-
/**
* Are we supporting HTML mapped servlets?
*/
1.5 +3 -36
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
Index: EmbeddedServletOptions.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedServletOptions.java 22 Jul 2003 21:04:45 -0000 1.4
+++ EmbeddedServletOptions.java 6 Aug 2003 20:04:05 -0000 1.5
@@ -117,11 +117,6 @@
*/
private boolean isPoolingEnabled = true;
- /**
- * Tag handler pool size.
- */
- private int tagPoolSize;
-
/**
* Do you want support for "mapped" files? This will generate
* servlet that has a print statement per line of the JSP file.
@@ -239,13 +234,6 @@
}
/**
- * Returns the tag handler pool size.
- */
- public int getTagPoolSize() {
- return tagPoolSize;
- }
-
- /**
* Are we supporting HTML mapped servlets?
*/
public boolean getMappedFile() {
@@ -369,8 +357,6 @@
public EmbeddedServletOptions(ServletConfig config,
ServletContext context) {
- this.tagPoolSize = Constants.MAX_POOL_SIZE;
-
Enumeration enum=config.getInitParameterNames();
while( enum.hasMoreElements() ) {
String k=(String)enum.nextElement();
@@ -421,25 +407,6 @@
log.warn(Localizer.getMessage("jsp.warning.enablePooling"));
}
}
- }
-
- String tagPoolSizeParam = config.getInitParameter("tagPoolSize");
- if (tagPoolSizeParam != null) {
- try {
- this.tagPoolSize = Integer.parseInt(tagPoolSizeParam);
- if (this.tagPoolSize <= 0) {
- this.tagPoolSize = Constants.MAX_POOL_SIZE;
- if (log.isWarnEnabled()) {
- log.warn(Localizer.getMessage("jsp.warning.invalidTagPoolSize",
-
Integer.toString(Constants.MAX_POOL_SIZE)));
- }
- }
- } catch(NumberFormatException ex) {
- if (log.isWarnEnabled()) {
- log.warn(Localizer.getMessage("jsp.warning.invalidTagPoolSize",
-
Integer.toString(Constants.MAX_POOL_SIZE)));
- }
- }
}
String mapFile = config.getInitParameter("mappedfile");
1.8 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/TagHandlerPool.java
Index: TagHandlerPool.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/TagHandlerPool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TagHandlerPool.java 31 Jan 2003 03:34:45 -0000 1.7
+++ TagHandlerPool.java 6 Aug 2003 20:04:05 -0000 1.8
@@ -75,8 +75,8 @@
private Tag[] handlers;
- public static String OPTION_TAGPOOL="jasper.tagpoolClassName";
- public static String OPTION_MAXSIZE="jasper.tagpoolMaxSize";
+ public static String OPTION_TAGPOOL="tagpoolClassName";
+ public static String OPTION_MAXSIZE="tagpoolMaxSize";
// index of next available tag handler
private int current;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
