Skip to content

Props and sync #549

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
joewiz merged 11 commits into from
Jun 9, 2021
Merged

Props and sync #549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf23e6d
documentation on properties and synchronization
eduarddrenth Nov 25, 2020
a063e39
revert bootstrap update
eduarddrenth Nov 28, 2020
c1d1f70
new version of add-on
eduarddrenth Nov 28, 2020
8e6c90c
validation
eduarddrenth Nov 29, 2020
e06fb0a
dependency in pom.xml
eduarddrenth Dec 14, 2020
7ff4ab1
Merge remote-tracking branch 'upstream/master' into props_and_sync
eduarddrenth Dec 14, 2020
b82d00d
new version
eduarddrenth Apr 18, 2021
538fe15
new version
eduarddrenth Apr 18, 2021
cabefae
Merge remote-tracking branch 'upstream/master' into props_and_sync
eduarddrenth Apr 19, 2021
37ac0ca
listings not in CDATA
eduarddrenth Apr 19, 2021
a98cb8a
listings in separate files
eduarddrenth Apr 19, 2021
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
Prev Previous commit
Next Next commit
listings not in CDATA
  • Loading branch information
@eduarddrenth
eduarddrenth committed Apr 19, 2021
commit 37ac0ca6d95b90cdc2aa64e9b0bf2ab59f5efe65
25 changes: 3 additions & 22 deletions src/main/xar-resources/data/datasync/datasync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,14 @@
<sect2 xml:id="classpath">
<title>Include exist-db-addons</title>
<para>For example in a Dockerfile:</para>
<programlisting language="Dockerfile">
ARG EXISTADDONSERSION=2.3
COPY exist-db-addons-${EXISTADDONSERSION}.jar $EXIST_HOME/lib/
ENV CLASSPATH=$EXIST_HOME/lib/exist.uber.jar:$EXIST_HOME/lib/exist-db-addons-${EXISTADDONSERSION}.jar
</programlisting>
<programlisting language="Dockerfile" xlink:href="listings/docker.txt"/>
<para>Or include a dependency in exist-db's pom.xml:</para>
<programlisting language="xml"><![CDATA[
<dependency>
<groupId>org.fryske-akademy</groupId>
<artifactId>exist-db-addons</artifactId>
<version>2.3</version>
</dependency>]]></programlisting>
<programlisting language="xml" xlink:href="listings/mavenconf.xml"/>
</sect2>
<sect2 xml:id="conf.xml">
<title>configure in conf.xml</title>
<para>The first job below will sync at start-up, the second will sync at 2am, <link xlink:href="../scheduler/scheduler.xml">see scheduler</link></para>
<programlisting language="xml"><![CDATA[
<job class="org.fryske_akademy.exist.jobs.DataSyncTask" type="system" period="10" repeat="0" >
<parameter name="collection" value="xmldb:exist:///db/apps/teidictjson/data"/>
<parameter name="datadir" value="/data"/>
</job>
<job class="org.fryske_akademy.exist.jobs.DataSyncTaskCron" type="system" cron-trigger="0 0 2 ? * *" >
<parameter name="collection" value="xmldb:exist:///db/apps/teidictjson/data"/>
<parameter name="datadir" value="/data"/>
</job>
]]>
</programlisting>
<programlisting language="xml" xlink:href="listings/existconf.xml"/>
</sect2>
</sect1>
</article>
3 changes: 3 additions & 0 deletions src/main/xar-resources/data/datasync/listings/docker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ARG EXISTADDONSERSION=2.3
COPY exist-db-addons-${EXISTADDONSERSION}.jar $EXIST_HOME/lib/
ENV CLASSPATH=$EXIST_HOME/lib/exist.uber.jar:$EXIST_HOME/lib/exist-db-addons-${EXISTADDONSERSION}.jar
8 changes: 8 additions & 0 deletions src/main/xar-resources/data/datasync/listings/existconf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<job class="org.fryske_akademy.exist.jobs.DataSyncTask" type="system" period="10" repeat="0" >
<parameter name="collection" value="xmldb:exist:///db/apps/teidictjson/data"/>
<parameter name="datadir" value="/data"/>
</job>
<job class="org.fryske_akademy.exist.jobs.DataSyncTaskCron" type="system" cron-trigger="0 0 2 ? * *" >
<parameter name="collection" value="xmldb:exist:///db/apps/teidictjson/data"/>
<parameter name="datadir" value="/data"/>
</job>
5 changes: 5 additions & 0 deletions src/main/xar-resources/data/datasync/listings/mavenconf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<dependency>
<groupId>org.fryske-akademy</groupId>
<artifactId>exist-db-addons</artifactId>
<version>2.3</version>
</dependency>
3 changes: 3 additions & 0 deletions src/main/xar-resources/data/properties/listings/docker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ARG EXISTADDONSERSION=2.3
COPY exist-db-addons-${EXISTADDONSERSION}.jar $EXIST_HOME/lib/
ENV CLASSPATH=$EXIST_HOME/lib/exist.uber.jar:$EXIST_HOME/lib/exist-db-addons-${EXISTADDONSERSION}.jar
4 changes: 4 additions & 0 deletions src/main/xar-resources/data/properties/listings/existconf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<module uri="http://exist-db.org/xquery/properties"
class="org.fryske_akademy.exist.properties.PropertiesModule">
<parameter name="basePath" value="/run/secrets"/>
</module>
5 changes: 5 additions & 0 deletions src/main/xar-resources/data/properties/listings/mavenconf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<dependency>
<groupId>org.fryske-akademy</groupId>
<artifactId>exist-db-addons</artifactId>
<version>2.3</version>
</dependency>
25 changes: 5 additions & 20 deletions src/main/xar-resources/data/properties/properties.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,14 @@
<sect2 xml:id="classpath">
<title>Include exist-db-addons</title>
<para>For example in a Dockerfile:</para>
<programlisting language="Dockerfile">
ARG EXISTADDONSERSION=1.7
COPY exist-db-addons-${EXISTADDONSERSION}.jar $EXIST_HOME/lib/
ENV CLASSPATH=$EXIST_HOME/lib/exist.uber.jar:$EXIST_HOME/lib/exist-db-addons-${EXISTADDONSERSION}.jar
</programlisting>
<programlisting language="Dockerfile" xlink:href="listings/docker.txt"/>
<para>Or include a dependency in exist-db's pom.xml:</para>
<programlisting language="xml"><![CDATA[
<dependency>
<groupId>org.fryske-akademy</groupId>
<artifactId>exist-db-addons</artifactId>
<version>1.7</version>
</dependency>]]></programlisting>
<programlisting language="xml" xlink:href="listings/mavenconf.xml"/>
</sect2>
<sect2 xml:id="conf.xml">
<title>configure in conf.xml</title>
<para>add the module to exist:</para>
<programlisting language="xml"><![CDATA[
<module uri="http://exist-db.org/xquery/properties"
class="org.fryske_akademy.exist.properties.PropertiesModule">
<parameter name="basePath" value="/run/secrets"/>
</module>
]]>
</programlisting>
<programlisting language="xml" xlink:href="listings/existconf.xml"/>
</sect2>
<sect2 xml:id="xquery">
<title>use properties in xquery</title>
Expand All @@ -70,8 +55,8 @@ declare function teidictjson:getProperty($key as xs:string, $default as xs:strin
map:get($teidictjson:props,$key)
else
$default
};
</programlisting>
};
</programlisting>
</sect2>
<sect2 xml:id="docker-secret">
<title>optionally mount properties as docker secret</title>
Expand Down