[jboss-cvs] JBossAS SVN: r84186 - in projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins: copy and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 13 11:46:33 EST 2009
Author: alesj
Date: 2009-02-13 11:46:33 -0500 (Fri, 13 Feb 2009)
New Revision: 84186
Added:
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryTempInfo.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/context/zip/ZipEntryHandler.java
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
Log:
Reset zip entries for re-deploy.
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-02-13 16:42:20 UTC (rev 84185)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java 2009-02-13 16:46:33 UTC (rev 84186)
@@ -37,6 +37,7 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -46,7 +47,6 @@
import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
-import java.util.Arrays;
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -58,7 +58,6 @@
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.context.temp.BasicTempInfo;
import org.jboss.virtual.plugins.copy.AbstractCopyMechanism;
import org.jboss.virtual.spi.ExceptionHandler;
import org.jboss.virtual.spi.TempInfo;
@@ -552,7 +551,7 @@
delegator = mountZipFile(parent, name, dest);
if (context != null && path != null && createNewTempInfo)
- context.addTempInfo(new BasicTempInfo(path, dest, delegator));
+ context.addTempInfo(new ZipEntryTempInfo(path, dest, delegator, this));
}
else
{
@@ -621,6 +620,14 @@
}
/**
+ * Reset init status.
+ */
+ void resetInitStatus()
+ {
+ initStatus = InitializationStatus.NOT_INITIALIZED;
+ }
+
+ /**
* Mount ZipEntryContext created around extracted nested archive
*
* @param parent the parent
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 16:42:20 UTC (rev 84185)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java 2009-02-13 16:46:33 UTC (rev 84186)
@@ -72,6 +72,9 @@
}
}
+ /**
+ * Initialization method.
+ */
private synchronized void init()
{
if (initialized)
Copied: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryTempInfo.java (from rev 84161, 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/ZipEntryTempInfo.java (rev 0)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryTempInfo.java 2009-02-13 16:46:33 UTC (rev 84186)
@@ -0,0 +1,54 @@
+/*
+* 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.zip;
+
+import java.io.File;
+
+import org.jboss.logging.Logger;
+import org.jboss.virtual.plugins.context.temp.BasicTempInfo;
+import org.jboss.virtual.spi.VirtualFileHandler;
+
+/**
+ * ZipEntry temp info.
+ * It resets initState of owning zip context.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ZipEntryTempInfo extends BasicTempInfo
+{
+ private Logger log = Logger.getLogger(getClass());
+ private ZipEntryContext context;
+
+ public ZipEntryTempInfo(String path, File file, VirtualFileHandler handler, ZipEntryContext context)
+ {
+ super(path, file, handler);
+ this.context = context;
+ }
+
+ @Override
+ public void cleanup()
+ {
+ log.warn("Cleanup context: " + context);
+ context.resetInitStatus();
+ super.cleanup();
+ }
+}
\ No newline at end of file
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 16:42:20 UTC (rev 84185)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java 2009-02-13 16:46:33 UTC (rev 84186)
@@ -113,7 +113,7 @@
* @param handler the handler to unwrap
* @return unwrapped handler
*/
- protected VirtualFileHandler unwrap(VirtualFileHandler handler)
+ protected static VirtualFileHandler unwrap(VirtualFileHandler handler)
{
if (handler instanceof DelegatingHandler)
handler = ((DelegatingHandler)handler).getDelegate();
More information about the jboss-cvs-commits
mailing list