You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/11/16 23:42:43 UTC
svn commit: r718133 - in /tomcat/trunk: .classpath DIFF-STATUS.txt
conf/server.xml webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 16 14:42:43 2008
New Revision: 718133
URL: http://svn.apache.org/viewvc?rev=718133&view=rev
Log:
Far faster than I was expecting - the diff is complete. Remove the temp tracking file.
Removed:
tomcat/trunk/DIFF-STATUS.txt
Modified:
tomcat/trunk/.classpath
tomcat/trunk/conf/server.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=718133&r1=718132&r2=718133&view=diff
==============================================================================
--- tomcat/trunk/.classpath (original)
+++ tomcat/trunk/.classpath Sun Nov 16 14:42:43 2008
@@ -1,27 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<classpath>
- <classpathentry excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src" path="java"/>
+ <classpathentry excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src" path="java"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar"/>
- <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="lib" path="output/extras/webservices/jaxrpc.jar"/>
Modified: tomcat/trunk/conf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=718133&r1=718132&r2=718133&view=diff
==============================================================================
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Sun Nov 16 14:42:43 2008
@@ -78,11 +78,10 @@
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
- <!--
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="conf/.keystore" />
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=718133&r1=718132&r2=718133&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Nov 16 14:42:43 2008
@@ -32,20 +32,155 @@
</properties>
<body>
-<section name="Tomcat Trunk ">
- <subsection name="bayeux">
+<section name="Tomcat Trunk">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ Switch from AnnotationProcessor to InstanceManager. Patch provided by
+ David Jecks with modifications by Remy. (remm/fhanik)
+ </update>
+ <update>
+ <rev>620845</rev> and <rev>669119</rev>. Make shutdwn address
+ configurable. (jfclere)
+ </update>
+ <fix>
+ <rev>651977</rev> Add some missing control checks to
+ <code>ThreadWithAttributes</code>. (markt)
+ </fix>
+ <fix>
+ <rev>656084</rev> Small performance improvement for NIO. (fhanik)
+ </fix>
+ <fix>
+ <rev>666232</rev> Prevent NPE during shutdown when logger has been
+ shutdown but a component continues to try to log. (fhanik)
+ </fix>
+ <add>
+ <rev>677640</rev> Add a startup class that does not require any
+ configuration files. (costin)
+ </add>
+ <fix>
+ <rev>677910</rev> Use platform mbean server by default. (costin)
+ </fix>
+ <fix>
+ <rev>700532</rev> Log if temporary file operations within the CGI
+ servlet fail. Make sure header Reader is closed on failure. (markt)
+ </fix>
+ <fix>
+ <rev>707670</rev> Correctly handle timeouts with Comet so events do not
+ stop. (fhanik)
+ </fix>
+ <fix>
+ <rev>708541</rev> Delete references to DefaultContext which was removed
+ in 6.0.x. (markt)
+ </fix>
+ <add>
+ <rev>709018</rev> Initial implementation of an asynchronous file handler
+ for JULI. (fhanik)
+ </add>
+ <fix>
+ <rev>713953</rev> Include name of attribute when logging failure of
+ session attribute serializatyion. (mturk)
+ </fix>
+ <update>
+ Improve JNDI realm compatability with Active Directory. (rjung)
+ </update>
+ <fix>
+ Give session thisAccessedTime and lastAccessedTime clear semantics.
+ (rjung)
+ </fix>
+ <add>
+ Expose thisAccessedTime via Session interface. (rjung)
+ </add>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
<changelog>
- <update><rev>691359</rev>Added in a Bayeux protocol implementation built on top of the Tomcat CometProcessor interface</update>
+ <update><rev>703017</rev> Make Java socket options consistent between NIO
+ and JIO connector. Expose all the socket options available on
+ <code>java.net.Socket</code> (fhanik)
+ </update>
+ <fix>
+ <bug>46051</bug>: The writer returned by <code>getWriter()</code> now
+ conforms to the <code>PrintWriter</code> specification and uses platform
+ dependent line endings rather than always using <code>\r\n</code>.
+ (markt)
+ </fix>
+ <add>
+ <rev>701902</rev> Add support for full client-cert chains to AJP.
+ (billbarker)
+ </add>
</changelog>
</subsection>
- <subsection name="ha">
+ <subsection name="High Availability">
<changelog>
+ <add>
+ Add support for UDP and secure communication to tribes. (fhanik)
+ </add>
+ <add>
+ Add versioning to the tribes communication protocol to support future
+ developments. (fhanik)
+ </add>
+ <add>
+ Add a demo on how to use the payload. (fhanik)
+ </add>
+ <add>
+ Started to add JMX support to the cluster implementation. (markt)
+ </add>
+ <fix>
+ <rev>609778</rev> Minor fixes to the throughput interceptor and the
+ NIO receiver. (fhanik)
+ </fix>
+ <fix>
+ <rev>630234</rev> Additional checks for the NIO receiver. (fhanik)
+ </fix>
<update>
- Update tc-native to 1.1.15 in build.properties.default (jfclere)
+ <rev>671650</rev> Improve error message when multicast is not enabled.
+ (fhanik)
</update>
+ </changelog>
+ </subsection>
+ <subsection name="Documentation">
+ <changelog>
+ <update>
+ <rev>631321</rev> Update changelog to support the <rev> element.
+ (fhanik)
+ </update>
+ </changelog>
+ </subsection>
+ <subsection name="Extras">
+ <changelog>
+ <add>
+ A new JmxRemoteLifecycleListener that can be used to fix the ports used
+ for remote JMX connections, eg when using JConsole. (markt)
+ </add>
+ </changelog>
+ </subsection>
+ <subsection name="Modules">
+ <changelog>
+ <add>
+ <rev>691359</rev> Added in a Bayeux protocol implementation built on top
+ of the Tomcat CometProcessor interface. (fhanik)
+ </add>
+ </changelog>
+ </subsection>
+ <subsection name="Other">
+ <changelog>
<fix>
- Fix that JvmrouteBinderValve can rewrite session suffix with parallel requests from same client (pero)
+ Numerous code clean-up changes including the use of generics and
+ removing unused imports, fields, parameters and methods.
</fix>
+ <update>
+ Parameterize version number throughout build scripts and source. (rjung)
+ </update>
+ </changelog>
+ </subsection>
+
+<!-- Below this line has not been reviewed as part of the 6.0.x/trunk diff. -->
+ <subsection name="ha">
+ <changelog>
+ <update>
+ Update tc-native to 1.1.15 in build.properties.default (jfclere)
+ </update>
<fix><rev>671650</rev><br/><bug>45279</bug><br/>
Close multicast socket when calling close
</fix>
@@ -59,9 +194,6 @@
</subsection>
<subsection name="Coyote">
<changelog>
- <update><rev>703017</rev>Make Java socket options consistent between NIO and JIO connector.
- Expose all the socket options available on java.net.Socket
- </update>
<fix><bug>45074</bug>Add configuration parameters in Http11AprProtocol</fix>
<update><rev>644858</rev><br/>
Inproper curly brackets cause NIO/SendFile to fail. Workaround prior to this version, set
@@ -101,11 +233,6 @@
</fix>
</changelog>
</subsection>
- <subsection name="Documentation">
- <changelog>
- <update><rev>631321</rev>Update changelog to support the <rev> element (fhanik)</update>
- </changelog>
- </subsection>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org