tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r528826 - in /tomcat/container/tc5.5.x/webapps: admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java docs/changelog.xml
Date Sat, 14 Apr 2007 16:17:13 GMT
Author: markt
Date: Sat Apr 14 09:17:12 2007
New Revision: 528826

URL: http://svn.apache.org/viewvc?view=rev&rev=528826
Log:
Fix bug 42103. Patch provided by Matheus Bastos.

Modified:
    tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
    tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java?view=diff&rev=528826&r1=528825&r2=528826
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
(original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Sat Apr 14 09:17:12 2007
@@ -247,13 +247,13 @@
                 attribute = "keystoreType";
                 connectorFm.setKeyStoreType
                     ((String) mBServer.getAttribute(cname, attribute));   
-                attribute = "trustStoreFile";
+                attribute = "truststoreFile";
                 connectorFm.setTrustStoreFileName
                     ((String) mBServer.getAttribute(cname, attribute));
-                attribute = "trustStorePass";
+                attribute = "truststorePass";
                 connectorFm.setTrustStorePassword
                     ((String) mBServer.getAttribute(cname, attribute));     
-                attribute = "trustStoreType";
+                attribute = "truststoreType";
                 connectorFm.setTrustStoreType
                     ((String) mBServer.getAttribute(cname, attribute));   
                 attribute = "sslProtocol";

Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java?view=diff&rev=528826&r1=528825&r2=528826
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
(original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Sat Apr 14 09:17:12 2007
@@ -423,17 +423,17 @@
                 String trustFile = cform.getTrustStoreFileName();
                 if ((trustFile != null) && (trustFile.length()>0)) 
                     mBServer.setAttribute(coname,
-                              new Attribute("trustStoreFile", trustFile));            
+                              new Attribute("truststoreFile", trustFile));            
                 
                 String trustPass = cform.getTrustStorePassword();
                 if ((trustPass != null) && (trustPass.length()>0)) 
                     mBServer.setAttribute(coname,
-                              new Attribute("trustStorePass", trustPass));              
  
+                              new Attribute("truststorePass", trustPass));              
  
                 
                 String trustType = cform.getTrustStoreType();
                 if ((trustType != null) && (trustType.length()>0)) 
                     mBServer.setAttribute(coname,
-                              new Attribute("trustStoreType", trustType));   
+                              new Attribute("truststoreType", trustType));   
                 
                 String sslProtocol = cform.getSslProtocol();
                 if ((sslProtocol != null) && (sslProtocol.length()>0)) 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=528826&r1=528825&r2=528826
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Apr 14 09:17:12 2007
@@ -68,6 +68,11 @@
         <bug>41289</bug>: Create configBase, since it is no longer created elsewhere.
         Submitted by Shiva Kumar H R. (pero)
       </fix>
+      <fix>
+        <bug>42103</bug>: Use correct names for truststoreFile, truststoreType
and 
+        truststorePass when saving server.xml in Admin webapp. Patch provided by
+        Matheus Bastos. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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


Mime
View raw message