svn commit: r1640690 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/
Author: markt
Date: Thu Nov 20 06:38:58 2014
New Revision: 1640690
URL: http://svn.apache.org/r1640690
Log:
Fix various problems identified with flushing batched messages:
- Flush triggered by disabling batching failed to flip buffer before writing
and also failed to clear the buffer after writing was complete. This resulted
in duplicated and/or corrupted messages.
- The flush triggered by session close was too late since no writes are
permitted once the close process starts. This resulted in an exception being
thrown.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1640688
Merged /tomcat/tc8.0.x/trunk:r1640689
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1640690&r1=1640689&r2=1640690&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Thu Nov 20 06:38:58 2014
@@ -68,7 +68,7 @@ wsRemoteEndpoint.closedOutputStream=This
wsRemoteEndpoint.closedWriter=This method may not be called as the Writer has
been closed
wsRemoteEndpoint.changeType=When sending a fragmented message, all fragments
bust be of the same type
wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
-wsRemoteEndpoint.flushOnCloseFailed=Flushing batched messages before closing
the session failed
+wsRemoteEndpoint.flushOnCloseFailed=Batched messages still enabled after
session has been closed. Unable to flush remaining batched message.
wsRemoteEndpoint.invalidEncoder=The specified encoder of type [{0}] could not
be instantiated
wsRemoteEndpoint.noEncoder=No encoder specified for object of class [{0}]
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an
invalid state for called method
@@ -86,6 +86,7 @@ wsSession.duplicateHandlerBinary=A binar
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
wsSession.duplicateHandlerText=A text message handler has already been
configured
wsSession.invalidHandlerTypePong=A pong message handler must implement
MessageHandler.Basic
+wsSession.flushFailOnClose=Failed to flush batched messages on session close
wsSession.messageFailed=Unable to write the complete message as the WebSocket
connection has been closed
wsSession.sendCloseFail=Failed to send close message to remote endpoint
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not
registered with this session
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1640690&r1=1640689&r2=1640690&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Thu Nov 20 06:38:58 2014
@@ -305,13 +305,10 @@ public abstract class WsRemoteEndpointIm
boolean doWrite = false;
synchronized (messagePartLock) {
-if (Constants.OPCODE_CLOSE == mp.getOpCode()) {
-try {
-setBatchingAllowed(false);
-} catch (IOException e) {
-log.warn(sm.getString(
-"wsRemoteEndpoint.flushOnCloseFailed"), e);
-}
+if (Constants.OPCODE_CLOSE == mp.getOpCode() &&
getBatchingAllowed()) {
+// Should not happen. To late to send batched messages now
since
+// the session has been closed. Complain loudly.
+log.warn(sm.getString("wsRemoteEndpoint.flushOnCloseFailed"));
}
if (messagePartInProgress) {
// When a control message is sent while another message is
being
@@ -385,7 +382,10 @@ public abstract class WsRemoteEndpointIm
if (Constants.INTERNAL_OPCODE_FLUSH == mp.getOpCode()) {
nextFragmented = fragmented;
svn commit: r1640689 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/
Author: markt
Date: Thu Nov 20 06:35:04 2014
New Revision: 1640689
URL: http://svn.apache.org/r1640689
Log:
Fix various problems identified with flushing batched messages:
- Flush triggered by disabling batching failed to flip buffer before writing
and also failed to clear the buffer after writing was complete. This resulted
in duplicated and/or corrupted messages.
- The flush triggered by session close was too late since no writes are
permitted once the close process starts. This resulted in an exception being
thrown.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
Merged /tomcat/trunk:r1640688
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1640689&r1=1640688&r2=1640689&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Thu Nov 20 06:35:04 2014
@@ -70,7 +70,7 @@ wsRemoteEndpoint.closedOutputStream=This
wsRemoteEndpoint.closedWriter=This method may not be called as the Writer has
been closed
wsRemoteEndpoint.changeType=When sending a fragmented message, all fragments
bust be of the same type
wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
-wsRemoteEndpoint.flushOnCloseFailed=Flushing batched messages before closing
the session failed
+wsRemoteEndpoint.flushOnCloseFailed=Batched messages still enabled after
session has been closed. Unable to flush remaining batched message.
wsRemoteEndpoint.invalidEncoder=The specified encoder of type [{0}] could not
be instantiated
wsRemoteEndpoint.noEncoder=No encoder specified for object of class [{0}]
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an
invalid state for called method
@@ -88,6 +88,7 @@ wsSession.duplicateHandlerBinary=A binar
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
wsSession.duplicateHandlerText=A text message handler has already been
configured
wsSession.invalidHandlerTypePong=A pong message handler must implement
MessageHandler.Basic
+wsSession.flushFailOnClose=Failed to flush batched messages on session close
wsSession.messageFailed=Unable to write the complete message as the WebSocket
connection has been closed
wsSession.sendCloseFail=Failed to send close message to remote endpoint
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not
registered with this session
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1640689&r1=1640688&r2=1640689&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Thu Nov 20 06:35:04 2014
@@ -302,13 +302,10 @@ public abstract class WsRemoteEndpointIm
boolean doWrite = false;
synchronized (messagePartLock) {
-if (Constants.OPCODE_CLOSE == mp.getOpCode()) {
-try {
-setBatchingAllowed(false);
-} catch (IOException e) {
-log.warn(sm.getString(
-"wsRemoteEndpoint.flushOnCloseFailed"), e);
-}
+if (Constants.OPCODE_CLOSE == mp.getOpCode() &&
getBatchingAllowed()) {
+// Should not happen. To late to send batched messages now
since
+// the session has been closed. Complain loudly.
+log.warn(sm.getString("wsRemoteEndpoint.flushOnCloseFailed"));
}
if (messagePartInProgress) {
// When a control message is sent while another message is
being
@@ -382,7 +379,10 @@ public abstract class WsRemoteEndpointIm
if (Constants.INTERNAL_OPCODE_FLUSH == mp.getOpCode()) {
nextFragmented = fragmented;
nextText = text;
-do
svn commit: r1640688 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/
Author: markt
Date: Thu Nov 20 06:30:08 2014
New Revision: 1640688
URL: http://svn.apache.org/r1640688
Log:
Fix various problems identified with flushing batched messages:
- Flush triggered by disabling batching failed to flip buffer before writing
and also failed to clear the buffer after writing was complete. This resulted
in duplicated and/or corrupted messages.
- The flush triggered by session close was too late since no writes are
permitted once the close process starts. This resulted in an exception being
thrown.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1640688&r1=1640687&r2=1640688&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Thu
Nov 20 06:30:08 2014
@@ -70,7 +70,7 @@ wsRemoteEndpoint.closedOutputStream=This
wsRemoteEndpoint.closedWriter=This method may not be called as the Writer has
been closed
wsRemoteEndpoint.changeType=When sending a fragmented message, all fragments
bust be of the same type
wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
-wsRemoteEndpoint.flushOnCloseFailed=Flushing batched messages before closing
the session failed
+wsRemoteEndpoint.flushOnCloseFailed=Batched messages still enabled after
session has been closed. Unable to flush remaining batched message.
wsRemoteEndpoint.invalidEncoder=The specified encoder of type [{0}] could not
be instantiated
wsRemoteEndpoint.noEncoder=No encoder specified for object of class [{0}]
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an
invalid state for called method
@@ -88,6 +88,7 @@ wsSession.duplicateHandlerBinary=A binar
wsSession.duplicateHandlerPong=A pong message handler has already been
configured
wsSession.duplicateHandlerText=A text message handler has already been
configured
wsSession.invalidHandlerTypePong=A pong message handler must implement
MessageHandler.Basic
+wsSession.flushFailOnClose=Failed to flush batched messages on session close
wsSession.messageFailed=Unable to write the complete message as the WebSocket
connection has been closed
wsSession.sendCloseFail=Failed to send close message to remote endpoint
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not
registered with this session
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1640688&r1=1640687&r2=1640688&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Thu Nov 20 06:30:08 2014
@@ -302,13 +302,10 @@ public abstract class WsRemoteEndpointIm
boolean doWrite = false;
synchronized (messagePartLock) {
-if (Constants.OPCODE_CLOSE == mp.getOpCode()) {
-try {
-setBatchingAllowed(false);
-} catch (IOException e) {
-log.warn(sm.getString(
-"wsRemoteEndpoint.flushOnCloseFailed"), e);
-}
+if (Constants.OPCODE_CLOSE == mp.getOpCode() &&
getBatchingAllowed()) {
+// Should not happen. To late to send batched messages now
since
+// the session has been closed. Complain loudly.
+log.warn(sm.getString("wsRemoteEndpoint.flushOnCloseFailed"));
}
if (messagePartInProgress) {
// When a control message is sent while another message is
being
@@ -382,7 +379,10 @@ public abstract class WsRemoteEndpointIm
if (Constants.INTERNAL_OPCODE_FLUSH == mp.getOpCode()) {
nextFragmented = fragmented;
nextText = text;
-doWrite(mp.getEndHandler(), outputBuffer);
+outputBuffer.flip();
+SendHandler flushHandler = new OutputBufferFlushSendHandler(
+outputBuffer, mp.getEndHandler());
+doWrite(flushHandler, outputBuffer);
return;
}
@@ -836,6 +836,30 @@ public abstract class WsRemoteEndpoi
Re: [GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
"Konstantin Kolinko" wrote in message news:cabzhfvnamg1x0rtv3gyxckxq39pzbpsks6fytbfnmrbjz26...@mail.gmail.com... 2014-11-20 6:09 GMT+03:00 Bill Barker : To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html The tests fail with java/lang/UnsupportedClassVersionError: java/lang/Object : Unsupported major.minor version 52.0 In Tomcat 7 we have Gump explicitly launches Ant with Java 8 as /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main ... but apparently JUnit here is picking a different Java. I thought that using will pick Java that was used to launch Ant in accordance with default setting for that attribute [1]. Apparently this is not true and some older java is actually picked. Is it from PATH? Yes, it is picking up what ever Java is first in the $PATH. When Java-8 was installed on vmgump, the first one on the $PATH was left as Java-7. I think that when I am testing Tomcat 7 on Windows with Ant 1.9.3 the java from JAVA_HOME was used. I do not have java in my PATH. Now I wonder why it worked before. I guess we can try to default java.bin.path to use java.home instead of "". That was what I was going to try when I had a chance to test it. I haven't had Tomcat-7 checked out in a long time. [1] http://ant.apache.org/manual/Tasks/junit.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1640677 - in /tomcat/tc6.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Nov 20 05:09:29 2014
New Revision: 1640677
URL: http://svn.apache.org/r1640677
Log:
CTR: documentation and comments
Update CGI-howto.
Recommend to copy the servlet into one's own web application instead of
uncommenting it globally.
The default value for cgiPathPrefix is null. The "WEB-INF/cgi" value is the
recommended one and used in conf/web.xml example.
Merged r1640675 from tomcat/tc7.0.x/trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1640655-1640658
Merged /tomcat/tc7.0.x/trunk:r1640675
Merged /tomcat/tc8.0.x/trunk:r1640674
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=1640677&r1=1640676&r2=1640677&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Thu Nov 20 05:09:29 2014
@@ -335,7 +335,8 @@
-
+
+
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1640677&r1=1640676&r2=1640677&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Nov 20 05:09:29 2014
@@ -124,7 +124,7 @@ import org.apache.catalina.util.IOTools;
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * mailto:dev@tomcat.apache.org";>Tomcat group
[dev@tomcat.apache.org]
+ * http://tomcat.apache.org/lists.html";>Tomcat group
* with amendments.
*
*
Modified: tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml?rev=1640677&r1=1640676&r2=1640677&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml Thu Nov 20 05:09:29 2014
@@ -61,11 +61,29 @@ this servlet is mapped to the URL patter
external to the Tomcat JVM. If you are using the Java SecurityManager this
will bypass your security policy configuration in
catalina.policy.
-Remove the XML comments from around the CGI servlet and servlet-mapping
-configuration in $CATALINA_BASE/conf/web.xml.
+To enable CGI support:
-Only Contexts which are marked as privileged may use the CGI servlet (see
the
-privileged property of the Context element).
+
+There are commented-out sample servlet and servlet-mapping elements for
+CGI servlet in the default $CATALINA_BASE/conf/web.xml file.
+To enable CGI support in your web application, copy that servlet and
+servlet-mapping declarations into WEB-INF/web.xml file of your
+web application.
+
+Uncommenting the servlet and servlet-mapping in
+$CATALINA_BASE/conf/web.xml file enables CGI for all installed
+web applications at once.
+
+
+Set privileged="true" on the Context element for your
+web application.
+
+Only Contexts which are marked as privileged are allowed to use the
+CGI servlet. Note that modifying the global
$CATALINA_BASE/conf/context.xml
+file affects all web applications. See
+Context documentation for details.
+
+
@@ -76,9 +94,11 @@ configure the behaviour of the CGI servl
cgiPathPrefix - The CGI search path will start at
the web application root directory + File.separator + this prefix.
-The default cgiPathPrefix is WEB-INF/cgi
+By default there is no value, which results in the web application root
+directory being used as the search path. The recommended value is
+WEB-INF/cgi
debug - Debugging detail level for messages logged
-by this servlet. Default 0.
+by this servlet. Default is 0.
executable - The of the executable to be used to
run the script. You may explicitly set this parameter to be an empty string
if your script is itself executable (e.g. an exe file). Default is
@@ -88,13 +108,14 @@ and so on - additional arguments for the
CGI script name. By default there are no additional arguments.
parameterEncoding - Name of the parameter encoding
to be used with the CGI servlet. Default is
-System.getProperty("file.encoding","UTF-8").
+System.getProperty("file.encoding","UTF-8"). That is the system
+default encoding, or UTF-8 if that system property is not available.
passShellEnvironment - Should the shell environment
-v
svn commit: r1640675 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Nov 20 05:01:56 2014
New Revision: 1640675
URL: http://svn.apache.org/r1640675
Log:
Update CGI-howto.
Recommend to copy the servlet into one's own web application instead of
uncommenting it globally.
The default value for cgiPathPrefix is null. The "WEB-INF/cgi" value is the
recommended one and used in conf/web.xml example.
Merged r1640674 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1640655-1640658
Merged /tomcat/tc8.0.x/trunk:r1640674
Modified: tomcat/tc7.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/web.xml?rev=1640675&r1=1640674&r2=1640675&view=diff
==
--- tomcat/tc7.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc7.0.x/trunk/conf/web.xml Thu Nov 20 05:01:56 2014
@@ -317,7 +317,8 @@
-
+
+
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1640675&r1=1640674&r2=1640675&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Nov 20 05:01:56 2014
@@ -123,7 +123,7 @@ import org.apache.catalina.util.IOTools;
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * mailto:dev@tomcat.apache.org";>Tomcat group
[dev@tomcat.apache.org]
+ * http://tomcat.apache.org/lists.html";>Tomcat group
* with amendments.
*
*
Modified: tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml?rev=1640675&r1=1640674&r2=1640675&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml Thu Nov 20 05:01:56 2014
@@ -23,7 +23,6 @@
&project;
-Glenn L. Nielsen
CGI How To
@@ -61,11 +60,29 @@ this servlet is mapped to the URL patter
external to the Tomcat JVM. If you are using the Java SecurityManager this
will bypass your security policy configuration in
catalina.policy.
-Remove the XML comments from around the CGI servlet and servlet-mapping
-configuration in $CATALINA_BASE/conf/web.xml.
+To enable CGI support:
-Only Contexts which are marked as privileged may use the CGI servlet (see
the
-privileged property of the Context element).
+
+There are commented-out sample servlet and servlet-mapping elements for
+CGI servlet in the default $CATALINA_BASE/conf/web.xml file.
+To enable CGI support in your web application, copy that servlet and
+servlet-mapping declarations into WEB-INF/web.xml file of your
+web application.
+
+Uncommenting the servlet and servlet-mapping in
+$CATALINA_BASE/conf/web.xml file enables CGI for all installed
+web applications at once.
+
+
+Set privileged="true" on the Context element for your
+web application.
+
+Only Contexts which are marked as privileged are allowed to use the
+CGI servlet. Note that modifying the global
$CATALINA_BASE/conf/context.xml
+file affects all web applications. See
+Context documentation for details.
+
+
@@ -76,9 +93,11 @@ configure the behaviour of the CGI servl
cgiPathPrefix - The CGI search path will start at
the web application root directory + File.separator + this prefix.
-The default cgiPathPrefix is WEB-INF/cgi
+By default there is no value, which results in the web application root
+directory being used as the search path. The recommended value is
+WEB-INF/cgi
debug - Debugging detail level for messages logged
-by this servlet. Default 0.
+by this servlet. Default is 0.
executable - The of the executable to be used to
run the script. You may explicitly set this parameter to be an empty string
if your script is itself executable (e.g. an exe file). Default is
@@ -88,13 +107,14 @@ and so on - additional arguments for the
CGI script name. By default there are no additional arguments.
parameterEncoding - Name of the parameter encoding
to be used with the CGI servlet. Default is
-System.getProperty("file.encoding","UTF-8").
+System.getProperty("file.encoding","UTF-8"). That is the system
+default encoding, or UTF-8 if that system property is not available.
passShellEnvironment - Should th
svn commit: r1640674 - in /tomcat/tc8.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Nov 20 04:59:49 2014
New Revision: 1640674
URL: http://svn.apache.org/r1640674
Log:
Update CGI-howto.
Recommend to copy the servlet into one's own web application instead of
uncommenting it globally.
The default value for cgiPathPrefix is null. The "WEB-INF/cgi" value is the
recommended one and used in conf/web.xml example.
Merged r1640655, r1640658 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
Merged /tomcat/trunk:r1640655-1640658
Modified: tomcat/tc8.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/conf/web.xml?rev=1640674&r1=1640673&r2=1640674&view=diff
==
--- tomcat/tc8.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.0.x/trunk/conf/web.xml Thu Nov 20 04:59:49 2014
@@ -317,7 +317,8 @@
-
+
+
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1640674&r1=1640673&r2=1640674&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Nov 20 04:59:49 2014
@@ -123,7 +123,7 @@ import org.apache.catalina.util.IOTools;
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * mailto:dev@tomcat.apache.org";>Tomcat group
[dev@tomcat.apache.org]
+ * http://tomcat.apache.org/lists.html";>Tomcat group
* with amendments.
*
*
Modified: tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml?rev=1640674&r1=1640673&r2=1640674&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml Thu Nov 20 04:59:49 2014
@@ -23,7 +23,6 @@
&project;
-Glenn L. Nielsen
CGI How To
@@ -61,11 +60,29 @@ this servlet is mapped to the URL patter
external to the Tomcat JVM. If you are using the Java SecurityManager this
will bypass your security policy configuration in
catalina.policy.
-Remove the XML comments from around the CGI servlet and servlet-mapping
-configuration in $CATALINA_BASE/conf/web.xml.
+To enable CGI support:
-Only Contexts which are marked as privileged may use the CGI servlet (see
the
-privileged property of the Context element).
+
+There are commented-out sample servlet and servlet-mapping elements for
+CGI servlet in the default $CATALINA_BASE/conf/web.xml file.
+To enable CGI support in your web application, copy that servlet and
+servlet-mapping declarations into WEB-INF/web.xml file of your
+web application.
+
+Uncommenting the servlet and servlet-mapping in
+$CATALINA_BASE/conf/web.xml file enables CGI for all installed
+web applications at once.
+
+
+Set privileged="true" on the Context element for your
+web application.
+
+Only Contexts which are marked as privileged are allowed to use the
+CGI servlet. Note that modifying the global
$CATALINA_BASE/conf/context.xml
+file affects all web applications. See
+Context documentation for details.
+
+
@@ -76,9 +93,11 @@ configure the behaviour of the CGI servl
cgiPathPrefix - The CGI search path will start at
the web application root directory + File.separator + this prefix.
-The default cgiPathPrefix is WEB-INF/cgi
+By default there is no value, which results in the web application root
+directory being used as the search path. The recommended value is
+WEB-INF/cgi
debug - Debugging detail level for messages logged
-by this servlet. Default 0.
+by this servlet. Default is 0.
executable - The of the executable to be used to
run the script. You may explicitly set this parameter to be an empty string
if your script is itself executable (e.g. an exe file). Default is
@@ -88,13 +107,14 @@ and so on - additional arguments for the
CGI script name. By default there are no additional arguments.
parameterEncoding - Name of the parameter encoding
to be used with the CGI servlet. Default is
-System.getProperty("file.encoding","UTF-8").
+System.getProperty("file.encoding","UTF-8"). That is the system
+default encoding, or UTF-8 if that system property is not available.
passShellEnvironment - Should the shell environment
-variables (if any
svn commit: r1640673 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ webapps/docs/
Author: kkolinko
Date: Thu Nov 20 04:42:45 2014
New Revision: 1640673
URL: http://svn.apache.org/r1640673
Log:
Correct message that is logged when load-on-startup servlet fails to load.
It was logging context name instead of servlet name.
Also correct message key. The message belongs to StandardContext. It is not
used anywhere else. It is not used by StandardWrapper.
To test: uncomment CGIServlet in conf/web.xml and look for messages in
localhost.$DATE.log file.
Merged r1640672 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1640652
Merged /tomcat/tc8.0.x/trunk:r1640672
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Nov 20 04:42:45 2014
@@ -139,6 +139,7 @@ standardContext.isUnavailable=This appli
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStartFailed=Failed to start application Listeners
successfully
standardContext.listenerStop=Exception sending context destroyed event to
listener instance of class {0}
+standardContext.loadOnStartup.loadException=Servlet [{1}] in web application
[{0}] threw load() exception
standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/'
standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
@@ -258,7 +259,6 @@ standardWrapper.instantiate=Error instan
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
standardWrapper.jasperLoader=Using Jasper classloader for servlet {0}
standardWrapper.jspFile.format=JSP file {0} does not start with a ''/''
character
-standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.missingClass=Wrapper cannot find servlet class {0} or a class
it depends on
standardWrapper.missingLoader=Wrapper cannot find Loader for servlet {0}
standardWrapper.notChild=Wrapper container may not have child containers
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Nov 20 04:42:45 2014
@@ -227,7 +227,6 @@ standardWrapper.instantiate = Error inst
standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este
momento
standardWrapper.jasperLoader = Usando cargador de clases (classloader) de
Jasper para servlet {0}
standardWrapper.jspFile.format = El archivo JSP {0} no comienza con
car\u00E1cter ''/''
-standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de
load()
standardWrapper.missingClass = El Arropador (Wrapper) no puede hallar clase de
servlet {0} o una clase de la que depende
standardWrapper.missingLoader = El Arropador (Wrapper) no puede hallar
Cargador para servlet {0}
standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener
contenedores hijo
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1640673&r1=1640672&r2=1640673&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
Thu Nov 20 04:42:45 2014
@@ -150,7 +150,6 @@ standardWrapper.instantiate=Erreur \u00e
standardWrapper.isUnavailable=La servlet {0} est actuellemen
svn commit: r1640672 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ webapps/docs/
Author: kkolinko
Date: Thu Nov 20 04:34:51 2014
New Revision: 1640672
URL: http://svn.apache.org/r1640672
Log:
Correct message that is logged when load-on-startup servlet fails to load.
It was logging context name instead of servlet name.
Also correct message key. The message belongs to StandardContext. It is not
used anywhere else. It is not used by StandardWrapper.
To test: uncomment CGIServlet in conf/web.xml and look for messages in
localhost.$DATE.log file.
Merged r1640652 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
Merged /tomcat/trunk:r1640652
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Nov 20 04:34:51 2014
@@ -118,6 +118,7 @@ standardContext.requestListener.requestI
standardContext.isUnavailable=This application is not currently available
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStop=Exception sending context destroyed event to
listener instance of class {0}
+standardContext.loadOnStartup.loadException=Servlet [{1}] in web application
[{0}] threw load() exception
standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/'
standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
@@ -180,7 +181,6 @@ standardWrapper.destroyException=Servlet
standardWrapper.initException=Servlet.init() for servlet {0} threw exception
standardWrapper.instantiate=Error instantiating servlet class {0}
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
-standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.notChild=Wrapper container may not have child containers
standardWrapper.notClass=No servlet class has been specified for servlet {0}
standardWrapper.notContext=Parent container of a Wrapper must be a Context
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Nov 20 04:34:51 2014
@@ -140,7 +140,6 @@ standardWrapper.destroyException = Servl
standardWrapper.initException = Servlet.init() para servlet {0} lanz\u00F3
excepci\u00F3n
standardWrapper.instantiate = Error instanciando clase de servlet {0}
standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este
momento
-standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de
load()
standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener
contenedores hijo
standardWrapper.notClass = No se ha especificado clase de servlet para servlet
{0}
standardWrapper.notContext = El contenedor padre para un Arropador (Wrapper)
debe de ser un Contexto
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1640672&r1=1640671&r2=1640672&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
Thu Nov 20 04:34:51 2014
@@ -76,7 +76,6 @@ standardWrapper.destroyException="Servle
standardWrapper.initException="Servlet.init()" pour la servlet {0} a
g\u00e9n\u00e9r\u00e9 une exception
standardWrapper.instantiate=Erreur \u00e0 l''instantiation de la classe
servlet {0}
standardWrapper.
Re: [GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
2014-11-20 6:09 GMT+03:00 Bill Barker : > To whom it may engage... > > This is an automated request, but not an unsolicited one. For > more information please visit http://gump.apache.org/nagged.html, > and/or contact the folk at gene...@gump.apache.org. > > Project tomcat-tc7.0.x-test-bio has an issue affecting its community > integration. > This issue affects 1 projects. > The current state of this project is 'Failed', with reason 'Build Failed'. > For reference only, the following projects are affected by this: > - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java > Servlet 3.0, > ... > > > Full details are available at: > > http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html The tests fail with java/lang/UnsupportedClassVersionError: java/lang/Object : Unsupported major.minor version 52.0 In Tomcat 7 we have Gump explicitly launches Ant with Java 8 as /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main ... but apparently JUnit here is picking a different Java. I thought that using will pick Java that was used to launch Ant in accordance with default setting for that attribute [1]. Apparently this is not true and some older java is actually picked. Is it from PATH? I think that when I am testing Tomcat 7 on Windows with Ant 1.9.3 the java from JAVA_HOME was used. I do not have java in my PATH. Now I wonder why it worked before. I guess we can try to default java.bin.path to use java.home instead of "". [1] http://ant.apache.org/manual/Tasks/junit.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
2014-11-20 6:09 GMT+03:00 Bill Barker : > To whom it may engage... > > This is an automated request, but not an unsolicited one. For > more information please visit http://gump.apache.org/nagged.html, > and/or contact the folk at gene...@gump.apache.org. > > Project tomcat-trunk-test-apr has an issue affecting its community > integration. > This issue affects 1 projects. > The current state of this project is 'Failed', with reason 'Build Failed'. > For reference only, the following projects are affected by this: > - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java > Servlet 4.0, > ... > > > Full details are available at: > > http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html > > That said, some information snippets are provided here. > > The following annotations (debug/informational/warning/error messages) were > provided: > -DEBUG- Dependency on commons-daemon exists, no need to add for property > commons-daemon.native.src.tgz. > -DEBUG- Dependency on commons-daemon exists, no need to add for property > tomcat-native.tar.gz. > -INFO- Failed with reason build failed > -INFO- Project Reports in: > /srv/gump/public/workspace/tomcat-trunk/output/logs-APR > -INFO- Project Reports in: > /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs > > > > The following work was performed: > http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html [junit] *** Error in `/usr/lib/jvm/java-8-oracle/jre/bin/java': double free or corruption (out): 0x7f4ec816a8d0 *** [junit] Running org.apache.tomcat.websocket.TestWsWebSocketContainer [junit] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec [junit] Test org.apache.tomcat.websocket.TestWsWebSocketContainer FAILED (crashed) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1640658 - in /tomcat/trunk: conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml
Author: kkolinko
Date: Thu Nov 20 03:34:57 2014
New Revision: 1640658
URL: http://svn.apache.org/r1640658
Log:
Correct documentation for CGI servlet:
The default value for cgiPathPrefix is null. The "WEB-INF/cgi" value is the
recommended one and used in conf/web.xml example.
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/webapps/docs/cgi-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1640658&r1=1640657&r2=1640658&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov 20 03:34:57 2014
@@ -317,7 +317,8 @@
-
+
+
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1640658&r1=1640657&r2=1640658&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Nov 20
03:34:57 2014
@@ -123,7 +123,7 @@ import org.apache.catalina.util.IOTools;
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * mailto:dev@tomcat.apache.org";>Tomcat group
[dev@tomcat.apache.org]
+ * http://tomcat.apache.org/lists.html";>Tomcat group
* with amendments.
*
*
Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1640658&r1=1640657&r2=1640658&view=diff
==
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Thu Nov 20 03:34:57 2014
@@ -93,9 +93,11 @@ configure the behaviour of the CGI servl
cgiPathPrefix - The CGI search path will start at
the web application root directory + File.separator + this prefix.
-The default cgiPathPrefix is WEB-INF/cgi
+By default there is no value, which results in the web application root
+directory being used as the search path. The recommended value is
+WEB-INF/cgi
debug - Debugging detail level for messages logged
-by this servlet. Default 0.
+by this servlet. Default is 0.
executable - The of the executable to be used to
run the script. You may explicitly set this parameter to be an empty string
if your script is itself executable (e.g. an exe file). Default is
@@ -105,13 +107,14 @@ and so on - additional arguments for the
CGI script name. By default there are no additional arguments.
parameterEncoding - Name of the parameter encoding
to be used with the CGI servlet. Default is
-System.getProperty("file.encoding","UTF-8").
+System.getProperty("file.encoding","UTF-8"). That is the system
+default encoding, or UTF-8 if that system property is not available.
passShellEnvironment - Should the shell environment
-variables (if any) be passed to the CGI script? Default is
+variables from Tomcat process (if any) be passed to the CGI script? Default is
false.
stderrTimeout - The time (in milliseconds) to wait for
the reading of stderr to complete before terminating the CGI process. Default
-is 2000.
+is 2000.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1640655 - /tomcat/trunk/webapps/docs/cgi-howto.xml
Author: kkolinko Date: Thu Nov 20 03:13:00 2014 New Revision: 1640655 URL: http://svn.apache.org/r1640655 Log: Update CGI-howto. Recommend to copy the servlet into one's own web application instead of uncommenting it globally. Modified: tomcat/trunk/webapps/docs/cgi-howto.xml Modified: tomcat/trunk/webapps/docs/cgi-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1640655&r1=1640654&r2=1640655&view=diff == --- tomcat/trunk/webapps/docs/cgi-howto.xml (original) +++ tomcat/trunk/webapps/docs/cgi-howto.xml Thu Nov 20 03:13:00 2014 @@ -23,7 +23,6 @@ &project; -Glenn L. Nielsen CGI How To @@ -61,11 +60,29 @@ this servlet is mapped to the URL patter external to the Tomcat JVM. If you are using the Java SecurityManager this will bypass your security policy configuration in catalina.policy. -Remove the XML comments from around the CGI servlet and servlet-mapping -configuration in $CATALINA_BASE/conf/web.xml. +To enable CGI support: -Only Contexts which are marked as privileged may use the CGI servlet (see the -privileged property of the Context element). + +There are commented-out sample servlet and servlet-mapping elements for +CGI servlet in the default $CATALINA_BASE/conf/web.xml file. +To enable CGI support in your web application, copy that servlet and +servlet-mapping declarations into WEB-INF/web.xml file of your +web application. + +Uncommenting the servlet and servlet-mapping in +$CATALINA_BASE/conf/web.xml file enables CGI for all installed +web applications at once. + + +Set privileged="true" on the Context element for your +web application. + +Only Contexts which are marked as privileged are allowed to use the +CGI servlet. Note that modifying the global $CATALINA_BASE/conf/context.xml +file affects all web applications. See +Context documentation for details. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 9 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141120.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wo rkspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20141120.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141120.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/g
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 42 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141120/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141120.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20141120/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141120.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tom
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141120-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141120.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wor kspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20141120.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141120.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/
svn commit: r1640652 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties StandardContext.java
Author: kkolinko
Date: Thu Nov 20 02:29:16 2014
New Revision: 1640652
URL: http://svn.apache.org/r1640652
Log:
Correct message that is logged when load-on-startup servlet fails to load.
It was logging context name instead of servlet name.
Also correct message key. The message belongs to StandardContext. It is not
used anywhere else. It is not used by StandardWrapper.
To test: uncomment CGIServlet and its mapping in conf/web.xml and look for
messages in localhost.$DATE.log file.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1640652&r1=1640651&r2=1640652&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Nov
20 02:29:16 2014
@@ -118,6 +118,7 @@ standardContext.requestListener.requestI
standardContext.isUnavailable=This application is not currently available
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStop=Exception sending context destroyed event to
listener instance of class {0}
+standardContext.loadOnStartup.loadException=Servlet [{1}] in web application
[{0}] threw load() exception
standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/'
standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
@@ -180,7 +181,6 @@ standardWrapper.destroyException=Servlet
standardWrapper.initException=Servlet.init() for servlet {0} threw exception
standardWrapper.instantiate=Error instantiating servlet class {0}
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
-standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.notChild=Wrapper container may not have child containers
standardWrapper.notClass=No servlet class has been specified for servlet {0}
standardWrapper.notContext=Parent container of a Wrapper must be a Context
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1640652&r1=1640651&r2=1640652&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu
Nov 20 02:29:16 2014
@@ -140,7 +140,6 @@ standardWrapper.destroyException = Servl
standardWrapper.initException = Servlet.init() para servlet {0} lanz\u00F3
excepci\u00F3n
standardWrapper.instantiate = Error instanciando clase de servlet {0}
standardWrapper.isUnavailable = El Servlet {0} no est\u00E1 disponible en este
momento
-standardWrapper.loadException = El Servlet {0} lanz\u00F3 excepci\u00F3n de
load()
standardWrapper.notChild = El contenedor de Arropador (Wrapper) no puede tener
contenedores hijo
standardWrapper.notClass = No se ha especificado clase de servlet para servlet
{0}
standardWrapper.notContext = El contenedor padre para un Arropador (Wrapper)
debe de ser un Contexto
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1640652&r1=1640651&r2=1640652&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Thu
Nov 20 02:29:16 2014
@@ -76,7 +76,6 @@ standardWrapper.destroyException="Servle
standardWrapper.initException="Servlet.init()" pour la servlet {0} a
g\u00e9n\u00e9r\u00e9 une exception
standardWrapper.instantiate=Erreur \u00e0 l''instantiation de la classe
servlet {0}
standardWrapper.isUnavailable=La servlet {0} est actuellement indisponible
-standardWrapper.loadException=La servlet {0} a g\u00e9n\u00e9r\u00e9 une
exception "load()"
standardWrapper.notChild=L''enrobeur de conteneur (wrapper container) peut ne
pas avoir de conteneurs fils
standardWrapper.notClass=Aucune classe servlet n''a \u00e9t\u00e9
sp\u00e9cifi\u00e9e pour la servlet {0}
standardWrapper.notContext=Le conten
[Tomcat Wiki] Update of "FAQ/Developing" by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/Developing" page has been changed by KonstantinKolinko: https://wiki.apache.org/tomcat/FAQ/Developing?action=diff&rev1=18&rev2=19 Comment: Add link to Eclipse WTP FAQ 1. [[#Q3|How do I remotely debug Tomcat using NetBeans?]] 1. Other 1. [[#Q4|How do I change the monitoring interval for modified resources and application reloading?]] +1. [[#Q6|Official Eclipse IDE Web Tools FAQ for Tomcat]] == Answers == === Hacking === @@ -124, +125 @@ Interval that controls reloading of the changed JSP pages is set in the [[http://tomcat.apache.org/tomcat-7.0-doc/jasper-howto.html|Jasper configuration]] in `web.xml`. + <> + Official Eclipse IDE Web Tools FAQ for Tomcat + + Eclipse IDE has support for development of Web applications and running them on Apache Tomcat. This support is provided by [[https://projects.eclipse.org/projects/webtools|Eclipse Web Tools Platform Project]]. An easy way to get Web Tools is to download "for Java EE Developers" edition of [[http://www.eclipse.org/downloads/|Eclipse IDE]]. + + The Web Tools project has a FAQ page. + + * [[https://wiki.eclipse.org/WTP_Tomcat_FAQ| WTP Tomcat FAQ]] + * In [[http://help.eclipse.org/|Eclipse Help]] see "Web Tools Platform User Guide" > "Using the server tools" > "Testing and publishing on your server" + [[CategoryFAQ]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57216] Servlet mapping not found when creating RequestDispatcher for forward()
https://issues.apache.org/bugzilla/show_bug.cgi?id=57216 --- Comment #5 from tomcatuser2...@gmail.com --- Thanks for your prompt responses. We'll change our config to . -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1640643 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Nov 19 23:49:38 2014
New Revision: 1640643
URL: http://svn.apache.org/r1640643
Log:
Remove unneeded taskdef for task.
The announcement for Ant 1.8.2 said,
* distinction between core tasks and optional tasks is abolished"
[http://mail-archives.apache.org/mod_mbox/ant-dev/201012.mbox/%3C4D18C53F.3060700%40gmx.de%3E]
Merged r1640642 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1640322
Merged /tomcat/tc8.0.x/trunk:r1640642
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1640643&r1=1640642&r2=1640643&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Nov 19 23:49:38 2014
@@ -2775,8 +2775,6 @@ Apache Tomcat ${version} native binaries
-
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1640643&r1=1640642&r2=1640643&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 19 23:49:38 2014
@@ -84,6 +84,10 @@
Update optional Checkstyle library to 6.0. (kkolinko)
+
+Simplify setproxy task in build.xml.
+Taskdef there is not needed since Ant 1.8.2. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1640642 - in /tomcat/tc8.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Nov 19 23:45:12 2014
New Revision: 1640642
URL: http://svn.apache.org/r1640642
Log:
Remove unneeded taskdef for task.
The announcement for Ant 1.8.2 said,
* distinction between core tasks and optional tasks is abolished"
[http://mail-archives.apache.org/mod_mbox/ant-dev/201012.mbox/%3C4D18C53F.3060700%40gmx.de%3E]
Merged r1640322 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
Merged /tomcat/trunk:r1640322
Modified: tomcat/tc8.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1640642&r1=1640641&r2=1640642&view=diff
==
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Wed Nov 19 23:45:12 2014
@@ -2847,8 +2847,6 @@ Apache Tomcat ${version} native binaries
-
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1640642&r1=1640641&r2=1640642&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 19 23:45:12 2014
@@ -92,6 +92,10 @@
Update optional Checkstyle library to 6.0. (kkolinko)
+
+Simplify setproxy task in build.xml.
+Taskdef there is not needed since Ant 1.8.2. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57238] New: Updated SSL/TLS information for Tomcat 8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=57238 Bug ID: 57238 Summary: Updated SSL/TLS information for Tomcat 8/9 Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: g...@organicdesign.org Created attachment 32218 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32218&action=edit A documentation diff made using git-svn diff. ssl-howto.html: Added TLS to the title and updated to say SSL/TLS in a few places and to acknowledge that SSL is obsolete since the POODLE attack this year, and that Transport Layer Security (TLS) has replaced it. Didn't go crazy because all the Tomcat settings are still called sslWhatever. Linked to the security-howto.html document. security-howto.html: Added that the ciphers attribute supports OpenSSL syntax, plus an example attribute-value that works well today. Also added a paragraph on sslEnabledProtocols since this is the only way I know to make standalone Tomcat POODLE-proof. I may have made these changes to the Tomcat 9 docs by accident, but they apply equally well to 8 or 9 AFAIK, so maybe someone could merge them appropriately? Christopher Schultz suggested on the Tomcat Users list 2011-11-13 that I try submitting a documentation patch here as an attachment. This is my first Tomcat Documentation Patch ever. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1636345 - in /tomcat/trunk: java/javax/el/ExpressionFactory.java java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
OK sorry for my wrong statement and thank you for your answer. Pierre 2014-11-19 17:37 GMT+01:00 Mark Thomas : > On 19/11/2014 17:00, Pierre Viret wrote: > > Hello > > > > Since this commit it is not possible anymore to build tomcat 8 with > -target > > 1.7 & -source 1.7 but we have to use 1.8. > > That statement is not correct. > > > Is it really the awaited result? > > Yes, the impact of that commit was intentional. > > > I thought that Tomcat 8 was still jdk 7 > > compatible as stated in the release notes: > > http://tomcat.apache.org/tomcat-8.0-doc/RELEASE-NOTES.txt > > Tomcat 8 always has and still is Java 7. > > > Here an error I get with 1.7 (it works without problem with target & > source > > set to 1.8): > > As expected. You are trying to build trunk (Tomcat 9) with Java 7 but > Tomcat 9 requires Java 8. > > See this commit: > http://svn.apache.org/r1636341 > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: svn commit: r1636345 - in /tomcat/trunk: java/javax/el/ExpressionFactory.java java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
On 19/11/2014 17:00, Pierre Viret wrote: > Hello > > Since this commit it is not possible anymore to build tomcat 8 with -target > 1.7 & -source 1.7 but we have to use 1.8. That statement is not correct. > Is it really the awaited result? Yes, the impact of that commit was intentional. > I thought that Tomcat 8 was still jdk 7 > compatible as stated in the release notes: > http://tomcat.apache.org/tomcat-8.0-doc/RELEASE-NOTES.txt Tomcat 8 always has and still is Java 7. > Here an error I get with 1.7 (it works without problem with target & source > set to 1.8): As expected. You are trying to build trunk (Tomcat 9) with Java 7 but Tomcat 9 requires Java 8. See this commit: http://svn.apache.org/r1636341 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1636345 - in /tomcat/trunk: java/javax/el/ExpressionFactory.java java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Hello
Since this commit it is not possible anymore to build tomcat 8 with -target
1.7 & -source 1.7 but we have to use 1.8.
Is it really the awaited result? I thought that Tomcat 8 was still jdk 7
compatible as stated in the release notes:
http://tomcat.apache.org/tomcat-8.0-doc/RELEASE-NOTES.txt
Here an error I get with 1.7 (it works without problem with target & source
set to 1.8):
src/main/java/javax/el/ExpressionFactory.java:339: error: incompatible
types: WeakReference> cannot be converted to
WeakReference>
ref = new WeakReference<>(clazz);
^
where CAP#1 is a fresh type-variable:
CAP#1 extends Object from capture of ?
1 error
Regards,
Pierre
2014-11-03 14:10 GMT+01:00 :
> Author: markt
> Date: Mon Nov 3 13:10:04 2014
> New Revision: 1636345
>
> URL: http://svn.apache.org/r1636345
> Log:
> Fix IDE warnings after switching to Java 8
>
> Modified:
> tomcat/trunk/java/javax/el/ExpressionFactory.java
> tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
> tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
>
> Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1636345&r1=1636344&r2=1636345&view=diff
>
> ==
> --- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
> +++ tomcat/trunk/java/javax/el/ExpressionFactory.java Mon Nov 3 13:10:04
> 2014
> @@ -336,7 +336,7 @@ public abstract class ExpressionFactory
> }
>
> public void setFactoryClass(Class clazz) {
> -ref = new WeakReference>(clazz);
> +ref = new WeakReference<>(clazz);
> }
> }
>
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1636345&r1=1636344&r2=1636345&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
> Mon Nov 3 13:10:04 2014
> @@ -321,23 +321,23 @@ public class PoolingConnection extends D
> @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to
> find way to avoid this
> PoolablePreparedStatement pps = new
> PoolablePreparedStatement(
> getDelegate().prepareStatement(key.getSql()),
> key, _pstmtPool, this);
> -return new
> DefaultPooledObject(pps);
> +return new DefaultPooledObject<>(pps);
> }
> -return new DefaultPooledObject(
> +return new DefaultPooledObject<>(
> new
> PoolableCallableStatement(getDelegate().prepareCall( key.getSql()), key,
> _pstmtPool, this));
> } else if (null == key.getResultSetType() && null ==
> key.getResultSetConcurrency()){
> @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to
> find way to avoid this
> PoolablePreparedStatement pps = new PoolablePreparedStatement(
> getDelegate().prepareStatement(key.getSql(),
> key.getAutoGeneratedKeys().intValue()), key, _pstmtPool, this);
> -return new
> DefaultPooledObject(pps);
> +return new DefaultPooledObject<>(pps);
> } else { // Both _resultSetType and _resultSetConcurrency are
> non-null here (both or neither are set by constructors)
> if(key.getStmtType() == StatementType.PREPARED_STATEMENT) {
> @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to
> find way to avoid this
> PoolablePreparedStatement pps = new
> PoolablePreparedStatement(getDelegate().prepareStatement(
> key.getSql(),
> key.getResultSetType().intValue(),key.getResultSetConcurrency().intValue()),
> key, _pstmtPool, this);
> -return new
> DefaultPooledObject(pps);
> +return new DefaultPooledObject<>(pps);
> }
> -return new DefaultPooledObject(
> +return new DefaultPooledObject<>(
> new PoolableCallableStatement(
> getDelegate().prepareCall(
>
> key.getSql(),key.getResultSetType().intValue(),
> key.getResultSetConcurrency().intValue()), key, _pstmtPool, this));
> }
>
> Modified:
> tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1636345&r1=1636344&r2=1636345&view=diff
>
> ==
> --- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
> (original)
> +++ tomcat/trunk/test/org/apache/coyo
[Bug 57215] Regression in Tomcat 7.0.54 after Bug 56501 with urls starting with //
https://issues.apache.org/bugzilla/show_bug.cgi?id=57215 --- Comment #4 from Mark Thomas --- Worth noting here that we have the system property org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH Regarding the fragility of canonicalContextPath.equals(candidate), better suggestions welcome. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
