Merge pull request #2351 from adamretter/refactor/remove-legacy-users-restore

Remove legacy backup conversion code

Author: duncdrum

src/org/exist/config/ConfigurationDocumentTrigger.java

@@ -32,7 +32,6 @@
 import org.exist.security.*;
 import org.exist.security.SecurityManager;
 import org.exist.security.internal.RealmImpl;
-import org.exist.security.utils.ConverterFrom1_0;
 import org.exist.storage.DBBroker;
 import org.exist.storage.txn.Txn;
 import org.exist.util.sax.event.SAXEvent;
@@ -100,15 +99,6 @@ public void finish(final int event, final DBBroker broker, final Txn txn, final
             if (conf != null) {
                 conf.checkForUpdates(document.getDocumentElement());
             }
-            if (documentPath.toString().equals(ConverterFrom1_0.LEGACY_USERS_DOCUMENT_PATH)) {
-                try {
-                	final SecurityManager sm = broker.getBrokerPool().getSecurityManager();
-                    ConverterFrom1_0.convert(broker, sm, document);
-                } catch (final PermissionDeniedException | EXistException e) {
-                    LOG.error(e.getMessage(), e);
-                    //TODO : raise exception ? -pb
-                }
-            }
             break;
         }
     }
@@ -118,17 +108,6 @@ private void checkForUpdates(final DBBroker broker, final XmldbURI uri, final Do
         if (conf != null) {
             conf.checkForUpdates(document.getDocumentElement());
         }
-
-        //TODO : use XmldbURI methos ! not String.equals()
-        if (uri.toString().equals(ConverterFrom1_0.LEGACY_USERS_DOCUMENT_PATH)) {
-            try {
-            	final SecurityManager sm = broker.getBrokerPool().getSecurityManager();
-                ConverterFrom1_0.convert(broker, sm, document);
-            } catch (final PermissionDeniedException | EXistException e) {
-                LOG.error(e.getMessage(), e);
-                //TODO : raise exception ? -pb
-            }
-        }
     }
 
     @Override