Merge pull request eXist-db#4158 from evolvedbinary/cleanup/remove-plugins-managaer

Remove unused PluginsManager

Author: reinhapa

exist-core/src/main/java/org/exist/Database.java

@@ -34,7 +34,6 @@
 import org.exist.dom.persistent.SymbolTable;
 import org.exist.indexing.IndexManager;
 import org.exist.numbering.NodeIdFactory;
-import org.exist.plugin.PluginsManager;
 import org.exist.scheduler.Scheduler;
 import org.exist.security.AuthenticationException;
 import org.exist.security.SecurityManager;
@@ -181,8 +180,6 @@ public interface Database {
 
     public NotificationService getNotificationService();
 
-    public PluginsManager getPluginsManager();
-
     public BlobStore getBlobStore();
 
     public SymbolTable getSymbols();

exist-core/src/main/java/org/exist/backup/BackupHandler.java

@@ -95,7 +95,7 @@
  * </ul>
  *
  * The class should be used in combination with {@link ConsistencyCheck}. The error lists returned by ConsistencyCheck can be passed to {@link
- * #export(BackupHandler, org.exist.collections.Collection, BackupWriter, java.util.Date, BackupDescriptor, java.util.List, org.exist.dom.persistent.MutableDocumentSet)}.
+ * #export(org.exist.collections.Collection, BackupWriter, java.util.Date, BackupDescriptor, java.util.List, org.exist.dom.persistent.MutableDocumentSet)}.
  */
 public class SystemExport {
     public final static Logger LOG = LogManager.getLogger(SystemExport.class);
@@ -121,7 +121,6 @@ public class SystemExport {
     private StatusCallback callback = null;
     private boolean directAccess = false;
     private ProcessMonitor.Monitor monitor = null;
-    private BackupHandler bh = null;
     private ChainOfReceiversFactory chainFactory;
 
     public SystemExport(final DBBroker broker, final Txn transaction, final StatusCallback callback, final ProcessMonitor.Monitor monitor,
@@ -140,8 +139,6 @@ public SystemExport(final DBBroker broker, final Txn transaction, final StatusCa
         defaultOutputProperties.setProperty(EXistOutputKeys.PROCESS_XSL_PI, "no");
 
         contentsOutputProps.setProperty(OutputKeys.INDENT, "yes");
-
-        bh = broker.getDatabase().getPluginsManager().getBackupHandler(LOG);
     }
 
     @SuppressWarnings("unchecked")
@@ -370,7 +367,7 @@ private void exportOrphans(final BackupWriter output, final DocumentSet docs, fi
      * @throws SAXException
      * @throws TerminatedException DOCUMENT ME!
      */
-    private void export(final BackupHandler bh, final Collection current, final BackupWriter output, final Date date, final BackupDescriptor prevBackup, final List<ErrorReport> errorList, final MutableDocumentSet docs) throws IOException, SAXException, TerminatedException, PermissionDeniedException {
+    private void export(final Collection current, final BackupWriter output, final Date date, final BackupDescriptor prevBackup, final List<ErrorReport> errorList, final MutableDocumentSet docs) throws IOException, SAXException, TerminatedException, PermissionDeniedException {
 //        if( callback != null ) {
 //            callback.startCollection( current.getURI().toString() );
 //        }
@@ -405,16 +402,12 @@ private void export(final BackupHandler bh, final Collection current, final Back
                 e.printStackTrace();
             }
 
-            bh.backup(current, attr);
-
             serializer.startElement(Namespaces.EXIST_NS, "collection", "collection", attr);
 
             if (perm instanceof ACLPermission) {
                 Backup.writeACLPermission(serializer, (ACLPermission) perm);
             }
 
-            bh.backup(current, serializer);
-
             final int docsCount = current.getDocumentCountNoLock(broker);
             int count = 0;
 
@@ -429,7 +422,7 @@ private void export(final BackupHandler bh, final Collection current, final Back
                 if (doc.getFileURI().equalsInternal(CONTENTS_URI) || doc.getFileURI().equalsInternal(LOST_URI)) {
                     continue; // skip __contents__.xml documents
                 }
-                exportDocument(bh, output, date, prevBackup, serializer, docsCount, count, doc);
+                exportDocument(output, date, prevBackup, serializer, docsCount, count, doc);
                 docs.add(doc, false);
             }
 
@@ -479,7 +472,7 @@ private void export(final BackupHandler bh, final Collection current, final Back
     }
 
 
-    private void exportDocument(final BackupHandler bh, final BackupWriter output, final Date date, final BackupDescriptor prevBackup, final SAXSerializer serializer, final int docsCount, final int count, final DocumentImpl doc) throws IOException, SAXException, TerminatedException {
+    private void exportDocument(final BackupWriter output, final Date date, final BackupDescriptor prevBackup, final SAXSerializer serializer, final int docsCount, final int count, final DocumentImpl doc) throws IOException, SAXException, TerminatedException {
         if (callback != null) {
             callback.startDocument(doc.getFileURI().toString(), count, docsCount);
         }
@@ -571,15 +564,11 @@ private void exportDocument(final BackupHandler bh, final BackupWriter output, f
 //            }
 //        }
 
-        bh.backup(doc, attr);
-
         serializer.startElement(Namespaces.EXIST_NS, "resource", "resource", attr);
         if (perms instanceof ACLPermission) {
             Backup.writeACLPermission(serializer, (ACLPermission) perms);
         }
 
-        bh.backup(doc, serializer);
-
         serializer.endElement(Namespaces.EXIST_NS, "resource", "resource");
     }
 
@@ -768,7 +757,7 @@ public boolean indexInfo(final Value value, final long pointer) throws Terminate
                         lastPercentage = percentage;
                         jmxAgent.updateStatus(broker.getBrokerPool(), percentage);
                     }
-                    export(bh, collection, writer, date, bd, errors, docs);
+                    export(collection, writer, date, bd, errors, docs);
                 }
             } catch (final TerminatedException e) {
                 reportError("Terminating system export upon request", e);
@@ -837,7 +826,7 @@ public boolean indexInfo(final Value key, final long pointer) throws TerminatedE
                         doc.setFileURI(XmldbURI.createInternal(fileURI));
                         writtenDocs.add(fileURI);
                     }
-                    exportDocument(bh, output, date, prevBackup, serializer, 0, 0, doc);
+                    exportDocument(output, date, prevBackup, serializer, 0, 0, doc);
                 } catch (final Exception e) {
                     reportError("Caught an exception while scanning documents: " + e.getMessage(), e);
                 }

exist-core/src/main/java/org/exist/backup/RestoreHandler.java

@@ -24,13 +24,8 @@
 import org.exist.Namespaces;
 import org.exist.backup.BackupDescriptor;
 import org.exist.backup.restore.listener.RestoreListener;
-import org.exist.collections.Collection;
-import org.exist.dom.persistent.LockedDocument;
-import org.exist.security.PermissionDeniedException;
 import org.exist.storage.DBBroker;
-import org.exist.storage.lock.Lock;
 import org.exist.storage.txn.Txn;
-import org.exist.xmldb.XmldbURI;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -45,8 +40,6 @@
  * @author <a href="mailto:adam@exist-db.org">Adam Retter</a>
  */
 public class SystemImportHandler extends AbstractRestoreHandler {
-    
-    private final org.exist.backup.RestoreHandler rh;
 
     /**
      * @param broker the database broker
@@ -59,13 +52,11 @@ public class SystemImportHandler extends AbstractRestoreHandler {
     public SystemImportHandler(final DBBroker broker, @Nullable final Txn transaction, final BackupDescriptor descriptor,
             final RestoreListener listener) {
         super(broker, transaction, descriptor, listener, null);
-        this.rh = broker.getDatabase().getPluginsManager().getRestoreHandler();
     }
 
     @Override
     public void startDocument() throws SAXException {
         super.startDocument();
-        rh.startDocument();
     }
 
     @Override
@@ -77,8 +68,6 @@ public void startElement(final String namespaceURI, final String localName, fina
                         DELETED_ELEMENT_NAME.equals(localName) ||
                         ACE_ELEMENT_NAME.equals(localName))) {
             super.startElement(namespaceURI, localName, qName, atts);
-        } else {
-            rh.startElement(namespaceURI, localName, qName, atts);
         }
     }
 
@@ -91,8 +80,6 @@ public void endElement(final String namespaceURI, final String localName, final
                         DELETED_ELEMENT_NAME.equals(localName) ||
                         ACE_ELEMENT_NAME.equals(localName))) {
             super.endElement(namespaceURI, localName, qName);
-        } else {
-            rh.endElement(namespaceURI, localName, qName);
         }
     }
 
@@ -102,32 +89,4 @@ protected AbstractRestoreHandler newSelf(final DBBroker broker, final @Nullable
             @Nullable final Set<String> pathsToIgnore) {
         return new SystemImportHandler(broker, transaction, descriptor, listener);
     }
-
-    @Override
-    protected void notifyStartCollectionRestore(final XmldbURI collectionUri, final Attributes attributes) throws PermissionDeniedException {
-        try (final Collection collection = broker.openCollection(collectionUri, Lock.LockMode.WRITE_LOCK)) {
-            rh.startCollectionRestore(collection, attributes);
-        }
-    }
-
-    @Override
-    protected void notifyEndCollectionRestore(final XmldbURI collectionUri) throws PermissionDeniedException {
-        try (final Collection collection = broker.openCollection(collectionUri, Lock.LockMode.WRITE_LOCK)) {
-            rh.endCollectionRestore(collection);
-        }
-    }
-
-    @Override
-    protected void notifyStartDocumentRestore(final XmldbURI documentUri, final Attributes attributes) throws PermissionDeniedException {
-        try (final LockedDocument lockedDocument = broker.getXMLResource(documentUri, Lock.LockMode.WRITE_LOCK)) {
-            rh.startDocumentRestore(lockedDocument.getDocument(), attributes);
-        }
-    }
-
-    @Override
-    protected void notifyEndDocumentRestore(final XmldbURI documentUri) throws PermissionDeniedException {
-        try (final LockedDocument lockedDocument = broker.getXMLResource(documentUri, Lock.LockMode.WRITE_LOCK)) {
-            rh.endDocumentRestore(lockedDocument.getDocument());
-        }
-    }
 }

exist-core/src/main/java/org/exist/backup/SystemExport.java

@@ -191,16 +191,6 @@ public class InteractiveClient {
 
     protected ClientFrame frame;
 
-    //XXX:make pluggable
-    private static boolean havePluggableCommands = false;
-    static {
-        try {
-            Class.forName("org.exist.plugin.command.Commands");
-            havePluggableCommands = true;
-        } catch (final Exception e) {
-            havePluggableCommands = false;
-        }
-    }
     //*************************************
 
     private final CommandlineOptions options;
@@ -245,10 +235,6 @@ protected void displayHelp() {
         messageln("                     the current collection.");
         messageln("lock resource        put a write lock on the specified resource.");
         messageln("unlock resource      remove a write lock from the specified resource.");
-        if (havePluggableCommands) {
-            messageln("svn                  subversion command-line client.");
-            messageln("threads              threads debug information.");
-        }
         messageln("quit                 quit the program");
     }
 
@@ -1109,20 +1095,6 @@ protected boolean process(final String line) {
                 displayHelp();
             } else if (args[0].equalsIgnoreCase("quit")) {
                 return false;
-                //XXX:make it pluggable
-            } else if (havePluggableCommands) {
-                final EXistCollectionManagementService mgtService = current.getService(EXistCollectionManagementService.class);
-                try {
-                    mgtService.runCommand(args);
-                } catch (final XMLDBException e) {
-                    if (e.getCause() != null && e.getCause().getClass().getName().equals("org.exist.plugin.command.CommandNotFoundException")) {
-                        messageln("unknown command: '" + args[0] + "'");
-                        return true;
-                    } else {
-                        throw e;
-                    }
-                }
-                //****************************************************************
             } else {
                 messageln("unknown command: '" + args[0] + "'");
                 return true;