[jboss-cvs] JBossAS SVN: r94694 - in projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins: client and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-10-12 15:36:40 -0400 (Mon, 12 Oct 2009)
New Revision: 94694

Removed:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/vfs/
Modified:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java
Log:
We do not need this anymore

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java	2009-10-12 19:30:43 UTC (rev 94693)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java	2009-10-12 19:36:40 UTC (rev 94694)
@@ -24,9 +24,9 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.io.Externalizable;
 
 import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
-import org.jboss.deployers.vfs.plugins.vfs.VirtualFileSerializator;
 import org.jboss.deployers.vfs.spi.client.VFSDeployment;
 import org.jboss.vfs.VirtualFile;
 
@@ -37,16 +37,13 @@
  * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
-public class AbstractVFSDeployment extends AbstractDeployment implements VFSDeployment
+public class AbstractVFSDeployment extends AbstractDeployment implements VFSDeployment, Externalizable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 2L;
 
-   /** The flag to do direct VF serialization */
-   private boolean directRootSerialization;
-
    /** The root */
-   private transient VirtualFile root;
+   private VirtualFile root;
 
    /**
     * Get the vfs file name safely
@@ -54,7 +51,7 @@
     * @param root the virutal file
     * @return the name
     */
-   static final String safeVirtualFileName(VirtualFile root)
+   static String safeVirtualFileName(VirtualFile root)
    {
       if (root == null)
          throw new IllegalArgumentException("Null root");
@@ -105,38 +102,17 @@
       return "AbstractVFSDeployment(" + getSimpleName() + ")";
    }
 
-   /**
-    * Should we serialize root directly.
-    * e.g. the root is memory virtual file instance
-    * @see org.jboss.vfs.plugins.context.memory.MemoryContextHandler
-    *
-    * @param directRootSerialization the direct root serialization flag
-    */
-   public void setDirectRootSerialization(boolean directRootSerialization)
-   {
-      this.directRootSerialization = directRootSerialization;
-   }
-
+   @Override
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
       super.readExternal(in);
-      directRootSerialization = in.readBoolean();
-      if (directRootSerialization)
-         root = (VirtualFile)in.readObject();
-      else
-      {
-         VirtualFileSerializator serializator = (VirtualFileSerializator)in.readObject();
-         root = serializator.getFile();
-      }
+      root = (VirtualFile)in.readObject();
    }
 
+   @Override
    public void writeExternal(ObjectOutput out) throws IOException
    {
       super.writeExternal(out);
-      out.writeBoolean(directRootSerialization);
-      if (directRootSerialization)
-         out.writeObject(root);
-      else
-         out.writeObject(new VirtualFileSerializator(root));
+      out.writeObject(root);
    }
 }