Skip to content

Commit

Permalink
Change spelling, now it is a public method
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1704867 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
FSchumacher committed Sep 23, 2015
1 parent 0d0e683 commit 1251efb
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
Expand Up @@ -1663,26 +1663,26 @@ private File createDirInAppbase(boolean withXml) throws IOException {
File dir = new File(getTomcatInstance().getHost().getAppBaseFile(), File dir = new File(getTomcatInstance().getHost().getAppBaseFile(),
APP_NAME.getBaseName()); APP_NAME.getBaseName());
if (withXml) { if (withXml) {
recurrsiveCopy(DIR_XML_SOURCE.toPath(), dir.toPath()); recursiveCopy(DIR_XML_SOURCE.toPath(), dir.toPath());
} else { } else {
recurrsiveCopy(DIR_SOURCE.toPath(), dir.toPath()); recursiveCopy(DIR_SOURCE.toPath(), dir.toPath());
} }
return dir; return dir;
} }


private File createDirXmlInAppbase() throws IOException { private File createDirXmlInAppbase() throws IOException {
File dir = new File(getTomcatInstance().getHost().getAppBaseFile(), File dir = new File(getTomcatInstance().getHost().getAppBaseFile(),
APP_NAME.getBaseName() + "/META-INF"); 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; return dir;
} }


private File createDirInExternal(boolean withXml) throws IOException { private File createDirInExternal(boolean withXml) throws IOException {
File ext = new File(external, "external" + ".war"); File ext = new File(external, "external" + ".war");
if (withXml) { if (withXml) {
recurrsiveCopy(DIR_XML_SOURCE.toPath(), ext.toPath()); recursiveCopy(DIR_XML_SOURCE.toPath(), ext.toPath());
} else { } else {
recurrsiveCopy(DIR_SOURCE.toPath(), ext.toPath()); recursiveCopy(DIR_SOURCE.toPath(), ext.toPath());
} }
return ext; return ext;
} }
Expand Down
2 changes: 1 addition & 1 deletion test/org/apache/catalina/startup/TomcatBaseTest.java
Expand Up @@ -826,7 +826,7 @@ public void start() throws LifecycleException {
} }




public static void recurrsiveCopy(final Path src, final Path dest) public static void recursiveCopy(final Path src, final Path dest)
throws IOException { throws IOException {


Files.walkFileTree(src, new FileVisitor<Path>() { Files.walkFileTree(src, new FileVisitor<Path>() {
Expand Down
Expand Up @@ -40,7 +40,7 @@ public class TestDirResourceSet extends AbstractTestResourceSet {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down
Expand Up @@ -39,7 +39,7 @@ public class TestDirResourceSetInternal extends AbstractTestResourceSet {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down
Expand Up @@ -39,7 +39,7 @@ public class TestDirResourceSetMount extends AbstractTestResourceSetMount {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down
Expand Up @@ -39,7 +39,7 @@ public class TestDirResourceSetVirtual extends AbstractTestResourceSet {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down
Expand Up @@ -37,7 +37,7 @@ public class TestFileResourceSet extends AbstractTestFileResourceSet {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down
Expand Up @@ -41,7 +41,7 @@ public class TestFileResourceSetVirtual extends TestFileResourceSet {
public static void before() throws IOException { public static void before() throws IOException {
tempDir = Files.createTempDirectory("test", new FileAttribute[0]); tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
dir1 = new File(tempDir.toFile(), "dir1"); 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 @AfterClass
Expand Down

0 comments on commit 1251efb

Please sign in to comment.