[jboss-cvs] JBossAS SVN: r101307 - in projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss: virtual and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: johnbailey
Date: 2010-02-22 23:20:55 -0500 (Mon, 22 Feb 2010)
New Revision: 101307

Modified:
   projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/ejb3/vfs/impl/vfs3/VirtualFileWrapper.java
   projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/virtual/VirtualFile.java
Log:
[EJBTHREE-2007] - Fixed an issue with a java.lang.IncompatibleClassChangeError caused by org.jboss.virtual.VirtualFile swtich from interface to class.  Now it is a class in both VFS2 and the VFS3 abstraction

Modified: projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/ejb3/vfs/impl/vfs3/VirtualFileWrapper.java
===================================================================
--- projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/ejb3/vfs/impl/vfs3/VirtualFileWrapper.java	2010-02-23 04:05:23 UTC (rev 101306)
+++ projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/ejb3/vfs/impl/vfs3/VirtualFileWrapper.java	2010-02-23 04:20:55 UTC (rev 101307)
@@ -31,7 +31,7 @@
  * 
  * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
  */
-public class VirtualFileWrapper implements VirtualFile
+public class VirtualFileWrapper extends VirtualFile
 {
    /* VFS3 VirtualFile being wrapped */
    private org.jboss.vfs.VirtualFile delegate;

Modified: projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/virtual/VirtualFile.java
===================================================================
--- projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/virtual/VirtualFile.java	2010-02-23 04:05:23 UTC (rev 101306)
+++ projects/ejb3/components/vfs/trunk/impl-vfs3/src/main/java/org/jboss/virtual/VirtualFile.java	2010-02-23 04:20:55 UTC (rev 101307)
@@ -29,17 +29,17 @@
  * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
  */
 @Deprecated
-public interface VirtualFile extends org.jboss.ejb3.vfs.spi.VirtualFile
+public abstract class VirtualFile implements org.jboss.ejb3.vfs.spi.VirtualFile
 {
    /**
     * Get the parent VirtualFile
     */
-   VirtualFile getParent() throws IOException;
+   public abstract VirtualFile getParent() throws IOException;
    
    /**
     * Returns the wrapped VirtualFile instance 
     *  
     * @return wrapped VirtualFile
     */
-   org.jboss.vfs.VirtualFile getWrapped();
+   public abstract org.jboss.vfs.VirtualFile getWrapped();
 }