Author: thomas.diesler(a)jboss.com Date: 2010-03-05 06:24:13 -0500 (Fri, 05 Mar 2010) New Revision: 101943 Modified: projects/jboss-osgi/projects/vfs/trunk/api/pom.xml projects/jboss-osgi/projects/vfs/trunk/pom.xml projects/jboss-osgi/projects/vfs/trunk/vfs21/pom.xml projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSEntryPathsEnumeration.java projects/jboss-osgi/projects/vfs/trunk/vfs30/pom.xml projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSEntryPathsEnumeration.java Log: Fix findEntries for vfs30 Modified: projects/jboss-osgi/projects/vfs/trunk/api/pom.xml =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/api/pom.xml 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/api/pom.xml 2010-03-05 11:24:13 UTC (rev 101943) @@ -14,7 +14,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - VFS API</name> + <name>JBossOSGi VFS - API</name> <description>The JBossOSGi VFS Abstration</description> <groupId>org.jboss.osgi.vfs</groupId> Modified: projects/jboss-osgi/projects/vfs/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/pom.xml 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/pom.xml 2010-03-05 11:24:13 UTC (rev 101943) @@ -14,7 +14,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - VFS</name> + <name>JBossOSGi VFS</name> <description>The JBossOSGi VFS Abstration</description> <groupId>org.jboss.osgi.vfs</groupId> Modified: projects/jboss-osgi/projects/vfs/trunk/vfs21/pom.xml =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/vfs21/pom.xml 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/vfs21/pom.xml 2010-03-05 11:24:13 UTC (rev 101943) @@ -14,7 +14,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - VFS21</name> + <name>JBossOSGi VFS - VFS21</name> <description>The JBossOSGi VFS Abstration</description> <groupId>org.jboss.osgi.vfs</groupId> Modified: projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSEntryPathsEnumeration.java =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSEntryPathsEnumeration.java 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSEntryPathsEnumeration.java 2010-03-05 11:24:13 UTC (rev 101943) @@ -86,9 +86,14 @@ if (length != 0) result = result.substring(length); + // Returned paths indicating subdirectory paths end with a "/" if (file.isLeaf() == false && result.endsWith("/") == false) result += "/"; + // The returned paths are all relative to the root of this bundle and must not begin with "/". + if (result.startsWith("/")) + result = result.substring(1); + return result; } catch (IOException e) Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/pom.xml =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/vfs30/pom.xml 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/vfs30/pom.xml 2010-03-05 11:24:13 UTC (rev 101943) @@ -14,7 +14,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - VFS30</name> + <name>JBossOSGi VFS - VFS30</name> <description>The JBossOSGi VFS Abstration</description> <groupId>org.jboss.osgi.vfs</groupId> Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSEntryPathsEnumeration.java =================================================================== --- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSEntryPathsEnumeration.java 2010-03-05 11:02:24 UTC (rev 101942) +++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSEntryPathsEnumeration.java 2010-03-05 11:24:13 UTC (rev 101943) @@ -84,8 +84,13 @@ if (length != 0) result = result.substring(length); + // Returned paths indicating subdirectory paths end with a "/" if (file.isDirectory() && result.endsWith("/") == false) result += "/"; + + // The returned paths are all relative to the root of this bundle and must not begin with "/". + if (result.startsWith("/")) + result = result.substring(1); return result; }