Index: deploy/jbossas/modeshape-jbossas-service/src/kit/modeshape-config.xml
===================================================================
--- deploy/jbossas/modeshape-jbossas-service/src/kit/modeshape-config.xml        (revision 2433)
+++ deploy/jbossas/modeshape-jbossas-service/src/kit/modeshape-config.xml     (working copy)
@@ -95,7 +95,7 @@
         </mode:sequencer>  
         <mode:sequencer jcr:name="ZIP File Sequencer" mode:classname="org.modeshape.sequencer.zip.ZipSequencer">
             <mode:description>Sequences ZIP files loaded into the repository under '/files', extracting the archive file contents into the equivalent JCR graph structure of 'nt:file' and 'nt:folder' nodes.</mode:description>        
-            <mode:pathExpression>/files//(*.zip[*])/jcr:content[@jcr:data] => /sequenced/zip/$1 </mode:pathExpression>
+            <mode:pathExpression>/files(//)(*.zip[*])/jcr:content[@jcr:data] => /sequenced/zip/$1 </mode:pathExpression>
         </mode:sequencer>                          
         <!--
         <mode:sequencer jcr:name="JBPM-JPDL File Sequencer" mode:classname="org.modeshape.sequencer.jpdl3.xxSequencer">
Index: extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipLexicon.java
===================================================================
--- extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipLexicon.java        (revision 2433)
+++ extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipLexicon.java     (working copy)
@@ -15,5 +15,6 @@ public class ZipLexicon {
     }
 
     public static final Name CONTENT = new BasicName(Namespace.URI, "content");
+    public static final Name FILE = new BasicName(Namespace.URI, "file");
 
 }
Index: extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipSequencer.java
===================================================================
--- extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipSequencer.java        (revision 2433)
+++ extensions/modeshape-sequencer-zip/src/main/java/org/modeshape/sequencer/zip/ZipSequencer.java     (working copy)
@@ -31,7 +31,9 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.modeshape.graph.JcrLexicon;
 import org.modeshape.graph.JcrNtLexicon;
+import org.modeshape.graph.mimetype.MimeTypeDetector;
 import org.modeshape.graph.property.BinaryFactory;
+import org.modeshape.graph.property.DateTime;
 import org.modeshape.graph.property.DateTimeFactory;
 import org.modeshape.graph.property.Name;
 import org.modeshape.graph.property.NameFactory;
@@ -72,6 +74,10 @@ public class ZipSequencer implements StreamSequencer {
             zipFileName = ZipLexicon.CONTENT;
         }
 
+        DateTime now = dateFactory.create();
+        String username = context.getSecurityContext().getUserName();
+        MimeTypeDetector mimeDetector = context.getMimeTypeDetector();
+
         ZipInputStream in = null;
         try {
             in = new ZipInputStream(stream);
@@ -80,7 +86,7 @@ public class ZipSequencer implements StreamSequencer {
 
             // Create top-level node
             Path zipPath = pathFactory.createRelativePath(zipFileName);
-            output.setProperty(zipPath, JcrLexicon.PRIMARY_TYPE, ZipLexicon.CONTENT);
+            output.setProperty(zipPath, JcrLexicon.PRIMARY_TYPE, ZipLexicon.FILE);
             while (entry != null) {
                 Path entryPath = zipPath;
                 String entryName = entry.getName();
@@ -88,6 +94,12 @@ public class ZipSequencer implements StreamSequencer {
                     entryPath = pathFactory.create(entryPath, nameFactory.create(segment));
                 }
 
+                // Set the timestamp and username ....
+                long time = entry.getTime();
+                DateTime dateTime = time != -1 ? dateFactory.create(time) : now;
+                output.setProperty(entryPath, JcrLexicon.CREATED, dateTime);
+                if (username != null) output.setProperty(entryPath, JcrLexicon.CREATED_BY, username);
+
                 if (entry.isDirectory()) { // If entry is directory, create nt:folder node
                     output.setProperty(entryPath, JcrLexicon.PRIMARY_TYPE, JcrNtLexicon.FOLDER);
                 } else { // If entry is File, create nt:file
@@ -104,9 +116,13 @@ public class ZipSequencer implements StreamSequencer {
                     output.setProperty(contentPath, JcrLexicon.DATA, binaryFactory.create(bytes));
                     // all other nt:file properties should be generated by other sequencers (mimetype, encoding,...) but we'll
                     // default them here
-                    output.setProperty(contentPath, JcrLexicon.ENCODING, "binary");
-                    output.setProperty(contentPath, JcrLexicon.LAST_MODIFIED, dateFactory.create(entry.getTime()).toString());
-                    output.setProperty(contentPath, JcrLexicon.MIMETYPE, "application/octet-stream");
+                    // output.setProperty(contentPath, JcrLexicon.ENCODING, "binary");
+                    output.setProperty(contentPath, JcrLexicon.LAST_MODIFIED, dateTime);
+                    if (username != null) output.setProperty(contentPath, JcrLexicon.LAST_MODIFIED_BY, username);
+
+                    // Figure out the mime type ...
+                    String mimeType = mimeDetector.mimeTypeOf(entryName, null);
+                    if (mimeType != null) output.setProperty(contentPath, JcrLexicon.MIMETYPE, mimeType);
 
                 }
                 in.closeEntry();
Index: extensions/modeshape-sequencer-zip/src/main/resources/org/modeshape/sequencer/zip/zip.cnd
===================================================================
--- extensions/modeshape-sequencer-zip/src/main/resources/org/modeshape/sequencer/zip/zip.cnd        (revision 2433)
+++ extensions/modeshape-sequencer-zip/src/main/resources/org/modeshape/sequencer/zip/zip.cnd     (working copy)
@@ -34,6 +34,9 @@
 // N O D E T Y P E S
 //------------------------------------------------------------------------------
 
+[zip:file] > nt:folder, mix:mimeType
+
+/* Deprecated */
 [zip:content] > nt:unstructured, mix:mimeType
   + * (nt:folder)
   + * (nt:file)
Index: extensions/modeshape-sequencer-zip/src/test/java/org/modeshape/sequencer/zip/ZipSequencerTest.java
===================================================================
--- extensions/modeshape-sequencer-zip/src/test/java/org/modeshape/sequencer/zip/ZipSequencerTest.java        (revision 2433)
+++ extensions/modeshape-sequencer-zip/src/test/java/org/modeshape/sequencer/zip/ZipSequencerTest.java     (working copy)
@@ -75,7 +75,7 @@ public class ZipSequencerTest {
         PathFactory pathFactory = context.getValueFactories().getPathFactory();
         NameFactory nameFactory = context.getValueFactories().getNameFactory();
         ValueFactory<String> stringFactory = context.getValueFactories().getStringFactory();
-        
+
         Name folderName = nameFactory.create("test subfolder");
         Name fileName = nameFactory.create("test2.txt");
 
Index: modeshape-integration-tests/src/test/java/org/modeshape/test/integration/filesystem/FileSystemRepositoryDeleteTest.java
===================================================================
--- modeshape-integration-tests/src/test/java/org/modeshape/test/integration/filesystem/FileSystemRepositoryDeleteTest.java        (revision 2433)
+++ modeshape-integration-tests/src/test/java/org/modeshape/test/integration/filesystem/FileSystemRepositoryDeleteTest.java     (working copy)
@@ -30,7 +30,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.modeshape.common.FixFor;
 import org.modeshape.common.collection.Problem;
Index: modeshape-integration-tests/src/test/java/org/modeshape/test/integration/sequencer/AbstractSequencerTest.java
===================================================================
--- modeshape-integration-tests/src/test/java/org/modeshape/test/integration/sequencer/AbstractSequencerTest.java        (revision 2433)
+++ modeshape-integration-tests/src/test/java/org/modeshape/test/integration/sequencer/AbstractSequencerTest.java     (working copy)
@@ -205,6 +205,7 @@ public abstract class AbstractSequencerTest {
             Thread.sleep(100);
             actualMillis += 100;
         }
+        Thread.sleep(100);
         fail("Expected to find " + totalNumberOfNodesSequenced + " nodes sequenced, but found " + numFound);
     }
 
Index: modeshape-integration-tests/src/test/java/org/modeshape/test/integration/sequencer/ZipSequencerIntegrationTest.java
new file mode 100644
===================================================================
--- /dev/null        (revision 2433)
+++ modeshape-integration-tests/src/test/java/org/modeshape/test/integration/sequencer/ZipSequencerIntegrationTest.java     (working copy)
@@ -0,0 +1,106 @@
+/*
+ * ModeShape (http://www.modeshape.org)
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * See the AUTHORS.txt file in the distribution for a full listing of 
+ * individual contributors.
+ *
+ * ModeShape is free software. Unless otherwise indicated, all code in ModeShape
+ * is licensed to you 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.
+ * 
+ * ModeShape 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.modeshape.test.integration.sequencer;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
+import javax.jcr.Node;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ZipSequencerIntegrationTest extends AbstractSequencerTest {
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.modeshape.test.integration.sequencer.AbstractSequencerTest#getResourcePathToConfigurationFile()
+     */
+    @Override
+    protected String getResourcePathToConfigurationFile() {
+        return "config/configRepositoryForZipSequencing.xml";
+    }
+
+    @Before
+    @Override
+    public void beforeEach() throws Exception {
+        super.beforeEach();
+    }
+
+    @After
+    @Override
+    public void afterEach() {
+        super.afterEach();
+    }
+
+    @Test
+    public void shouldStartEngineWithRegisteredZipNodeTypes() throws Exception {
+        assertNodeType("zip:content", false, false, true, false, null, 2, 0, "nt:unstructured", "mix:mimeType");
+    }
+
+    @Test
+    public void shouldSequenceZipFile() throws Exception {
+        // print = true;
+        uploadFile("sequencers/zip/test-files.zip", "/files/");
+        waitUntilSequencedNodesIs(1);
+
+        // Find the sequenced node ...
+        Node zipped = assertNode("/sequenced/zip/test-files.zip", "zip:file");
+        Node file1 = assertNode("/sequenced/zip/test-files.zip/MODE-966-fix.patch", "nt:file");
+        Node data1 = assertNode("/sequenced/zip/test-files.zip/MODE-966-fix.patch/jcr:content", "nt:resource");
+        Node fold1 = assertNode("/sequenced/zip/test-files.zip/testFolder", "nt:folder");
+        Node file2 = assertNode("/sequenced/zip/test-files.zip/testFolder/MODE-962-fix.patch", "nt:file");
+        Node data2 = assertNode("/sequenced/zip/test-files.zip/testFolder/MODE-962-fix.patch/jcr:content", "nt:resource");
+        Node fold3 = assertNode("/sequenced/zip/test-files.zip/testFolder/testInnerFolder", "nt:folder");
+        Node file4 = assertNode("/sequenced/zip/test-files.zip/testFolder/testInnerFolder/MODE-960-fix.patch", "nt:file");
+        Node data4 = assertNode("/sequenced/zip/test-files.zip/testFolder/testInnerFolder/MODE-960-fix.patch/jcr:content",
+                                "nt:resource");
+        Node file5 = assertNode("/sequenced/zip/test-files.zip/testFolder/testInnerFolder/MODE-960-fix2.patch", "nt:file");
+        Node data5 = assertNode("/sequenced/zip/test-files.zip/testFolder/testInnerFolder/MODE-960-fix2.patch/jcr:content",
+                                "nt:resource");
+        assertThat(file1, is(notNullValue()));
+        assertThat(data1, is(notNullValue()));
+        assertThat(file2, is(notNullValue()));
+        assertThat(data2, is(notNullValue()));
+        assertThat(fold1, is(notNullValue()));
+        assertThat(fold3, is(notNullValue()));
+        assertThat(file4, is(notNullValue()));
+        assertThat(data4, is(notNullValue()));
+        assertThat(file5, is(notNullValue()));
+        assertThat(data5, is(notNullValue()));
+        printSubgraph(zipped);
+
+        printQuery("SELECT * FROM [nt:file]", 5);
+        printQuery("SELECT * FROM [nt:folder]", 4);
+        printQuery("SELECT * FROM [zip:file]", 1);
+    }
+
+    protected void uploadFiles( String destinationPath,
+                                String... resourcePaths ) throws Exception {
+        for (String resourcePath : resourcePaths) {
+            uploadFile(resourcePath, destinationPath);
+        }
+    }
+}
Index: modeshape-integration-tests/src/test/resources/config/configRepositoryForZipSequencing.xml
new file mode 100644
===================================================================
--- /dev/null        (revision 2433)
+++ modeshape-integration-tests/src/test/resources/config/configRepositoryForZipSequencing.xml     (working copy)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ ModeShape (http://www.modeshape.org)
+  ~
+  ~ See the COPYRIGHT.txt file distributed with this work for information
+  ~ regarding copyright ownership.  Some portions may be licensed
+  ~ to Red Hat, Inc. under one or more contributor license agreements.
+  ~ See the AUTHORS.txt file in the distribution for a full listing of 
+  ~ individual contributors.
+  ~
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
+  ~ is licensed to you 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.
+  ~
+  ~ ModeShape 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 distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  -->
+<configuration xmlns:mode="http://www.modeshape.org/1.0"
+               xmlns:jcr="http://www.jcp.org/jcr/1.0"
+               xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+    <!-- JCR Repositories.  This is required, with a separate repository for each JCR repository instance. -->
+    <mode:repositories>
+        <mode:repository jcr:name="Content" mode:source="Store">
+            <mode:options>
+                <mode:option jcr:name="jaasLoginConfigName" value="modeshape-jcr"/>
+            </mode:options>
+            <jcr:nodeTypes>
+                <mode:resource>/org/modeshape/sequencer/zip/zip.cnd</mode:resource>
+            </jcr:nodeTypes>
+        </mode:repository>
+    </mode:repositories>
+
+    <!-- Define the sources from which content is made available.  -->
+    <mode:sources jcr:primaryType="nt:unstructured">
+        <mode:source jcr:name="Store" mode:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource" mode:defaultWorkspaceName="default"/>
+    </mode:sources>
+
+    <!-- Define the sequencers. This is an optional section. -->
+    <mode:sequencers>
+        <mode:sequencer jcr:name="ZIP File Sequencer" mode:classname="org.modeshape.sequencer.zip.ZipSequencer">
+            <mode:description>Sequences ZIP files loaded into the repository under '/files', extracting the archive file contents into the equivalent JCR graph structure of 'nt:file' and 'nt:folder' nodes.</mode:description>        
+            <mode:pathExpression>/files(//)(*.zip[*])/jcr:content[@jcr:data] => /sequenced/zip/$1 </mode:pathExpression>
+        </mode:sequencer>                          
+    </mode:sequencers>
+</configuration>
Index: modeshape-integration-tests/src/test/resources/sequencers/zip/test-files.zip
new file mode 100644
===================================================================
Binary files /dev/null and modeshape-integration-tests/src/test/resources/sequencers/zip/test-files.zip differ