Author: dkulp Date: Mon Oct 3 16:56:27 2011 New Revision: 1178453 URL: http://svn.apache.org/viewvc?rev=1178453&view=rev Log: Merged revisions 1178438 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1178438 | dkulp | 2011-10-03 12:10:31 -0400 (Mon, 03 Oct 2011) | 9 lines Merged revisions 1177480 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1177480 | ningjiang | 2011-09-29 21:53:31 -0400 (Thu, 29 Sep 2011) | 1 line CXF-3833 polish the comment of http-jetty.xsd ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) 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/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. 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=1178453&r1=1178452&r2=1178453&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 Mon Oct 3 16:56:27 2011 @@ -149,7 +149,7 @@ </xs:attribute> <xs:attribute name="maxIdleTime" type="ptp:ParameterizedInt"> <xs:annotation> - <xs:documentation>Set the maximum Idle time for a connection, the timer will be reset if there is any read and write option on the under layer stream.</xs:documentation> + <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:annotation> </xs:attribute> </xs:complexType>
