Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java	(revision 882540)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java	(working copy)
@@ -16,10 +16,10 @@
  */
 package org.apache.jackrabbit.core.xml;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
-import java.util.ArrayList;
 
 import javax.jcr.AccessDeniedException;
 import javax.jcr.ImportUUIDBehavior;
@@ -38,6 +38,7 @@
 import org.apache.jackrabbit.core.config.ImportConfig;
 import org.apache.jackrabbit.core.id.NodeId;
 import org.apache.jackrabbit.core.security.authorization.Permission;
+import org.apache.jackrabbit.core.security.user.UserImporter;
 import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.QPropertyDefinition;
@@ -64,11 +65,11 @@
      */
     private final ReferenceChangeTracker refTracker;
 
-    private final List<ProtectedNodeImporter> pnImporters = new ArrayList();
+    private final List<ProtectedNodeImporter> pnImporters = new ArrayList<ProtectedNodeImporter>();
     /**
      * Available importers for protected properties.
      */
-    private final List<ProtectedPropertyImporter> ppImporters = new ArrayList();
+    private final List<ProtectedPropertyImporter> ppImporters = new ArrayList<ProtectedPropertyImporter>();
 
     /**
      * Currently active importer for protected nodes.
@@ -95,7 +96,7 @@
      * @param importTargetNode the target node
      * @param session session
      * @param uuidBehavior the uuid behaviro
-     * @param config
+     * @param config the import configuration
      */
     public SessionImporter(NodeImpl importTargetNode, SessionImpl session,
                            int uuidBehavior, ImportConfig config) {
@@ -125,13 +126,13 @@
 
         // missing config -> initialize defaults.
         if (pnImporters.isEmpty()) {
-            ProtectedNodeImporter def = new DefaultProtectedNodeImporter();
+            ProtectedNodeImporter def = new AccessControlImporter();
             if (def.init(session, session, false, uuidBehavior, refTracker)) {
                 pnImporters.add(def);
             }
         }
         if (ppImporters.isEmpty()) {
-            DefaultProtectedPropertyImporter def = new DefaultProtectedPropertyImporter();
+            ProtectedPropertyImporter def = new UserImporter();
             if (def.init(session, session, false, uuidBehavior, refTracker)) {
                 ppImporters.add(def);
             }