Author: fschumacher
Date: Wed Sep 23 14:57:02 2015
New Revision: 1704867
URL: http://svn.apache.org/viewvc?rev=1704867&view=rev
Log:
Change spelling, now it is a public method
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Wed Sep 23 14:57:02 2015
@@ -1663,9 +1663,9 @@ public class TestHostConfigAutomaticDepl
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 @@ public class TestHostConfigAutomaticDepl
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;
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed Sep
23 14:57:02 2015
@@ -826,7 +826,7 @@ public abstract class TomcatBaseTest ext
}
- 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>() {
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
Wed Sep 23 14:57:02 2015
@@ -40,7 +40,7 @@ public class TestDirResourceSet extends
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
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
Wed Sep 23 14:57:02 2015
@@ -39,7 +39,7 @@ public class TestDirResourceSetInternal
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
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
Wed Sep 23 14:57:02 2015
@@ -39,7 +39,7 @@ public class TestDirResourceSetMount ext
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
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
Wed Sep 23 14:57:02 2015
@@ -39,7 +39,7 @@ public class TestDirResourceSetVirtual e
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
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
Wed Sep 23 14:57:02 2015
@@ -37,7 +37,7 @@ public class TestFileResourceSet extends
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
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java?rev=1704867&r1=1704866&r2=1704867&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
Wed Sep 23 14:57:02 2015
@@ -41,7 +41,7 @@ public class TestFileResourceSetVirtual
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
