Author: markt
Date: Mon Feb 28 19:03:31 2011
New Revision: 1075487
URL: http://svn.apache.org/viewvc?rev=1075487&view=rev
Log:
Should have moved the keys when I moved the SSL tests
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/test-cert.pem
- copied unchanged from r1075461,
tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem
tomcat/trunk/test/org/apache/tomcat/util/net/test-key.pem
- copied unchanged from r1075461,
tomcat/trunk/test/org/apache/catalina/startup/test-key.pem
tomcat/trunk/test/org/apache/tomcat/util/net/test.keystore
- copied unchanged from r1075461,
tomcat/trunk/test/org/apache/catalina/startup/test.keystore
Removed:
tomcat/trunk/test/org/apache/catalina/startup/test-cert.pem
tomcat/trunk/test/org/apache/catalina/startup/test-key.pem
tomcat/trunk/test/org/apache/catalina/startup/test.keystore
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1075487&r1=1075486&r2=1075487&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon Feb 28
19:03:31 2011
@@ -79,16 +79,16 @@ public final class TesterSupport {
if (protocol.indexOf("Apr") == -1) {
tomcat.getConnector().setProperty("sslProtocol", "tls");
File keystoreFile = new File(
- "test/org/apache/catalina/startup/test.keystore");
+ "test/org/apache/tomcat/util/net/test.keystore");
tomcat.getConnector().setAttribute("keystoreFile",
keystoreFile.getAbsolutePath());
} else {
File keystoreFile = new File(
- "test/org/apache/catalina/startup/test-cert.pem");
+ "test/org/apache/tomcat/util/net/test-cert.pem");
tomcat.getConnector().setAttribute("SSLCertificateFile",
keystoreFile.getAbsolutePath());
keystoreFile = new File(
- "test/org/apache/catalina/startup/test-key.pem");
+ "test/org/apache/tomcat/util/net/test-key.pem");
tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
keystoreFile.getAbsolutePath());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
