You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by im...@apache.org on 2004/12/03 21:33:51 UTC
cvs commit: jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks AbstractSyncTask.java
imario 2004/12/03 12:33:51
Modified: vfs/src/java/org/apache/commons/vfs/tasks
AbstractSyncTask.java
Log:
PR: 32356 (partly)
Submitted By: adagoubard -at- chello.nl (Anthony Goubard)
Revision Changes Path
1.13 +10 -3 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
Index: AbstractSyncTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractSyncTask.java 18 Jun 2004 16:54:20 -0000 1.12
+++ AbstractSyncTask.java 3 Dec 2004 20:33:51 -0000 1.13
@@ -145,6 +145,13 @@
while (tok.hasMoreTokens())
{
String nextFile = tok.nextToken();
+
+ // Basic compatibility with Ant fileset for directories
+ if (nextFile.endsWith("/**"))
+ {
+ nextFile = nextFile.substring(0, nextFile.length() - 2);
+ }
+
final SourceInfo src = new SourceInfo();
src.setFile(srcDirUrl + nextFile);
addConfiguredSrc(src);
@@ -232,8 +239,8 @@
final FileObject srcFile = files[j];
// Build the destination file name
- final String relName =
- rootName.getRelativeName(srcFile.getName());
+ String relName = rootName.getRelativeName(srcFile.getName());
+
final FileObject destFile =
destFolder.resolveFile(relName, NameScope.DESCENDENT);
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org