cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
billbarker2003/07/05 23:16:00
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
Re-activate dropping the connection on serious protocol errors.
Also adding Remy's suggestion to check the exception, as well as checking the status
code in the commit so that we can be nice enough to tell the client that we're not
talking to them anymore if we discover the error soon enough.
Revision ChangesPath
1.70 +13 -3
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Http11Processor.java 5 Jul 2003 01:39:42 - 1.69
+++ Http11Processor.java 6 Jul 2003 06:16:00 - 1.70
@@ -635,9 +635,16 @@
thrA.setCurrentStage(threadPool, service);
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
adapter.service(request, response);
- /* Mimic httpd (currently disabled)
-error = statusDropsConnection(response.getStatus());
- */
+// Handle when the response was committed before a serious
+// error occurred. Throwing a ServletException should both
+// set the status to 500 and set the errorException.
+// If we fail here, then the response is likely already
+// committed, so we can't try and set headers.
+if(keepAlive !error) { // Avoid checking twice.
+error = response.getErrorException() != null ||
+statusDropsConnection(response.getStatus());
+}
+
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -1260,6 +1267,9 @@
keepAlive = false;
}
+// If we know that the request is bad this early, add the
+// Connection: close header.
+keepAlive = keepAlive statusDropsConnection(statusCode);
if (!keepAlive) {
response.addHeader(Connection, close);
} else if (!http11) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
billbarker2003/07/05 23:23:40
Modified:http11/src/java/org/apache/coyote/http11 Tag: coyote_10
Http11Processor.java
Log:
Port Patch for closing connections on bad requests.
Revision ChangesPath
No revision
No revision
1.55.2.2 +26 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -r1.55.2.1 -r1.55.2.2
--- Http11Processor.java 13 May 2003 22:47:00 - 1.55.2.1
+++ Http11Processor.java 6 Jul 2003 06:23:40 - 1.55.2.2
@@ -599,6 +599,15 @@
if (!error) {
try {
adapter.service(request, response);
+// Handle when the response was committed before a serious
+// error occurred. Throwing a ServletException should both
+// set the status to 500 and set the errorException.
+// If we fail here, then the response is likely already
+// committed, so we can't try and set headers.
+if(keepAlive !error) { // Avoid checking twice.
+error = response.getErrorException() != null ||
+statusDropsConnection(response.getStatus());
+}
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -1204,6 +1213,9 @@
keepAlive = false;
}
+// If we know that the request is bad this early, add the
+// Connection: close header.
+keepAlive = keepAlive statusDropsConnection(statusCode);
if (!keepAlive) {
response.addHeader(Connection, close);
} else if (!http11) {
@@ -1302,5 +1314,19 @@
}
+/**
+ * Determine if we must drop the connection because of the HTTP status
+ * code. Use the same list of codes as Apache/httpd.
+ */
+protected boolean statusDropsConnection(int status) {
+return status == 400 /* SC_BAD_REQUEST */ ||
+ status == 408 /* SC_REQUEST_TIMEOUT */ ||
+ status == 411 /* SC_LENGTH_REQUIRED */ ||
+ status == 413 /* SC_REQUEST_ENTITY_TOO_LARGE */ ||
+ status == 414 /* SC_REQUEST_URI_TOO_LARGE */ ||
+ status == 500 /* SC_INTERNAL_SERVER_ERROR */ ||
+ status == 503 /* SC_SERVICE_UNAVAILABLE */ ||
+ status == 501 /* SC_NOT_IMPLEMENTED */;
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.1.txt
billbarker2003/07/05 23:37:16 Modified:.RELEASE-NOTES-4.1.txt Log: Document fix for bug #21219. Revision ChangesPath 1.74 +6 -1 jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt Index: RELEASE-NOTES-4.1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- RELEASE-NOTES-4.1.txt 1 Jul 2003 05:42:00 - 1.73 +++ RELEASE-NOTES-4.1.txt 6 Jul 2003 06:37:16 - 1.74 @@ -926,6 +926,11 @@ [4.1.25] PureTLS SSL: Fix problems with getting the CLIENT-CERT. +[4.1.25] #21219 + Http11Processor: + Drop the client connection (nicely, if possible, rudely if not) in the + event of a serious protocol error. + Jasper Bug Fixes: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP] Build timed out - jk
This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-07-06/jakarta-tomcat-jk-native.html
Buildfile: build.xml
init:
[echo] /home/rubys
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk
[echo] linux=true solaris=${solaris} win32=${win32} hpux=${hpux}
netware=${netware}
apache20:
apache13:
iis:
netscape:
jni:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk/jni
[so] Compiling 4 out of 4
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_map.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_pool.c
/home/rubys/bin/timeout: timed out
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP] Build Failure - jakarta-tomcat-5
This email is autogenerated from the output from: http://cvs.apache.org/builds/gump/2003-07-06/jakarta-tomcat-5.html Buildfile: build.xml prepare-release: [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0 [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0/bin [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0/src init: [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/classes [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/server/lib [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib deploy-static: [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/server/lib [copy] Copying 1 file to /home/rubys/jakarta/jakarta-tomcat-5/build/server/lib BUILD FAILED /home/rubys/jakarta/jakarta-tomcat-5/build.xml:156: Warning: Could not find file /usr/local/commons-daemon/bin/jsvc.tar.gz to copy. Total time: 2 seconds - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 3 [2003/07/06]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 258|Unc|Nor|2000-11-27|response.SendRedirect() resets/destroys Cookies th| | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle| | 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/| | 4893|Unc|Blk|2001-11-15|Tomcat dies with following error..| | 4980|New|Min|2001-11-20|Startup message indicates incorrect log file | | 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu| | 5064|New|Cri|2001-11-25|Socket write error when include files is more than| | 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 | | 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r| | 5160|Unc|Maj|2001-11-28|'IllegalStateException' | | 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization | | 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv| | 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL | | 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin| | 6027|New|Maj|2002-01-25|Tomcat Automatically shuts down as service | | 6168|New|Blk|2002-02-01|IllegalStateException | | 6451|New|Cri|2002-02-14|Stackoverflow | | 6478|New|Enh|2002-02-14|Default Tomcat Encoding | | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err| | 6702|New|Cri|2002-02-27|win 2k services not working | | 6796|New|Cri|2002-03-01|Tomcat dies periodically | | 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil| | 7008|Opn|Maj|2002-03-10|facade.HttpServletRequestFacade.getParameter(HttpS| | 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact| | 7227|New|Nor|2002-03-19|error-code directive don't work | | 7236|New|Blk|2002-03-19|Permission denied to do thread.stop | | 7626|New|Nor|2002-03-29|classloader not working properly | | 7652|New|Cri|2002-04-01|Tomcat stalls periodically| | 7762|New|Enh|2002-04-05|stdout logfile handling | | 7785|New|Blk|2002-04-06|tomcat bug in context reloading | | 7789|New|Maj|2002-04-06|JSP Cookie Read/Write Fails With DNS Names| | 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS | | 8154|New|Nor|2002-04-16|logrotate script in RPM rotates non-existing file | | 8155|New|Nor|2002-04-16|Tomcat from RPM doesn't do logrotate | | 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database | | 8239|New|Cri|2002-04-18|Resource temporary unavailable| | 8263|New|Cri|2002-04-18|url-pattern easy to circumvent| | 8634|New|Nor|2002-04-30|no way to specify different modules.xml file | | 8992|New|Blk|2002-05-10|IE6/XP: Limitation of POST Area within HTTP reques| | 9086|New|Enh|2002-05-14|NPE org.apache.tomcat.core.ServerSession.setAttrib| | 9250|New|Maj|2002-05-20|outOfMemoryError | | 9362|New|Nor|2002-05-23|compiilation of JSP that includes a non-existant f| | 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession| | 9390|New|Nor|2002-05-24|jasper compilation error in tomcat| | 9480|New|Nor|2002-05-29|Data connection pooling | | 9607|New|Maj|2002-06-04|precompile JSP| | 9737|New|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |1|New|Cri|2002-06-19|IOException Broken Pipe when authenticating JDBCRe| |10039|New|Nor|2002-06-20|TimeStamp will not work correctly.|
Bug report for Tomcat 4 [2003/07/06]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 218|Unc|Nor|2000-11-02|IIS in-process tomcat BugRat Report#333 | | 234|New|Nor|2000-11-10|Can't set multiple cookies in servlet response hea| | 2885|Opn|Maj|2001-07-30|JspCompiler does not recompile changed JSP's | | 3098|Opn|Maj|2001-08-11|RequestDispatcher on relative (to request path) | | 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped | | 4091|Opn|Nor|2001-10-11|custom host with unpackWARs=true don't expand wa| | 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st| | 4350|Ass|Nor|2001-10-22|SSLAuthenticator did not associate SSO session| | 4352|Ass|Nor|2001-10-22|JDBCRealm does not work with CLIENT-CERT auth-meth| | 5143|New|Enh|2001-11-27|Please allow to specify the cipher set for HTTPS c| | 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished| | 5598|Opn|Maj|2001-12-27|(JSP Problem) RequestDispatcher doesn't include HT| | 5704|Ass|Maj|2002-01-05|CgiServlet corrupting images? | | 5715|Opn|Nor|2002-01-07|response.setContentType() in Filter.doFilter not c| | 5759|Opn|Maj|2002-01-09|CGI servlet mapping by extension *.cgi does not wo| | 5762|Opn|Maj|2002-01-09|CGI servlet misses to include port number in HTTP_| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5858|New|Enh|2002-01-15|Add tomcat dir to java.library.path | | 5952|Opn|Nor|2002-01-22|Refence to $JAVACMD in tomcat.conf incorrect in R| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6218|Opn|Nor|2002-02-04|Relative links broken for servlets| | 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out | | 6279|New|Nor|2002-02-06|Resubmit to j_security_check mistakenly fetches a | | 6399|New|Nor|2002-02-12|unknown protocol: https | | 6408|New|Enh|2002-02-12|Starting tomcat from a cygwin bash shell using 'st| | 6582|New|Min|2002-02-20|Sample code does not match behavior | | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6649|New|Nor|2002-02-25|jakarta-servletapi-4 build using java 1.4 javadoc | | 6659|New|Nor|2002-02-25|HttpUtils.getRequestURL gives incorrect URL with w| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7080|New|Maj|2002-03-13|Interbase JDBCRealm - Bug # 5564 - Have a safe fix| | 7116|New|Min|2002-03-14|JDBC realm doesn't handle NULLpasswords | | 7190|New|Nor|2002-03-18|GenericServlet spurious log's in init(), destroy()| | 7207|New|Nor|2002-03-18|Redeployment Problem under Tomcat 4.0.2 | | 7360|New|Nor|2002-03-22|res-sharing-scope not supported | | 7366|New|Enh|2002-03-22|ISAPI Redirector Replacement | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7506|New|Nor|2002-03-27|Reading InputStream returned in the following sena| | 7571|New|Nor|2002-03-28|DataInputStream readLong() Problem| | 7588|New|Nor|2002-03-28|Session cannot be established if there are multipl| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in h| | 7689|New|Min|2002-04-02|Performance problem with Xerces parser| | 7702|New|Enh|2002-04-03|[PATCH] Speed up Tomcat a tiny bit| | 7723|New|Enh|2002-04-03|[patch] additional factory for org.apache.naming.f| | 7831|New|Nor|2002-04-08|[PATCH] JNDIRealm does not work with CLIENT-CERT a| | 7880|Ver|Cri|2002-04-09|If a TLV flags flags an error during the translati| | 7968|New|Min|2002-04-11|JSSE Documentation| | 8026|New|Enh|2002-04-12|Exceptions in StandardHostDeployer.addChild are lo| |
Bug report for Watchdog [2003/07/06]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld urn should be uri BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| +-+---+---+--+--+ | Total 13 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20690] - Custom TrustManager for SSL not being used in Tomcat
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20690. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20690 Custom TrustManager for SSL not being used in Tomcat [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-07-06 21:19 --- Tomcat 4.1.24 does not use the 1.4 JDK. This has been fixed, and will be included in the 4.1.25 release later this month. As of 4.1.25, it will use the 1.4 JDK if it is available but it will not require it. In the interim, there is always the option to get the latest tomcat 4.1.x source from CVS and build it yourself. I have marked this bug as fixed, based on the assunption that using the 1.4 JDK will resolve the issue. If not, please re-open the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties
remm2003/07/06 15:56:54
Modified:jasper2/src/share/org/apache/jasper JspC.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
- Support regenerating the web.xml without manually removing the generated
servlet mappings (this fixes issues when not doing a build clean between two
compilations).
- Also remove generated web.xml fragment.
Revision ChangesPath
1.48 +26 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- JspC.java 30 Jun 2003 22:10:00 - 1.47
+++ JspC.java 6 Jul 2003 22:56:54 - 1.48
@@ -575,6 +575,10 @@
File webappBase = new File(uriRoot);
File webXml = new File(webappBase, WEB-INF/web.xml);
File webXml2 = new File(webappBase, WEB-INF/web2.xml);
+String insertStartMarker =
+Localizer.getMessage(jspc.webinc.insertStart);
+String insertEndMarker =
+Localizer.getMessage(jspc.webinc.insertEnd);
BufferedReader reader = new BufferedReader(new FileReader(webXml));
BufferedReader fragmentReader =
@@ -589,6 +593,22 @@
if (line == null) {
break;
}
+// Skip anything previously generated by JSPC
+if (line.indexOf(insertStartMarker) = 0) {
+while (true) {
+line = reader.readLine();
+if (line == null) {
+return;
+}
+if (line.indexOf(insertEndMarker) = 0) {
+line = reader.readLine();
+if (line == null) {
+return;
+}
+break;
+}
+}
+}
for (int i = 0; i insertBefore.length; i++) {
pos = line.indexOf(insertBefore[i]);
if (pos = 0)
@@ -602,6 +622,7 @@
}
}
+writer.println(insertStartMarker);
while (true) {
String line2 = fragmentReader.readLine();
if (line2 == null) {
@@ -609,6 +630,7 @@
}
writer.println(line2);
}
+writer.println(insertEndMarker);
writer.println(line.substring(pos));
@@ -640,6 +662,7 @@
fos.close();
webXml2.delete();
+(new File(webxmlFile)).delete();
}
1.119 +3 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- messages.properties 19 Jun 2003 21:06:30 - 1.118
+++ messages.properties 6 Jul 2003 22:56:54 - 1.119
@@ -238,6 +238,8 @@
resource-ref, security-constraint, login-config, security-role,\n\
env-entry, and ejb-ref elements should follow this fragment.\n\
--\n
+jspc.webinc.insertEnd=!-- JSPC servlet mappings end --
+jspc.webinc.insertStart=!-- JSPC servlet mappings start --
jspc.error.jasperException=error-the file ''{0}'' generated the following parse
exception: {1}
jspc.error.generalException=ERROR-the file ''{0}'' generated the following general
exception:
jspc.error.fileDoesNotExist=The file argument ''{0}'' does not exist
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/06 16:15:11
Modified:.build.xml
Log:
- Only include the admin webapp JARs (no JSPs or expanded generated
sources or binaries).
- Same for the manager (no more duplicate classes).
Revision ChangesPath
1.138 +4 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- build.xml 30 Jun 2003 22:16:39 - 1.137
+++ build.xml 6 Jul 2003 23:15:11 - 1.138
@@ -1085,8 +1085,10 @@
/copy
copy todir=${tomcat.dist}/server/webapps
fileset dir=${tomcat.build}/server/webapps
-exclude name=${tomcat.build}/server/webapps/admin/WEB-INF/classes/** /
-exclude name=${tomcat.build}/server/webapps/manager/WEB-INF/classes/** /
+exclude name=admin/**/*.jsp /
+exclude name=admin/WEB-INF/classes/** /
+exclude name=admin/WEB-INF/src/** /
+exclude name=manager/WEB-INF/classes/** /
/fileset
/copy
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
