You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/15 16:32:52 UTC
svn commit: r1398305 -
/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Author: rmannibucau
Date: Mon Oct 15 14:32:51 2012
New Revision: 1398305
URL: http://svn.apache.org/viewvc?rev=1398305&view=rev
Log:
TOMEE-468 better handling of subfolder skipping in arquillian tomee remote
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1398305&r1=1398304&r2=1398305&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Mon Oct 15 14:32:51 2012
@@ -308,18 +308,9 @@ public class Setup {
final File confSrc = new File(src);
if (confSrc.exists()) {
final File conf = new File(openejbHome, dir);
- final Collection<File> files = org.apache.openejb.loader.Files.collect(confSrc, DirectFileOnlyFilter.instance());
+ final Collection<File> files = org.apache.openejb.loader.Files.collect(confSrc, new DirectFileOnlyFilter(confSrc));
files.remove(confSrc);
for (File f : files) {
- if (f.isHidden()) {
- continue;
- }
-
- if (f.isDirectory()) {
- LOGGER.log(Level.WARNING, "skipping " + f.getAbsolutePath() + " since folders are currently not supported");
- continue;
- }
-
try {
org.apache.openejb.loader.IO.copy(f, new File(conf, relativize(f, confSrc)));
} catch (Exception e) {
@@ -366,18 +357,15 @@ public class Setup {
}
private static class DirectFileOnlyFilter implements FileFilter {
- private static DirectFileOnlyFilter INSTANCE = null;
+ private final File accepted;
- public static DirectFileOnlyFilter instance() {
- if (INSTANCE == null) {
- INSTANCE = new DirectFileOnlyFilter();
- }
- return INSTANCE;
+ public DirectFileOnlyFilter(final File confSrc) {
+ accepted = confSrc;
}
@Override
public boolean accept(final File pathname) {
- return !pathname.isDirectory();
+ return pathname.isFile() && pathname.getParentFile().equals(accepted);
}
}
}