Change spelling, now it is a public method
Merge r1704867 from /tomcat/trunk
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1704869 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
index 0077db3..88d2023 100644
--- a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
+++ b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
@@ -1663,9 +1663,9 @@
File dir = new File(getTomcatInstance().getHost().getAppBaseFile(),
APP_NAME.getBaseName());
if (withXml) {
- recurrsiveCopy(DIR_XML_SOURCE.toPath(), dir.toPath());
+ recursiveCopy(DIR_XML_SOURCE.toPath(), dir.toPath());
} else {
- recurrsiveCopy(DIR_SOURCE.toPath(), dir.toPath());
+ recursiveCopy(DIR_SOURCE.toPath(), dir.toPath());
}
return dir;
}
@@ -1673,16 +1673,16 @@
private File createDirXmlInAppbase() throws IOException {
File dir = new File(getTomcatInstance().getHost().getAppBaseFile(),
APP_NAME.getBaseName() + "/META-INF");
- recurrsiveCopy(DIR_XML_SOURCE_META_INF.toPath(), dir.toPath());
+ recursiveCopy(DIR_XML_SOURCE_META_INF.toPath(), dir.toPath());
return dir;
}
private File createDirInExternal(boolean withXml) throws IOException {
File ext = new File(external, "external" + ".war");
if (withXml) {
- recurrsiveCopy(DIR_XML_SOURCE.toPath(), ext.toPath());
+ recursiveCopy(DIR_XML_SOURCE.toPath(), ext.toPath());
} else {
- recurrsiveCopy(DIR_SOURCE.toPath(), ext.toPath());
+ recursiveCopy(DIR_SOURCE.toPath(), ext.toPath());
}
return ext;
}
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 9b2450d..1c14f1a 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -829,7 +829,7 @@
}
- public static void recurrsiveCopy(final Path src, final Path dest)
+ public static void recursiveCopy(final Path src, final Path dest)
throws IOException {
Files.walkFileTree(src, new FileVisitor<Path>() {
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSet.java b/test/org/apache/catalina/webresources/TestDirResourceSet.java
index 210c673..2c25cb1 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSet.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSet.java
@@ -40,7 +40,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java b/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
index 1c4e6f8..f8b7706 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
@@ -39,7 +39,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSetMount.java b/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
index c08ce46..49dd85e 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
@@ -39,7 +39,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java b/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
index 5cd9d43..ce0a9ae 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
@@ -39,7 +39,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
diff --git a/test/org/apache/catalina/webresources/TestFileResourceSet.java b/test/org/apache/catalina/webresources/TestFileResourceSet.java
index 9050f75..c0f0c02 100644
--- a/test/org/apache/catalina/webresources/TestFileResourceSet.java
+++ b/test/org/apache/catalina/webresources/TestFileResourceSet.java
@@ -37,7 +37,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
diff --git a/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java b/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
index 8544556..86a93cf 100644
--- a/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
+++ b/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
@@ -41,7 +41,7 @@
public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1");
- TomcatBaseTest.recurrsiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
+ TomcatBaseTest.recursiveCopy(new File("test/webresources/dir1").toPath(), dir1.toPath());
}
@AfterClass
