Please update to the latest develop revision

.github/workflows/deploy.yml

@@ -0,0 +1,84 @@
+# Deployment to Google Compute Engine
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - feature**
+
+env:
+  PROJECT_NAME: opensiddur-client
+  BACKUP_BUCKET_BASE: opensiddur-database-backups
+  ZONE: us-west2-a
+  MACHINE_TYPE: n1-standard-1
+  IMAGE_PROJECT: ubuntu-os-cloud
+  IMAGE_VERSION: ubuntu-2204
+  BOOT_DISK_SIZE_GB: 20
+  EXIST_MEMORY: 3072
+  STACK_MEMORY: 512
+  SERVICE_ACCOUNT: opensiddur-deploy-1@opensiddur-client.iam.gserviceaccount.com
+  ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
+  DYN_USERNAME: ${{ secrets.DYN_USERNAME }}
+  DYN_PASSWORD: ${{ secrets.DYN_PASSWORD }}
+  DYN_EMAIL: ${{ secrets.DYN_EMAIL }}
+
+jobs:
+  setup-build-publish-deploy:
+    name: Setup, Build, Publish, and Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set calculated vars
+        id: vars
+        run: |-
+          BRANCH=${GITHUB_REF#refs/heads/}
+          INSTANCE_BASE=$(echo ${{env.PROJECT_NAME}}-${BRANCH//[.\/]/-} | tr '[:upper:]' '[:lower:]' )
+          VERSION=$(git rev-parse --short=8 ${{ github.sha }})
+          echo ::set-output name=VERSION::${VERSION}
+          echo ::set-output name=BRANCH::${BRANCH}
+          echo ::set-output name=INSTANCE_BASE::${INSTANCE_BASE}
+          echo ::set-output name=INSTANCE_NAME::${INSTANCE_BASE}-${VERSION}
+      - uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      # Setup gcloud CLI
+      - id: auth
+        uses: google-github-actions/auth@v0
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v0.3.0
+      - name: Verify gcloud CLI
+        run: gcloud info
+      - name: Install packages
+        run: sudo apt-get install libxml2-utils python3-lxml
+
+      - name: Build
+        run: |-
+          ant test
+      - name: Deploy
+        run: |-
+          gcloud compute \
+                --project=${{env.PROJECT_NAME}} instances create ${{steps.vars.outputs.INSTANCE_NAME}} \
+                --zone=${{env.ZONE}} \
+                --machine-type=${{env.MACHINE_TYPE}} \
+                --network=default \
+                --network-tier=PREMIUM \
+                --maintenance-policy=MIGRATE \
+                --scopes=https://www.googleapis.com/auth/cloud-platform \
+                --tags=http-server,https-server \
+                --image=$(gcloud compute images list --filter=${{env.IMAGE_PROJECT}} --filter=${{env.IMAGE_VERSION}} | tail -n 1 | cut -f 1 -d " ") \
+                --image-project=${{env.IMAGE_PROJECT}} \
+                --boot-disk-size=${{env.BOOT_DISK_SIZE_GB}}GB \
+                --boot-disk-type=pd-standard \
+                --boot-disk-device-name=${{steps.vars.outputs.INSTANCE_NAME}} \
+                --service-account=${{env.SERVICE_ACCOUNT}} \
+                --metadata-from-file startup-script=setup/gcloud-startup-script.sh \
+                --metadata ADMIN_PASSWORD=${{env.ADMIN_PASSWORD}},EXIST_MEMORY=${{env.EXIST_MEMORY}},STACK_MEMORY=${{env.STACK_MEMORY}},BRANCH=${{steps.vars.outputs.BRANCH}},DYN_USERNAME=${{env.DYN_USERNAME}},DYN_PASSWORD=${{env.DYN_PASSWORD}},DYN_EMAIL=${{env.DYN_EMAIL}},BACKUP_BUCKET_BASE=${{env.BACKUP_BUCKET_BASE}},enable-oslogin=true
+
+

.gitignore

@@ -1,12 +1,6 @@
 # local mods to Makefile
 Makefile.local
-
-# fake svn external directories
-lib/xsltforms/
-lib/xspec/
-lib/XSLTDoc/
-lib/tei/
-lib/exist/
+local.build.properties
 
 # generated text directory
 text/wlc/
@@ -15,13 +9,17 @@ text/wlc/
 /doc/
 
 # generated schema
-schema/build
+opensiddur-server/schema/build
+
+# generated dist dir
+build/
+dist/
+dependencies/
 
 # generated files:
-/code/common/params.xsl2
-/code/transforms/format/xhtml/muxhtml.xsl2
-/setup/setup.xql
-/setup/eXist-installer.xml
+opensiddur-server/src/common/params.xsl2
+opensiddur-server/setup/setup.xql
+opensiddur-server/setup/eXist-installer.xml
 
 # db directory except special
 db/*
@@ -36,8 +34,7 @@ __contents__.xml
 # backup files
 *.bak
 *.bkp
-*.swp
-*.swo
+*.sw?
 *.tmp
 *.temp
 temp/
@@ -48,6 +45,7 @@ tmp/
 *.pyc
 
 # local files project
+.pydevproject
 .buildpath
 .project
 .settings
@@ -56,3 +54,11 @@ private-scripts/
 
 # patch rejects
 *.rej
+
+#IntelliJ
+.idea/
+*.iml
+
+# client secret file
+credentials.tar.gz
+client-secret.json

.gitmodules

@@ -1,6 +1,10 @@
-[submodule "lib/hebmorph"]
-	path = lib/hebmorph
-	url = git://github.com/EfraimFeinstein/HebMorph.git
-[submodule "lib/aloha"]
-	path = lib/aloha
-	url = https://github.com/alohaeditor/Aloha-Editor.git
+[submodule "lib/tei/Roma"]
+	path = lib/tei/Roma
+	url = https://github.com/opensiddur/Roma.git
+[submodule "lib/tei/Stylesheets"]
+	path = lib/tei/Stylesheets
+	url = https://github.com/opensiddur/Stylesheets.git
+[submodule "lib/hebmorph-exist"]
+	path = lib/hebmorph-exist
+	url = https://github.com/opensiddur/hebmorph-exist.git
+    branch = 2.1.x

Dockerfile

@@ -0,0 +1,29 @@
+FROM ubuntu:kinetic
+
+RUN useradd -c "eXist db"  exist
+# install dependencies
+RUN apt-get update
+RUN apt-get install -y openjdk-8-jdk
+
+RUN mkdir -p /usr/local/opensiddur
+RUN chown exist:exist /usr/local/opensiddur
+
+USER exist:exist
+
+# copy the build
+COPY dependencies/exist-installer-*.jar /tmp/exist-installer.jar
+COPY setup/docker-install-options.conf /tmp/
+
+# run the installer
+RUN java -jar /tmp/exist-installer.jar -console -options /tmp/docker-install-options.conf
+COPY setup/docker-startup.sh /usr/local/opensiddur/bin/docker-startup.sh
+COPY lib/icu4j-* /usr/local/opensiddur/lib/user/
+COPY lib/hebmorph-exist/java/target/hebmorph-lucene.jar /usr/local/opensiddur/lib/user/
+COPY lib/hebmorph-exist/hspell-data-files/ /usr/local/opensiddur/etc/hspell-data-files/
+
+# copy autodeploy files
+COPY dist/opensiddur-server.xar /usr/local/opensiddur/autodeploy
+
+EXPOSE 8080 8443
+
+ENTRYPOINT /usr/local/opensiddur/bin/docker-startup.sh

LICENSE

@@ -1,11 +1,8 @@
 The Open Siddur Project License file:
 
-All source code is stored on subversion, and may be obtained by following
-the instructions at http://jewishliturgy.googlecode.com/source/checkout
-
-The source code may be browsed directly at 
-http://jewishliturgy.googlecode.com/svn/trunk
-All file and directory names in this file are relative to that path.
+All source code is stored on Github, and may be obtained by following
+the instructions at https://github.com/opensiddur/opensiddur ; source code may 
+also be browsed there. 
 
 The project is distributed under the following licenses:
 
@@ -22,8 +19,7 @@ the rest of the project's.
 
 See the *-LICENSE.txt and *-NOTICE.txt files and *-notices directories
  in the lib/ directory for more information.  It is accessible on the 
-Internet at 
-http://jewishliturgy.googlecode.com/svn/trunk/lib/
+Internet at https://github.com/opensiddur/opensiddur/tree/develop/lib 
 
 The BHebrew and BHebrewSR fonts are modified versions of the Ezra SIL
 fonts from SIL International, and are released under the SIL Open Font License.