Skip to content

Commit 1a34e9c

Browse files
committed
[refactor] Remove legacy backup conversion code. Very unlikely we need this anymore, and it causes problems in backups with different passwords
1 parent eba9fee commit 1a34e9c

File tree

2 files changed

+0
-216
lines changed

2 files changed

+0
-216
lines changed

src/org/exist/config/ConfigurationDocumentTrigger.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.exist.security.*;
3333
import org.exist.security.SecurityManager;
3434
import org.exist.security.internal.RealmImpl;
35-
import org.exist.security.utils.ConverterFrom1_0;
3635
import org.exist.storage.DBBroker;
3736
import org.exist.storage.txn.Txn;
3837
import org.exist.util.sax.event.SAXEvent;
@@ -100,15 +99,6 @@ public void finish(final int event, final DBBroker broker, final Txn txn, final
10099
if (conf != null) {
101100
conf.checkForUpdates(document.getDocumentElement());
102101
}
103-
if (documentPath.toString().equals(ConverterFrom1_0.LEGACY_USERS_DOCUMENT_PATH)) {
104-
try {
105-
final SecurityManager sm = broker.getBrokerPool().getSecurityManager();
106-
ConverterFrom1_0.convert(broker, sm, document);
107-
} catch (final PermissionDeniedException | EXistException e) {
108-
LOG.error(e.getMessage(), e);
109-
//TODO : raise exception ? -pb
110-
}
111-
}
112102
break;
113103
}
114104
}
@@ -118,17 +108,6 @@ private void checkForUpdates(final DBBroker broker, final XmldbURI uri, final Do
118108
if (conf != null) {
119109
conf.checkForUpdates(document.getDocumentElement());
120110
}
121-
122-
//TODO : use XmldbURI methos ! not String.equals()
123-
if (uri.toString().equals(ConverterFrom1_0.LEGACY_USERS_DOCUMENT_PATH)) {
124-
try {
125-
final SecurityManager sm = broker.getBrokerPool().getSecurityManager();
126-
ConverterFrom1_0.convert(broker, sm, document);
127-
} catch (final PermissionDeniedException | EXistException e) {
128-
LOG.error(e.getMessage(), e);
129-
//TODO : raise exception ? -pb
130-
}
131-
}
132111
}
133112

134113
@Override

src/org/exist/security/utils/ConverterFrom1_0.java

Lines changed: 0 additions & 195 deletions
This file was deleted.

0 commit comments

Comments
 (0)