update to exist 5.2.0

.gitlab-ci.yml

@@ -36,17 +36,17 @@ installation:
   stage: test
   script:
     - ant test
-    - bash test/eXist-db-*/bin/startup.sh | tee output.log &
+    - bash test/bin/startup.sh | tee output.log &
     # wait for eXist
     - while [ $(curl -I -s http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 2s; done
     # shutdown eXist
-    - bash test/eXist-db-*/bin/shutdown.sh
+    - bash test/bin/shutdown.sh
     - ls -al /tmp; mv /tmp/tests-* . || true
   artifacts:
     paths:
       - output.log
       - test/tests-*.xml
-      - test/eXist-db-*/webapp/WEB-INF/logs/expath-repo.log
+      - test/logs/expath-repo.log
     reports:
         junit: test/tests-*.xml
 

build.properties

@@ -2,7 +2,7 @@ project.name=http://textgrid.de/ns/SADE-fontane-develop
 project.version=5.0.0
 project.title=[Fontane] SADE
 project.abbrev=SADE-fontane-develop
-project.processorversion=4.7.0
+project.processorversion=5.2.0
 
 dependency.track=-develop
 

build.xml

@@ -30,23 +30,30 @@
     <target name="test" depends="xar">
       <delete dir="${build.dir}">
           <include name="eXist-db-*.tar.bz2"/>
-          <exclude name="eXist-db-${project.processorversion}.tar.bz2"/>
+          <exclude name="eXist-${project.processorversion}.tar.bz2"/>
       </delete>
-      <get src="https://bintray.com/existdb/releases/download_file?file_path=eXist-db-${project.processorversion}.tar.bz2" dest="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" skipexisting="true" />
-      <untar src="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" dest="${test.dir}" compression="bzip2" />
-
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=cv${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/codeview-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=tgconnect${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/tgconnect${dependency.track}-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fontane${dependency.track}-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane-lucene-exist-module&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fontane-lucene-latest.xar" ignoreerrors="true"/>
-      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=openapi${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/openapi${dependency.track}-latest.xar" ignoreerrors="true"/>
-
-      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=markdown&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/markdown-latest.xar" ignoreerrors="true"/>
-      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=xqjson&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/xqjson-latest.xar" ignoreerrors="true"/>
-      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=fundocs&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fundocs-latest.xar" ignoreerrors="true"/>
-
-      <copy file="${destfile}" todir="${test.dir}/eXist-db-${project.processorversion}/autodeploy" />
-      <copy todir="${test.dir}/eXist-db-${project.processorversion}/tools/jetty/webapps/portal/public" preservelastmodified="true" failonerror="false">
+      <get src="https://bintray.com/existdb/releases/download_file?file_path=exist-distribution-${project.processorversion}-unix.tar.bz2" dest="${build.dir}/eXist-${project.processorversion}.tar.bz2" skipexisting="true" quiet="true" />
+      <untar src="${build.dir}/eXist-${project.processorversion}.tar.bz2" dest="${test.dir}" compression="bzip2">
+        <cutdirsmapper dirs="1" />
+      </untar>
+      <setpermissions mode="755">
+        <fileset dir="${test.dir}">
+          <filename name="bin/*.sh"/>
+        </fileset>
+      </setpermissions>
+
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=cv${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/codeview-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=tgconnect${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/tgconnect${dependency.track}-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/fontane${dependency.track}-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane-lucene-exist-module&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/fontane-lucene-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=openapi${dependency.track}&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/openapi${dependency.track}-latest.xar" ignoreerrors="true"/>
+
+      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=markdown&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/markdown-latest.xar" ignoreerrors="true"/>
+      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=xqjson&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/xqjson-latest.xar" ignoreerrors="true"/>
+      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=fundocs&amp;processor=${project.processorversion}" dest="${test.dir}/autodeploy/fundocs-latest.xar" ignoreerrors="true"/>
+
+      <copy file="${destfile}" todir="${test.dir}/autodeploy" />
+      <copy todir="${test.dir}/etc/jetty/webapps/portal/public" preservelastmodified="true" failonerror="false">
         <fileset dir="${basedir}/../static/public"/>
       </copy>
     </target>