tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From violet...@apache.org
Subject svn commit: r1778275 - in /tomcat/trunk: java/org/apache/catalina/storeconfig/ java/org/apache/coyote/http11/ webapps/docs/
Date Wed, 11 Jan 2017 11:24:27 GMT
Author: violetagg
Date: Wed Jan 11 11:24:27 2017
New Revision: 1778275

URL: http://svn.apache.org/viewvc?rev=1778275&view=rev
Log:
Spelling fixes. Patch provided by Josh Soref.

This closes #38

Modified:
    tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1778275&r1=1778274&r2=1778275&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java Wed Jan
11 11:24:27 2017
@@ -208,7 +208,7 @@ public class ConnectorStoreAppender exte
      * @param aDesc The connector description
      * @throws Exception Store error occurred
      */
-    protected void storeConnectorAttribtues(PrintWriter aWriter, int indent,
+    protected void storeConnectorAttributes(PrintWriter aWriter, int indent,
             Object bean, StoreDescription aDesc) throws Exception {
         if (aDesc.isAttributes()) {
             printAttributes(aWriter, indent, false, bean, aDesc);
@@ -216,6 +216,23 @@ public class ConnectorStoreAppender exte
     }
 
     /**
+     * Print Attributes for the connector
+     *
+     * @param aWriter Current writer
+     * @param indent Indentation level
+     * @param bean The connector bean
+     * @param aDesc The connector description
+     * @throws Exception Store error occurred
+     *
+     * @deprecated  Use {@link #storeConnectorAttributes()}
+     */
+    @Deprecated
+    protected void storeConnectorAttribtues(PrintWriter aWriter, int indent,
+            Object bean, StoreDescription aDesc) throws Exception {
+        storeConnectorAttributes(aWriter, indent, bean, aDesc);
+    }
+
+    /**
      * Print the open tag for connector attributes (override).
      *
      * @see org.apache.catalina.storeconfig.StoreAppender#printOpenTag(java.io.PrintWriter,
@@ -227,7 +244,7 @@ public class ConnectorStoreAppender exte
             StoreDescription aDesc) throws Exception {
         aWriter.print("<");
         aWriter.print(aDesc.getTag());
-        storeConnectorAttribtues(aWriter, indent, bean, aDesc);
+        storeConnectorAttributes(aWriter, indent, bean, aDesc);
         aWriter.println(">");
     }
 
@@ -243,7 +260,7 @@ public class ConnectorStoreAppender exte
             StoreDescription aDesc) throws Exception {
         aWriter.print("<");
         aWriter.print(aDesc.getTag());
-        storeConnectorAttribtues(aWriter, indent, bean, aDesc);
+        storeConnectorAttributes(aWriter, indent, bean, aDesc);
         aWriter.println("/>");
     }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1778275&r1=1778274&r2=1778275&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java Wed Jan 11
11:24:27 2017
@@ -34,13 +34,21 @@ public abstract class AbstractHttp11Jsse
     }
 
 
-    protected String getSslImplemenationShortName() {
+    protected String getSslImplementationShortName() {
         if (OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
             return "openssl";
         }
         return "jsse";
     }
 
+    /*
+     * @deprecated  Use {@link #getSslImplementationShortName()}
+     */
+    @Deprecated
+    protected String getSslImplemenationShortName() {
+        return getSslImplementationShortName();
+    }
+
     public String getSslImplementationName() { return getEndpoint().getSslImplementationName();
}
     public void setSslImplementationName(String s) { getEndpoint().setSslImplementationName(s);
}
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1778275&r1=1778274&r2=1778275&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed Jan 11 11:24:27
2017
@@ -44,7 +44,7 @@ public class Http11Nio2Protocol extends
     @Override
     protected String getNamePrefix() {
         if (isSSLEnabled()) {
-            return ("https-" + getSslImplemenationShortName()+ "-nio2");
+            return ("https-" + getSslImplementationShortName()+ "-nio2");
         } else {
             return ("http-nio2");
         }

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1778275&r1=1778274&r2=1778275&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jan 11 11:24:27
2017
@@ -76,7 +76,7 @@ public class Http11NioProtocol extends A
     @Override
     protected String getNamePrefix() {
         if (isSSLEnabled()) {
-            return ("https-" + getSslImplemenationShortName()+ "-nio");
+            return ("https-" + getSslImplementationShortName()+ "-nio");
         } else {
             return ("http-nio");
         }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1778275&r1=1778274&r2=1778275&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 11 11:24:27 2017
@@ -45,6 +45,13 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.0.M18 (markt)" rtext="in development">
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        Spelling corrections provided by Josh Soref. (violetagg)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.0.M17 (markt)" rtext="release in progress">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message