Skip to content

Remove legacy backup conversion code #2351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2019
Merged

Remove legacy backup conversion code #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions src/org/exist/config/ConfigurationDocumentTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand All @@ -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
Expand Down
195 changes: 0 additions & 195 deletions src/org/exist/security/utils/ConverterFrom1_0.java
View file
Open in desktop

This file was deleted.