Author: dkulp
Date: Thu Mar 27 12:01:02 2008
New Revision: 641942
URL: http://svn.apache.org/viewvc?rev=641942&view=rev
Log:
Merged revisions 641672 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r641672 | gmazza | 2008-03-26 21:07:08 -0400 (Wed, 26 Mar 2008) | 1 line
Typo cleanup.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=641942&r1=641941&r2=641942&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
Thu Mar 27 12:01:02 2008
@@ -26,9 +26,9 @@
import org.apache.cxf.configuration.security.TLSClientParametersType;
/**
- * This class provides the TLSServerParameters that programmatically
- * configure a HTTPDestination. It is initialized with the JAXB
- * type TLSClientParametersType which is used in Spring Configuration
+ * This class provides the TLSClientParameters that programmatically
+ * configure a HTTPConduit. It is initialized with the JAXB
+ * type TLSClientParametersType that was used in the Spring configuration
* of the http-conduit bean.
*/
public class TLSClientParametersConfig
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java?rev=641942&r1=641941&r2=641942&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
Thu Mar 27 12:01:02 2008
@@ -49,7 +49,7 @@
/**
* This class provides some functionality to convert the JAXB
* generated types in the security.xsd to the items needed
- * to programatically configure the HTTPConduit and HTTPDesination
+ * to programatically configure the HTTPConduit and HTTPDestination
* with TLSClientParameters and TLSServerParameters respectively.
*/
public final class TLSParameterJaxBUtils {
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=641942&r1=641941&r2=641942&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Thu Mar 27 12:01:02 2008
@@ -80,12 +80,12 @@
* <p>
* This implementation is a based on the java.net.URLConnection interface and
* dependent upon installed implementations of that URLConnection,
- * HttpURLConnection, and HttpsURLConnection. Currently, this implemenation
+ * HttpURLConnection, and HttpsURLConnection. Currently, this implementation
* has been known to work with the Sun JDK 1.5 default implementations. The
* HttpsURLConnection is part of Sun's implementation of the JSSE.
- * Presently, the source code for the Sun JSSE implemenation is unavailable
- * and therefore we may only lay a guess of whether its HttsURLConnection
- * implemenation correctly works as far as security is concerned.
+ * Presently, the source code for the Sun JSSE implementation is unavailable
+ * and therefore we may only lay a guess of whether its HttpsURLConnection
+ * implementation correctly works as far as security is concerned.
* <p>
* The Trust Decision. If a MessageTrustDecider is configured/set for the
* Conduit, it is called upon the first flush of the headers in the
@@ -164,7 +164,7 @@
private static final String SC_HTTP_CONDUIT_SUFFIX = ".http-conduit";
/**
- * Buffer to use to suck unread bytes off of input streams
+ * Buffer to use to pull unread bytes off of input streams
*/
private static final byte BUFFER[] = new byte[1024];
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=641942&r1=641941&r2=641942&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Thu Mar 27 12:01:02 2008
@@ -162,7 +162,7 @@
* isn't always desired. The MessageTrustDecider is
* the point at which an application can place trust in the
* certificate and target URL. We use this default of always
- * returning true, delegate the trust decision to the
+ * returning true, delegating the trust decision to the
* MessageTrustDecider.
*/
private static class AlwaysTrueHostnameVerifier implements
HostnameVerifier {
