From 68bee9a7da6378e5247e3a4b3118e3e7c5893b87 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 20 Dec 2024 14:13:59 +0200
Subject: [PATCH] webapp/docker: 1, changes webapp name /soda -> /sync and sets
context root to /soda ; 2. docker: adds libdavix
---
...ocally.sh => mvn-install-authlib-rapclient-locally.sh} | 0
.../servlet/config/web-xml/web.xml-garrtoken-filter | 2 +-
data-access/servlet/config/web-xml/web.xml-servlets | 6 +++---
.../src/main/webapp/WEB-INF/web-cutout-garrtoken.xml | 6 +++---
.../src/main/webapp/WEB-INF/web-cutout-ia2token.xml | 6 +++---
.../src/main/webapp/WEB-INF/web-cutout-iamtoken.xml | 6 +++---
data-access/servlet/src/main/webapp/WEB-INF/web.xml | 8 ++++----
docker/Dockerfile.soda | 7 ++-----
docker/example-compose-soda.yaml | 6 +++---
docker/start-soda.sh.soda | 2 +-
10 files changed, 23 insertions(+), 26 deletions(-)
rename auth/{mvn-install-uws-locally.sh => mvn-install-authlib-rapclient-locally.sh} (100%)
diff --git a/auth/mvn-install-uws-locally.sh b/auth/mvn-install-authlib-rapclient-locally.sh
similarity index 100%
rename from auth/mvn-install-uws-locally.sh
rename to auth/mvn-install-authlib-rapclient-locally.sh
diff --git a/data-access/servlet/config/web-xml/web.xml-garrtoken-filter b/data-access/servlet/config/web-xml/web.xml-garrtoken-filter
index 2d9d53f..32cc9aa 100644
--- a/data-access/servlet/config/web-xml/web.xml-garrtoken-filter
+++ b/data-access/servlet/config/web-xml/web.xml-garrtoken-filter
@@ -20,7 +20,7 @@
</filter-mapping>
<filter-mapping>
<filter-name>NeaTokenFilter</filter-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</filter-mapping>
diff --git a/data-access/servlet/config/web-xml/web.xml-servlets b/data-access/servlet/config/web-xml/web.xml-servlets
index a1ffa8e..f8a63f5 100644
--- a/data-access/servlet/config/web-xml/web.xml-servlets
+++ b/data-access/servlet/config/web-xml/web.xml-servlets
@@ -83,7 +83,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
@@ -105,7 +105,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
- <url-pattern>/uws_merge/*</url-pattern>
+ <url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
@@ -123,7 +123,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
- <url-pattern>/uws_mcutout/*</url-pattern>
+ <url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-garrtoken.xml b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-garrtoken.xml
index 74c6700..7454992 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-garrtoken.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-garrtoken.xml
@@ -86,7 +86,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
@@ -103,7 +103,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
- <url-pattern>/uws_merge/*</url-pattern>
+ <url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
@@ -121,7 +121,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
- <url-pattern>/uws_mcutout/*</url-pattern>
+ <url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
index b14435c..6a4d15e 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
@@ -86,7 +86,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
@@ -103,7 +103,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
- <url-pattern>/uws_merge/*</url-pattern>
+ <url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
@@ -121,7 +121,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
- <url-pattern>/uws_mcutout/*</url-pattern>
+ <url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-iamtoken.xml b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-iamtoken.xml
index 60217cd..dc09f5c 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-iamtoken.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-iamtoken.xml
@@ -76,7 +76,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
@@ -93,7 +93,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
- <url-pattern>/uws_merge/*</url-pattern>
+ <url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
@@ -111,7 +111,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
- <url-pattern>/uws_mcutout/*</url-pattern>
+ <url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
</web-app>
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web.xml b/data-access/servlet/src/main/webapp/WEB-INF/web.xml
index 01be243..13b4928 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Via Lactea. Query FITS datacubes.</display-name>
+ <display-name>ViaLactea. Access FITS datacubes.</display-name>
<distributable/>
@@ -109,7 +109,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
- <url-pattern>/soda</url-pattern>
+ <url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
@@ -126,7 +126,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
- <url-pattern>/uws_merge/*</url-pattern>
+ <url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
@@ -144,7 +144,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
- <url-pattern>/uws_mcutout/*</url-pattern>
+ <url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
</web-app>
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index ea88050..9521c56 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -12,7 +12,7 @@ ENV CATALINA_BASE=/usr/local/tomcat
ENV CATALINA_HOME=/usr/local/tomcat
WORKDIR /root
-ENV HOME /root
+ENV HOME=/root
# pre-configure port 8080 (no TSL)
COPY deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
@@ -26,13 +26,10 @@ COPY deps/postgresql-*.jar ${CATALINA_BASE}/lib
WORKDIR ${CATALINA_BASE}
RUN chmod -R a+rwX conf
-env ACCESS_CONTEXT_ROOT=datasets
-
-
RUN apt-get -y update \
&& apt-get -y install apt-utils \
- && apt-get -y install libcfitsio-bin unzip
+ && apt-get -y install libcfitsio-bin unzip libdavix0v5
ENV WEBAPP_DIR=/webapps/vlkb-soda
diff --git a/docker/example-compose-soda.yaml b/docker/example-compose-soda.yaml
index 7192354..bcd6df2 100644
--- a/docker/example-compose-soda.yaml
+++ b/docker/example-compose-soda.yaml
@@ -9,7 +9,7 @@ services:
ports:
- 18019:8080
environment:
- - ACCESS_CONTEXT_ROOT=ska#datasets
+ - ACCESS_CONTEXT_ROOT=soda
volumes:
- /srv/ska/surveys:/srv/datasets:ro
restart: always
@@ -22,7 +22,7 @@ services:
ports:
- 18025:8443
environment:
- - ACCESS_CONTEXT_ROOT=ska#datasets
+ - ACCESS_CONTEXT_ROOT=soda
- KEYSTORE_ALIAS=tomcat
volumes:
- /srv/ska/surveys:/srv/datasets:ro
@@ -38,7 +38,7 @@ services:
ports:
- 18025:8443
environment:
- - ACCESS_CONTEXT_ROOT=ska#datasets
+ - ACCESS_CONTEXT_ROOT=soda
- KEYSTORE_ALIAS=tomcat
- SKAIAM_INTROSPECT=https://iam-escape.cloud.cnaf.infn.it/introspect
- SKAIAM_CLIENT=02cc260f-9837-4907-b2cb-a1a2d764fb15
diff --git a/docker/start-soda.sh.soda b/docker/start-soda.sh.soda
index 0ed173f..4a16193 100755
--- a/docker/start-soda.sh.soda
+++ b/docker/start-soda.sh.soda
@@ -7,7 +7,7 @@ date
env
# set optional
-ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-datasets}
+ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-soda}
SECURITY=${SECURITY:-}
KEYSTORE_ALIAS=${KEYSTORE_ALIAS:-}
--
GitLab