[jboss-cvs] JBossAS SVN: r75207 - in projects/vfs/trunk/src: main/java/org/jboss/virtual/plugins/context/file and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 30 06:14:03 EDT 2008
Author: alesj
Date: 2008-06-30 06:14:03 -0400 (Mon, 30 Jun 2008)
New Revision: 75207
Removed:
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/OSAwareVFSTest.java
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/file/FileHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java
Log:
Make it compile under JDK5.
Add delete impl in NestedJarHandler - delete temp file.
Remove OS hack.
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 2008-06-30 10:01:01 UTC (rev 75206)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java 2008-06-30 10:14:03 UTC (rev 75207)
@@ -480,9 +480,7 @@
{
VirtualFileHandler parent = getParent();
if (parent != null)
- {
return parent.removeChild(getName());
- }
return false;
}
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 2008-06-30 10:01:01 UTC (rev 75206)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java 2008-06-30 10:14:03 UTC (rev 75207)
@@ -177,7 +177,9 @@
}
catch (InterruptedException e)
{
- throw new IOException("Interrupted: ", e);
+ IOException ioe = new IOException("Interrupted: " + e);
+ ioe.initCause(e);
+ throw ioe;
}
}
return false;
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java 2008-06-30 10:01:01 UTC (rev 75206)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java 2008-06-30 10:14:03 UTC (rev 75207)
@@ -188,9 +188,12 @@
return false;
}
- public boolean delete(int gracePeriod)
+ public boolean delete(int gracePeriod) throws IOException
{
- return false;
+ boolean deleted = temp.delete();
+ if (deleted)
+ return super.delete(gracePeriod);
+ return deleted;
}
/**
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java 2008-06-30 10:01:01 UTC (rev 75206)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java 2008-06-30 10:14:03 UTC (rev 75207)
@@ -318,7 +318,9 @@
}
catch (InterruptedException e)
{
- throw new IOException("Interrupted: ", e);
+ IOException ioe = new IOException("Interrupted: " + e);
+ ioe.initCause(e);
+ throw ioe;
}
}
while(System.currentTimeMillis() < endOfGrace);
Deleted: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/OSAwareVFSTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/OSAwareVFSTest.java 2008-06-30 10:01:01 UTC (rev 75206)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/OSAwareVFSTest.java 2008-06-30 10:14:03 UTC (rev 75207)
@@ -1,110 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.virtual.test;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.jboss.test.virtual.support.OperatingSystem;
-
-/**
- * OS aware test, temp hack.
- *
- * TODO - remove once file delete issues are resolved.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class OSAwareVFSTest extends AbstractVFSTest
-{
- private OperatingSystem os;
-
- protected OSAwareVFSTest(String name)
- {
- super(name);
- }
-
- protected OSAwareVFSTest(String name, boolean forceCopy)
- {
- super(name, forceCopy);
- }
-
- protected OSAwareVFSTest(String name, boolean forceCopy, boolean forceNoReaper)
- {
- super(name, forceCopy, forceNoReaper);
- }
-
- /**
- * Are we running Windows.
- *
- * @return true for winz os
- */
- protected boolean isWindowsOS()
- {
- return OperatingSystem.WINDOWS == getOS();
- }
-
- protected OperatingSystem getOS()
- {
- if (os == null)
- {
- SecurityManager sm = suspendSecurity();
- try
- {
- String osName = System.getProperty("os.name");
- os = OperatingSystem.matchOS(osName);
- }
- finally
- {
- resumeSecurity(sm);
- }
- }
- return os;
- }
-
- /**
- * Suspend security manager.
- *
- * @return current security manager instance
- */
- public static SecurityManager suspendSecurity()
- {
- return AccessController.doPrivileged(new PrivilegedAction<SecurityManager>()
- {
- public SecurityManager run()
- {
- SecurityManager result = System.getSecurityManager();
- System.setSecurityManager(null);
- return result;
- }
- });
- }
-
- /**
- * Resume / set security manager.
- *
- * @param securityManager security manager to set
- */
- public static void resumeSecurity(SecurityManager securityManager)
- {
- System.setSecurityManager(securityManager);
- }
-}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list