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 2d9d53f9b312d38900d05ed0d1bd65233a6af83e..32cc9aa64b5c222b4fc7fc45566d0606568c574a 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 a1ffa8e54953edb6c8e791ea48fe777a3c507d6c..f8a63f55861fdf418273ea8c8b588ee47e837537 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 74c67001711c7f452adf28985a748e62ad9be96d..7454992e71f8d5721e9a34ec2a69d39219ffbe93 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 b14435c663b14409a4db930366a6ae086883c421..6a4d15e5a9c4d4292119be2595cbb70100f3d171 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 60217cdc5575545a747efa65834a448e2a38584c..dc09f5ce57954c057a4043cc6f503fd8d2aef302 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 01be24309f83e4e5769a4b393545502e18a8e55d..13b4928a3935425dc969e85ec3d317b1cf1370b0 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 ea88050d61581d4083eaf572ee3efc6d3d0a65a4..9521c56a73b4141ee31a313f310950601b616367 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 7192354da24ca1f3dcb36a3d6aef9d767e515472..bcd6df28161f16ec049537f6b2a963bcc5b67e0c 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 0ed173f4465f6222dda3c60bb301257d6c895411..4a16193bee6f387c7e0cbd7eb45c2c079a4facba 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:-}