cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1178781 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
Date Tue, 04 Oct 2011 13:47:25 GMT
Author: dkulp
Date: Tue Oct  4 13:47:25 2011
New Revision: 1178781

URL: http://svn.apache.org/viewvc?rev=1178781&view=rev
Log:
Merged revisions 1178488 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1178488 | dkulp | 2011-10-03 14:13:05 -0400 (Mon, 03 Oct 2011) | 9 lines
  
  Merged revisions 1178465 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1178465 | gmazza | 2011-10-03 13:20:28 -0400 (Mon, 03 Oct 2011) | 1 line
    
    More polishing of http-jetty maxIdleTime definition, based on Jetty site at http://docs.codehaus.org/display/JETTY/Configuring+Connectors#ConfiguringConnectors-ConfigurationOptions
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
    cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java?rev=1178781&r1=1178780&r2=1178781&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
Tue Oct  4 13:47:25 2011
@@ -131,7 +131,7 @@ public abstract class AbstractLoggingInt
 
     /**
      * Transform the string before display. The implementation in this class 
-     * does nothing. Override this method if you want to change the contents of the 
+     * does nothing. Override this method if you wish to change the contents of the 
      * logged message before it is delivered to the output. 
      * For example, you can use this to mask out sensitive information.
      * @param originalLogString the raw log message.

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd?rev=1178781&r1=1178780&r2=1178781&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/resources/schemas/configuration/http-jetty.xsd
Tue Oct  4 13:47:25 2011
@@ -149,7 +149,7 @@
        </xs:attribute>
        <xs:attribute name="maxIdleTime" type="ptp:ParameterizedInt">
            <xs:annotation>  
-                <xs:documentation>Specifies the maximum Idle time for a jetty connecter,
the idle timer will be reset if there is any read and write action on the underlaying stream.</xs:documentation>

+                <xs:documentation>Specifies the maximum idle time for a jetty connection.
The timer is reset whenever there are any read or write actions on the underlying stream.</xs:documentation>

            </xs:annotation>
        </xs:attribute>
     </xs:complexType>



Mime
View raw message