Skip to content

Commit 7d959d8

Browse files
committedApr 20, 2023
Implement #5770 "Remove eXist from build"
1 parent e8023a5 commit 7d959d8

36 files changed

+12
-4132
lines changed
 

‎build.xml

+2-111
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1212
The full text of the license is available at http://www.gnu.org/copyleft/lesser.html
1313
-->
14-
<project name="orbeon" default="orbeon-dev-war" xmlns:xdb="http://exist-db.org/ant">
14+
<project name="orbeon" default="orbeon-dev-war">
1515

1616
<!-- Properties to update when version number changes -->
1717
<property name="version.number" value="2022.1.4-SNAPSHOT"/>
@@ -66,7 +66,6 @@
6666
6767
- xqjapi.jar
6868
- xqj2-0.0.1.jar
69-
- exist-xqj-1.0.1.jar
7069
7170
oxf:pdf-to-image:
7271
@@ -245,7 +244,7 @@
245244
</copy>
246245
</target>
247246

248-
<target name="orbeon-dist-war" depends="war-common, exist-import-sample-data-to-build" description="Creates Orbeon Forms WAR">
247+
<target name="orbeon-dist-war" depends="war-common" description="Creates Orbeon Forms WAR">
249248

250249
<mkdir dir="build/distrib"/>
251250

@@ -256,11 +255,6 @@
256255
<exclude name="WEB-INF/lib/orbeon-embedding.jar"/>
257256
<exclude name="WEB-INF/lib/orbeon-proxy-portlet.jar"/>
258257
</zipfileset>
259-
<!-- eXist sample database -->
260-
<zipfileset dir="build/exist-data" prefix="WEB-INF/exist-data">
261-
<exclude name="*.log"/>
262-
<exclude name="*.lck"/>
263-
</zipfileset>
264258
</zip>
265259
</target>
266260

@@ -476,8 +470,6 @@
476470

477471
<delete dir="build/temp/test"/>
478472
<mkdir dir="build/temp/test"/>
479-
<delete dir="src/resources-packaged/ops/unit-tests/exist-data"/>
480-
<mkdir dir="src/resources-packaged/ops/unit-tests/exist-data"/>
481473

482474
<!-- Run sbt tests -->
483475
<exec executable="sbt" failonerror="true">
@@ -580,105 +572,4 @@
580572

581573
<target name="orbeon-dist" depends="orbeon-dist-checksum"/>
582574

583-
<target name="exist-task" depends="war-common">
584-
<!-- eXist tasks -->
585-
<!-- http://exist-db.org/ant-tasks.html -->
586-
<typedef resource="org/exist/ant/antlib.xml" uri="http://exist-db.org/ant">
587-
<classpath>
588-
<fileset dir="orbeon-war/jvm/target/webapp/WEB-INF/lib">
589-
<include name="**/*.jar"/>
590-
</fileset>
591-
</classpath>
592-
</typedef>
593-
</target>
594-
595-
<target name="exist-export-from-web-inf" depends="exist-task">
596-
<delete dir="build/exist-data-exported"/>
597-
<mkdir dir="build/exist-data-exported"/>
598-
<xdb:extract
599-
configuration="build/orbeon-war/WEB-INF/exist-conf.xml"
600-
uri="xmldb:exist:///db"
601-
initDb="true"
602-
destdir="build/exist-data-exported"
603-
subcollections="true"
604-
createdirectories="true"/>
605-
<move todir="build/exist-data-exported" includeEmptyDirs="false">
606-
<fileset dir="build/exist-data-exported">
607-
<include name="**/*.xhtml.xml"/>
608-
</fileset>
609-
<globmapper from="*.xhtml.xml" to="*.xhtml"/>
610-
</move>
611-
</target>
612-
613-
<target name="exist-import-sample-data-to-build" depends="exist-task">
614-
<delete dir="build/exist-data"/>
615-
<mkdir dir="build/exist-data"/>
616-
<!-- Store config first -->
617-
<xdb:store
618-
configuration="${basedir}/descriptors/ant-exist-conf.xml"
619-
uri="xmldb:exist:///db"
620-
initDb="true"
621-
createcollection="true"
622-
createsubcollections="true"
623-
user="admin"
624-
password="">
625-
<fileset dir="data">
626-
<include name="system/**"/>
627-
</fileset>
628-
</xdb:store>
629-
<!-- Store data -->
630-
<xdb:store
631-
configuration="${basedir}/descriptors/ant-exist-conf.xml"
632-
uri="xmldb:exist:///db"
633-
initDb="true"
634-
createcollection="true"
635-
createsubcollections="true"
636-
user="guest"
637-
password="guest">
638-
<fileset dir="data">
639-
<include name="orbeon/**"/>
640-
</fileset>
641-
</xdb:store>
642-
<!-- Make sure the database is shut down -->
643-
<xdb:shutdown
644-
configuration="${basedir}/descriptors/ant-exist-conf.xml"
645-
uri="xmldb:exist:///db"
646-
user="admin"
647-
password=""/>
648-
</target>
649-
650-
<!--
651-
For this to work:
652-
653-
- Comment out the eXist security filter in web.xml.
654-
- Enable the xmlrpc servlet in web.xml.
655-
- Start Orbeon Forms and access a form that requires eXist first.
656-
-->
657-
<target name="exist-import-sample-data-to-localhost" depends="exist-task">
658-
<!-- Store config first -->
659-
<xdb:store
660-
uri="xmldb:exist://localhost:8080/orbeon/exist/xmlrpc/db"
661-
initDb="true"
662-
createcollection="true"
663-
createsubcollections="true"
664-
user="admin"
665-
password="">
666-
<fileset dir="data">
667-
<include name="system/**"/>
668-
</fileset>
669-
</xdb:store>
670-
<!-- Store data only -->
671-
<xdb:store
672-
uri="xmldb:exist://localhost:8080/orbeon/exist/xmlrpc/db"
673-
initDb="true"
674-
createcollection="true"
675-
createsubcollections="true"
676-
user="guest"
677-
password="guest">
678-
<fileset dir="data">
679-
<include name="orbeon/**"/>
680-
</fileset>
681-
</xdb:store>
682-
</target>
683-
684575
</project>

‎descriptors/ant-exist-conf.xml

-55
This file was deleted.

‎form-runner/jvm/src/main/resources/apps/fr/persistence/exist/README.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.