[seam-commits] Seam SVN: r7447 - branches/Seam_2_0/src/jbas5/org/jboss/seam/as5/vfs.
Author: pete.muir(a)jboss.org
Date: 2008-02-19 09:49:31 -0500 (Tue, 19 Feb 2008)
New Revision: 7447
Modified:
branches/Seam_2_0/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Log:
Backport r7392 - ales' fixes to JBoss5 deployment
Modified: branches/Seam_2_0/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- branches/Seam_2_0/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-19 14:38:13
UTC (rev 7446)
+++ branches/Seam_2_0/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-19 14:49:31
UTC (rev 7447)
@@ -104,7 +104,7 @@
while(parentDepth > 0)
{
if (top == null)
- throw new IllegalArgumentException("Null parent: " + vfsurl);
+ throw new IllegalArgumentException("Null parent: " + vfsurl +
", relative: " + relative);
top = top.getParent();
parentDepth--;
}
@@ -172,13 +172,18 @@
else
{
String rootPathName = root.getPathName();
- int rootPathNameLength = rootPathName.length() + 1; // past last '/'
+ int rootPathNameLength = rootPathName.length();
List<VirtualFile> children = root.getChildrenRecursively();
for (VirtualFile child : children)
{
if (child.isLeaf())
{
-
getDeploymentStrategy().handle(child.getPathName().substring(rootPathNameLength));
+ String name = child.getPathName();
+ // move past '/'
+ int length = rootPathNameLength;
+ if (name.charAt(length) == '/')
+ length++;
+ getDeploymentStrategy().handle(name.substring(length));
}
}
}