From 03a4d4d050091278abd75a2753f765307f8c2122 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 28 Feb 2011 19:03:31 +0000
Subject: [PATCH] Should have moved the keys when I moved the SSL tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1075487 13f79535-47bb-0310-9956-ffa450edef68
---
 test/org/apache/tomcat/util/net/TesterSupport.java          |   6 +++---
 .../{catalina/startup => tomcat/util/net}/test-cert.pem     |   0
 .../{catalina/startup => tomcat/util/net}/test-key.pem      |   0
 .../{catalina/startup => tomcat/util/net}/test.keystore     | Bin
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename test/org/apache/{catalina/startup => tomcat/util/net}/test-cert.pem (100%)
 rename test/org/apache/{catalina/startup => tomcat/util/net}/test-key.pem (100%)
 rename test/org/apache/{catalina/startup => tomcat/util/net}/test.keystore (100%)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java
index 7a7987e77..4a9ccdc92 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -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());
         }
diff --git a/test/org/apache/catalina/startup/test-cert.pem b/test/org/apache/tomcat/util/net/test-cert.pem
similarity index 100%
rename from test/org/apache/catalina/startup/test-cert.pem
rename to test/org/apache/tomcat/util/net/test-cert.pem
diff --git a/test/org/apache/catalina/startup/test-key.pem b/test/org/apache/tomcat/util/net/test-key.pem
similarity index 100%
rename from test/org/apache/catalina/startup/test-key.pem
rename to test/org/apache/tomcat/util/net/test-key.pem
diff --git a/test/org/apache/catalina/startup/test.keystore b/test/org/apache/tomcat/util/net/test.keystore
similarity index 100%
rename from test/org/apache/catalina/startup/test.keystore
rename to test/org/apache/tomcat/util/net/test.keystore
-- 
2.11.0