[jboss-cvs] JBossAS SVN: r83550 - in projects/vfs/trunk/src: main/java/org/jboss/virtual/plugins/context/zip and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 28 06:46:29 EST 2009
Author: alesj
Date: 2009-01-28 06:46:29 -0500 (Wed, 28 Jan 2009)
New Revision: 83550
Added:
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/ReplacementHandler.java
Modified:
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java
Log:
Revert modification handler replacement.
Fix child replacement in zip context.
Copied: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/ReplacementHandler.java (from rev 83455, projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java)
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/ReplacementHandler.java (rev 0)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/ReplacementHandler.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -0,0 +1,49 @@
+/*
+ * 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.virtual.plugins.context;
+
+import org.jboss.virtual.spi.VFSContext;
+import org.jboss.virtual.spi.VirtualFileHandler;
+
+/**
+ * A replacement handler.
+ * It uses delegate's vfs context.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class ReplacementHandler extends DelegatingHandler
+{
+ /** Serialization */
+ private static final long serialVersionUID = 1;
+
+ public ReplacementHandler(VFSContext context, VirtualFileHandler parent, String name, VirtualFileHandler delegate)
+ {
+ super(context, parent, name, delegate);
+ }
+
+ @Override
+ public VFSContext getVFSContext()
+ {
+ return getDelegate().getVFSContext();
+ }
+}
\ No newline at end of file
Property changes on: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/ReplacementHandler.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -55,11 +55,12 @@
import org.jboss.virtual.plugins.context.AbstractVFSContext;
import org.jboss.virtual.plugins.context.AbstractVirtualFileHandler;
import org.jboss.virtual.plugins.context.DelegatingHandler;
+import org.jboss.virtual.plugins.context.ReplacementHandler;
import org.jboss.virtual.plugins.context.jar.JarUtils;
import org.jboss.virtual.plugins.copy.AbstractCopyMechanism;
import org.jboss.virtual.spi.ExceptionHandler;
+import org.jboss.virtual.spi.VFSContext;
import org.jboss.virtual.spi.VirtualFileHandler;
-import org.jboss.virtual.spi.VFSContext;
/**
* <tt>ZipEntryContext</tt> implements a {@link org.jboss.virtual.spi.VFSContext}
@@ -1062,7 +1063,7 @@
}
else
{
- newOne = new DelegatingHandler(this, parent, original.getName(), replacement);
+ newOne = new ReplacementHandler(this, parent, original.getName(), replacement);
}
synchronized(this)
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-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -102,10 +102,7 @@
* @return true if needs replacement
* @throws IOException for any error
*/
- protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
- {
- return true;
- }
+ protected abstract boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException;
/**
* Unwrap the handler from possible delegate handler.
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -44,4 +44,9 @@
{
return handler instanceof FileHandler || handler.isLeaf();
}
+
+ protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
+ {
+ return false;
+ }
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -68,4 +68,9 @@
return super.copy(guidDir, handler);
}
+
+ protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
+ {
+ return false;
+ }
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -43,4 +43,9 @@
{
return handler.isNested() == false;
}
+
+ protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
+ {
+ return true;
+ }
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -168,7 +168,7 @@
protected void assertExplodedReplacement(VirtualFile original, VirtualFile replacement) throws Exception
{
assertReplacement(original, replacement);
- assertNotNull(replacement.getParent());
+ assertNull(replacement.getParent());
}
protected void assertReplacement(VirtualFile original, VirtualFile replacement) throws Exception
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java 2009-01-28 11:30:36 UTC (rev 83549)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java 2009-01-28 11:46:29 UTC (rev 83550)
@@ -50,9 +50,15 @@
protected void assertTopLevel(VirtualFile original, VirtualFile replacement) throws Exception
{
assertReplacement(original, replacement, isExploded());
- assertNotNull(replacement.getParent());
+ assertNull(replacement.getParent());
}
+ @Override
+ protected void assertTopLevelParent(VirtualFile originalParent, VirtualFile replacementParent) throws Exception
+ {
+ assertNull(replacementParent);
+ }
+
protected void assertNestedLevel(VirtualFile original, VirtualFile replacement) throws Exception
{
assertExplodedReplacement(original, replacement);
More information about the jboss-cvs-commits
mailing list