Merge pull request #2262 from adamretter/refactor/xmldb-prov

Improve the provenance of the XML:DB API dependency

Author: dizzzz

.classpath

@@ -62,7 +62,7 @@
 	<classpathentry kind="lib" path="lib/core/log4j-jul-2.11.0.jar"/>
 	<classpathentry kind="lib" path="lib/core/jargo-0.4.14.jar"/>
 	<classpathentry kind="lib" path="lib/core/multilock-1.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/core/xmldb.jar"/>
+	<classpathentry kind="lib" path="lib/core/xmldb-api-1.1-patched.jar"/>
 	<classpathentry kind="lib" path="lib/optional/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/core/commons-io-2.6.jar"/>
         <classpathentry kind="lib" path="lib/optional/jaxb-api-2.3.0.jar"/>

lib/core/xmldb-api-1.1-patched.jar

@@ -1,4 +1,4 @@
-auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterActiveProfile=
+xiliary.de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterActiveProfile=
 auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterEnabled=false
 auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterLocation=
 auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction=false
@@ -238,7 +238,7 @@ debug.test.classpath=${run.test.classpath}
 file.reference.existdb-favicon.jar=tools/jetty/lib/existdb-favicon.jar
 main.class=
 jar.archive.disabled=${jnlp.enabled}
-file.reference.xmldb.jar=lib/core/xmldb.jar
+file.reference.xmldb-api-1.1-patched.jar=lib/core/xmldb-api-1.1-patched.jar
 file.reference.jing-20151127.jar=lib/optional/jing-20151127.jar
 file.reference.xml-apis-1.4.01.jar=lib/endorsed/xml-apis-1.4.01.jar
 file.reference.jline-0.9.94.jar=lib/core/jline-0.9.94.jar
@@ -292,7 +292,7 @@ javac.classpath=\
     ${file.reference.slf4j-api-1.7.25.jar}:\
     ${file.reference.quartz-2.3.0.jar}:\
     ${file.reference.ws-commons-util-1.0.2.jar}:\
-    ${file.reference.xmldb.jar}:\
+    ${file.reference.xmldb-api-1.1-patched.jar}:\
     ${file.reference.xmlrpc-client-3.1.3.jar}:\
     ${file.reference.xmlrpc-common-3.1.3.jar}:\
     ${file.reference.xmlrpc-server-3.1.3.jar}:\

lib/core/xmldb-LICENSE.txt renamed to lib/core/xmldb-api-LICENSE.txt

@@ -58,7 +58,7 @@ lib/core/slf4j-api-%latest%.jar                    always
 lib/core/pkg-java-fork.jar                         always
 lib/core/quartz-%latest%.jar                       always
 lib/core/ws-commons-util-%latest%.jar              always
-lib/core/xmldb.jar                                 always
+lib/core/xmldb-api-%latest%.jar                    always
 lib/core/xmlrpc-client-%latest%.jar                always
 lib/core/xmlrpc-common-%latest%.jar                always
 lib/core/xmlrpc-server-%latest%.jar                always

lib/core/xmldb.jar

@@ -87,6 +87,13 @@ public void addResource(final Resource resource) throws XMLDBException {
         resources.add(resource);
     }
 
+    @Override
+    public void addAll(final ResourceSet resourceSet) throws XMLDBException {
+        for (long i = 0; i < resourceSet.getSize(); i++) {
+            addResource(resourceSet.getResource(i));
+        }
+    }
+
     @Override
     public void clear() throws XMLDBException {
         //cleanup any binary values

nbproject/project.properties

@@ -79,6 +79,13 @@ public void addResource(final Resource resource) throws XMLDBException {
         resourcesVector.add(resource);
     }
 
+    @Override
+    public void addAll(final ResourceSet resourceSet) throws XMLDBException {
+        for (long i = 0; i < resourceSet.getSize(); i++) {
+            addResource(resourceSet.getResource(i));
+        }
+    }
+
     /**
      * Make the container empty
      *

src/org/exist/start/start.config

@@ -74,6 +74,13 @@ public void addResource(final Resource resource) {
         resources.add(resource);
     }
 
+    @Override
+    public void addAll(final ResourceSet resourceSet) throws XMLDBException {
+        for (long i = 0; i < resourceSet.getSize(); i++) {
+            addResource(resourceSet.getResource(i));
+        }
+    }
+
     @Override
     public void clear() throws XMLDBException {
         if (handle < 0) {