[jboss-cvs] JBossAS SVN: r84158 - in projects/vfs/trunk/src: main/java/org/jboss/virtual/plugins/context and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 13 04:30:10 EST 2009
Author: alesj
Date: 2009-02-13 04:30:09 -0500 (Fri, 13 Feb 2009)
New Revision: 84158
Modified:
projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ExplodeCleanupUnitTestCase.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTest.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TempCleanupUnitTestCase.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnjarCleanupUnitTestCase.java
Log:
Fix how we handle old url.
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -124,7 +124,7 @@
public static final String IS_TEMP_FILE = "IS_TEMP_FILE";
/** The old root string */
- public static final String OLD_ROOT_STRING = "OLD_ROOT_STRING";
+ public static final String OLD_URL_STRING = "OLD_ROOT_STRING";
/**
* Stop cache.
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -284,18 +284,19 @@
{
try
{
- StringBuffer buf = new StringBuffer(getProtocol()).append(':');
-
VFSContext context = getVFSContext();
- String rootString = context.getOptions().get(VFSUtils.OLD_ROOT_STRING);
+ String path = getPathName();
+ StringBuffer buf = new StringBuffer();
+
+ String rootString = context.getOptions().get(VFSUtils.OLD_URL_STRING);
if (rootString == null)
{
URI rootURI = context.getRootURI();
- rootString = VFSUtils.stripProtocol(rootURI);
+ URI copyURI = new URI(rootURI.getScheme(), rootURI.getHost(), rootURI.getPath(), null);
+ rootString = copyURI.toURL().toExternalForm();
}
-
buf.append(rootString);
- String path = getPathName();
+
if (path != null && path.length() > 0)
{
if (buf.charAt(buf.length() - 1) != '/')
@@ -304,6 +305,7 @@
}
buf.append(path);
}
+
if (buf.charAt(buf.length() - 1) != '/' && isLeaf() == false)
{
buf.append('/');
@@ -325,16 +327,6 @@
}
/**
- * Get the protocol.
- *
- * @return the protocol
- */
- protected String getProtocol()
- {
- throw new IllegalArgumentException("Unsupported impl.");
- }
-
- /**
* Get internal representation of vfs url.
*
* @return the vfs url
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -89,15 +89,6 @@
return delegate;
}
- protected String getProtocol()
- {
- if (delegate instanceof AbstractVirtualFileHandler)
- {
- return ((AbstractVirtualFileHandler)delegate).getProtocol();
- }
- return null;
- }
-
/**
* Set the vfs url.
*
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -98,11 +98,6 @@
// ignore that url.openConnection.lastModified
}
- protected String getProtocol()
- {
- return "vfsfile";
- }
-
protected URL toInternalVfsUrl() throws MalformedURLException, URISyntaxException
{
if (getVfsUrl() == null)
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/AbstractJarHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -80,11 +80,6 @@
this.entry = entry;
}
- protected String getProtocol()
- {
- return "vfsjar";
- }
-
/**
* Get the jar.
*
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -63,11 +63,6 @@
}
}
- protected String getProtocol()
- {
- return "vfsmemory";
- }
-
protected synchronized void addChild(String name, MemoryContextHandler child)
{
if (entryMap == Collections.EMPTY_MAP)
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -63,11 +63,6 @@
setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));
}
- protected String getProtocol()
- {
- return "vfs";
- }
-
public VirtualFileHandler addChild(VirtualFileHandler handler)
{
if (handler.getClass().isAnnotationPresent(Assembled.class) == false)
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -50,12 +50,6 @@
setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));
}
- @Override
- protected String getProtocol()
- {
- return "vfs";
- }
-
public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException
{
throw new IOException("File cannot have children: " + this);
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -60,11 +60,6 @@
setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));
}
- protected String getProtocol()
- {
- return "vfsmemory";
- }
-
@Override
public URL toURL() throws MalformedURLException, URISyntaxException
{
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -72,11 +72,6 @@
}
}
- protected String getProtocol()
- {
- return "vfszip";
- }
-
private synchronized void init()
{
if (initialized)
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -27,14 +27,15 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URISyntaxException;
+import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.List;
import java.util.Map;
import org.jboss.logging.Logger;
+import org.jboss.util.file.JarUtils;
import org.jboss.util.id.GUID;
-import org.jboss.util.file.JarUtils;
import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.plugins.context.DelegatingHandler;
@@ -145,7 +146,9 @@
if (newOptions != null) // shouldn't be null, but we check anyway
{
newOptions.put(VFSUtils.IS_TEMP_FILE, Boolean.TRUE.toString());
- newOptions.put(VFSUtils.OLD_ROOT_STRING, VFSUtils.stripProtocol(oldVFSContext.getRootURI()) + path);
+ // save old url
+ URL handlerURL = handler.toVfsUrl();
+ newOptions.put(VFSUtils.OLD_URL_STRING, handlerURL.toExternalForm());
}
Map<String, String> oldOptions = oldVFSContext.getOptions();
if (newOptions != null && oldOptions != null && oldOptions.isEmpty() == false)
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ExplodeCleanupUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ExplodeCleanupUnitTestCase.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ExplodeCleanupUnitTestCase.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -48,9 +48,4 @@
{
return VFSUtils.explode(original);
}
-
- protected String getProtocol()
- {
- return "vfsfile:";
- }
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTest.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTest.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -66,8 +66,6 @@
protected abstract VirtualFile modify(VirtualFile original) throws Exception;
- protected abstract String getProtocol();
-
@Override
protected void setUp() throws Exception
{
@@ -296,20 +294,21 @@
assertEquals(getProtocol() + urlString + "level1.zip/", earCopy.toURL().toExternalForm());
VirtualFile l2 = earCopy.getChild("level2.zip");
- assertEquals(getNestedProtocol() + urlString + "level1.zip/level2.zip/", l2.toURL().toExternalForm());
+ assertEquals(getProtocol() + urlString + "level1.zip/level2.zip/", l2.toURL().toExternalForm());
VirtualFile l2sub = l2.getChild("test2.txt");
- assertEquals(getNestedProtocol() + urlString + "level1.zip/level2.zip/test2.txt", l2sub.toURL().toExternalForm());
+ assertEquals(getProtocol() + urlString + "level1.zip/level2.zip/test2.txt", l2sub.toURL().toExternalForm());
VirtualFile l3 = l2.getChild("level3.zip");
- assertEquals(getNestedProtocol() + urlString + "level1.zip/level2.zip/level3.zip/", l3.toURL().toExternalForm());
+ assertEquals(getProtocol() + urlString + "level1.zip/level2.zip/level3.zip/", l3.toURL().toExternalForm());
VirtualFile l3sub = l3.getChild("test3.txt");
- assertEquals(getNestedProtocol() + urlString + "level1.zip/level2.zip/level3.zip/test3.txt", l3sub.toURL().toExternalForm());
+ assertEquals(getProtocol() + urlString + "level1.zip/level2.zip/level3.zip/test3.txt", l3sub.toURL().toExternalForm());
ear.cleanup();
}
- protected String getNestedProtocol()
+ protected String getProtocol()
{
- return getProtocol();
+ return "vfszip:";
}
+
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TempCleanupUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TempCleanupUnitTestCase.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TempCleanupUnitTestCase.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -48,9 +48,4 @@
{
return VFSUtils.temp(original);
}
-
- protected String getProtocol()
- {
- return "vfszip:";
- }
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnjarCleanupUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnjarCleanupUnitTestCase.java 2009-02-13 09:22:08 UTC (rev 84157)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnjarCleanupUnitTestCase.java 2009-02-13 09:30:09 UTC (rev 84158)
@@ -49,20 +49,9 @@
return VFSUtils.unjar(original);
}
- protected String getProtocol()
- {
- return "vfsfile:";
- }
-
@Override
protected int getTempFiles()
{
return 1;
}
-
- @Override
- protected String getNestedProtocol()
- {
- return "vfszip:";
- }
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list