From d9a664a5881bab964fd44ed9af2ecccada807c33 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 14 May 2010 19:34:36 +0000
Subject: [PATCH] SPR-7197 polish :)

---
 org.springframework.core/.classpath                |  3 +--
 .../java/org/springframework/core/io/VfsUtils.java | 14 +++++++++-----
 .../core/io/support/VfsPatternUtils.java           |  3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/org.springframework.core/.classpath b/org.springframework.core/.classpath
index 8778e65851..b46fdd1514 100644
--- a/org.springframework.core/.classpath
+++ b/org.springframework.core/.classpath
@@ -8,12 +8,11 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar" sourcepath="/IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-sources-3.2.7.jar"/>
 	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java b/org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java
index 64069bd6f0..a9014540ba 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java
@@ -34,11 +34,13 @@ import org.springframework.util.ReflectionUtils;
  * Utility for detecting the JBoss VFS version available in the classpath.
  * JBoss AS 5+ uses VFS 2.x (package <code>org.jboss.virtual</code>) while JBoss AS 6+ uses
  * VFS 3.x (package <code>org.jboss.vfs</code>).
+ * 
  * <p/>
  * Thanks go to Marius Bogoevici for the initial patch. 
+ *
+ * <b>Note:</b> This is an internal class and should not be used outside the framework.
  * 
  * @author Costin Leau
- * 
  */
 public abstract class VfsUtils {
 
@@ -228,14 +230,16 @@ public abstract class VfsUtils {
 		}
 	}
 
-	protected static Object getRoot(URL url) throws IOException {
-		return invokeVfsMethod(VFS_METHOD_GET_ROOT_URL, null, url);
-	}
-
 	static Object getRoot(URI url) throws IOException {
 		return invokeVfsMethod(VFS_METHOD_GET_ROOT_URI, null, url);
 	}
 
+	// protected methods used by the support sub-package
+
+	protected static Object getRoot(URL url) throws IOException {
+		return invokeVfsMethod(VFS_METHOD_GET_ROOT_URL, null, url);
+	}
+
 	protected static Object doGetVisitorAttribute() {
 		return ReflectionUtils.getField(VISITOR_ATTRIBUTES_FIELD_RECURSE, null);
 	}
diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java b/org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
index 59924b698a..8211a595b6 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
@@ -24,6 +24,9 @@ import java.net.URL;
 import org.springframework.core.io.VfsUtils;
 
 /**
+ * Artificial class used for accessing the {@link VfsUtils} methods without exposing them
+ * to the entire world. 
+ * 
  * @author Costin Leau
  *
  */