removes Makefile build support

Makefile

@@ -13,11 +13,11 @@ tgz:
 	&& cd -
 
 war:
-	make -C data-discovery create-war && mv data-discovery/target/vlkb-siav2*.war .
+	cd data-discovery && ./mvn-build.sh && cd - && mv data-discovery/target/vlkb-siav2*.war .
 
 
 clean:
-	make -C data-discovery clean
+	cd data-discovery && ./mvn-clean.sh && cd -
 
 
 

data-discovery/Makefile

-#===============================================================================
-NAME       := vlkb-siav2
-VERSION    := $(shell git describe)
-WEBAPP_WAR := $(NAME)-$(VERSION).war
-CONTEXT_ROOT ?= vlkb/datasets/siav2
-#===============================================================================
-LIB_DIR     ?= ../java-libs/lib
-CLASS_DIR   := target/classes
-INSTALL_DIR ?= target/webapp
-AUTH_DIR    := ../auth
-#===============================================================================
-# all sources
-#IA2CONVFILTER = $(AUTH_DIR)/src/main/java/IA2TokenConvFilter.java
-AUTHFILTERS  = $(wildcard $(AUTH_DIR)/src/main/java/*Filter.java) $(AUTH_DIR)/src/main/java/AuthPolicy.java
-SRC_DIR  = src/main/java/common:src/main/java/search:src/main/java/webapi:src/main/java/webapi/formatfilter:src/main/java/webapi/authzfilter:$(AUTH_DIR)/src/main/java
-VOSI     = src/main/java/vosi/VlkbServletFile.java
-FILTERS  = $(wildcard src/main/java/webapi/formatfilter/*Filter.java)
-SERVLETS = $(wildcard src/main/java/webapi/*Servlet.java)
-#===============================================================================
-JFLAGS = -g
-CLASSPATH = $(LIB_DIR)/*
-#===============================================================================
-
-.PHONY: build
-build:
-	echo "class Version { static String asString = \"$(VERSION)\";}" > src/main/java/webapi/Version.java
-	javac $(JFLAGS) -cp :$(CLASSPATH) -sourcepath $(SRC_DIR) -d $(CLASS_DIR) $(SERVLETS) $(FILTERS) $(AUTHFILTERS) $(VOSI)
-
-.PHONY: clean
-clean : 
-	rm -fr src/main/java/webapi/Version.java target
-
-
-.PHONY: install
-install:
-	mkdir -p $(INSTALL_DIR)
-	cp -r src/main/webapp/* $(INSTALL_DIR)
-	cp -r $(CLASS_DIR) $(LIB_DIR) $(INSTALL_DIR)/WEB-INF/
-	cp ../java-libs/jjwt-*0.11.2.jar $(INSTALL_DIR)/WEB-INF/lib/
-	cp src/main/resources/*.properties $(INSTALL_DIR)/WEB-INF/classes/
-	cp $(AUTH_DIR)/resources/*.properties $(INSTALL_DIR)/WEB-INF/classes/
-
-.PHONY: uninstall
-uninstall:
-	rm -rf $(INSTALL_DIR)
-
-
-.PHONY: war
-war:
-	@jar -cf target/$(WEBAPP_WAR) -C $(INSTALL_DIR) index.html \
-			  $(INSTALL_DIR)/*.xsl \
-			  $(INSTALL_DIR)/*.js \
-			  $(INSTALL_DIR)/WEB-INF/*.xml \
-			  $(INSTALL_DIR)/WEB-INF/classes/* \
-			  $(INSTALL_DIR)/WEB-INF/lib/*.jar
-
-.PHONY:
-create-war: clean build install war
-
-
-# vlkb-devel host local:
-
-.PHONY: vlkb-devel
-vlkb-devel: stop uninstall clean build install config war start
-
-.PHONY: config
-config:
-	cp config/*.ini $(INSTALL_DIR)/WEB-INF/classes
-	cp config/*.properties $(INSTALL_DIR)/WEB-INF/classes
-	cp config/web.xml $(INSTALL_DIR)/WEB-INF/
-
-
-.PHONY: start
-start:
-	curl -T target/$(WEBAPP_WAR) -u admin:IA2lbt09 'http://localhost:8080/manager/text/deploy?path=/$(CONTEXT_ROOT)&update=true'
-
-.PHONY: stop
-stop:
-	-@curl -u  admin:IA2lbt09 'http://localhost:8080/manager/text/undeploy?path=/$(CONTEXT_ROOT)'
-
-.PHONY: status 
-status:
-	curl localhost:8080/manager/text/list -u admin:IA2lbt09
-
-.PHONY: reload
-reload:
-	curl -u  admin:IA2lbt09  'http://localhost:8080/manager/text/reload?path=/$(CONTEXT_ROOT)'
-

data-discovery/config/Makefile

-################################################################
-DBMS   ?= localhost  # localhost | pasquale | pasquale-devel
-AUTH   ?=            # ia2token | garrtoken | <empty>
-################################################################
-
-all: formatresponsefilter.properties authpolicy.properties web.xml search.properties
-
-web.xml:
-	cd web-xml && cat web.xml-begining web.xml-format-filter web.xml-$(AUTH)-filter web.xml-authorization-filter web.xml-servlets web.xml-ending > ../web.xml
-
-search.properties: dbms.conf-$(DBMS)
-	cp dbms.conf-$(DBMS) $@
-
-formatresponsefilter.properties: formatresponsefilter.properties.in
-	cat dbms.conf-$(DBMS) formatresponsefilter.properties.in > $@
-
-authpolicy.properties: dbms.conf-$(DBMS)
-	cp dbms.conf-$(DBMS) $@
-
-.PHONY:
-clean:
-	-rm -f formatresponsefilter.properties authpolicy.properties search.properties web.xml

data-discovery/config/dbms.conf-localhost

-db_uri=jdbc:postgresql://127.0.0.1:5432/vialactea
-db_schema=datasets
-db_user_name=vialactea
-db_password=ia2vlkb
-
-

data-discovery/config/dbms.conf-pasquale

-db_uri=jdbc:postgresql://pasquale.ia2.inaf.it:5432/vialactea
-db_schema=datasets
-db_user_name=vialactea
-db_password=ia2vlkb
-
-

data-discovery/config/dbms.conf-pasquale-devel

-db_uri=jdbc:postgresql://pasquale.ia2.inaf.it:5432/vialacteadevel
-db_port=5432
-db_schema=datasetsdevel
-db_user_name=vialactea
-db_password=ia2vlkb
-
-

data-discovery/config/formatresponsefilter.properties.in

-
-#response_format=application/x-votable+xml
-response_format=application/x-vlkb+xml
-
-# used to retrieve extraCards to add to FITS_header (VLKB-only)
-surveys_metadata_abs_pathname=/srv/vlkb/surveys/survey_populate.csv
-
-# these URL's are used to construct cutout merge requests strings in response.xml
-cutout_url=http://vlkb-devel.ia2.inaf.it:8080/vlkb/datasets/vlkb_cutout
-merge_url=http://vlkb-devel.ia2.inaf.it:8080/vlkb/datasets/vlkb_merge

data-discovery/config/web-xml/web.xml--filter

-
-<!-- no authorization filter configured -->
-

data-discovery/config/web-xml/web.xml-authorization-filter

-        <filter>
-                <filter-name>AuthorizationResponseFilter</filter-name>
-                <filter-class>AuthorizationResponseFilter</filter-class>
-        </filter>
-        <filter-mapping>
-                <filter-name>AuthorizationResponseFilter</filter-name>
-                <url-pattern>/*</url-pattern>
-        </filter-mapping>
-

data-discovery/config/web-xml/web.xml-begining

-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright 2004-2005 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
--->
-
-<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>
-        <distributable/>
-
-

data-discovery/config/web-xml/web.xml-ending

-</web-app>

data-discovery/config/web-xml/web.xml-format-filter

-        <filter>
-                <filter-name>FormatResponseFilter</filter-name>
-                <filter-class>FormatResponseFilter</filter-class>
-        </filter>
-        <filter-mapping>
-                <filter-name>FormatResponseFilter</filter-name>
-                <url-pattern>/*</url-pattern>
-        </filter-mapping>
-

data-discovery/config/web-xml/web.xml-garrtoken-filter

-        <filter>
-                <filter-name>TokenFilter</filter-name>
-                <filter-class>NeaTokenFilter</filter-class>
-        </filter>
-        <filter-mapping>
-                <filter-name>TokenFilter</filter-name>
-                <url-pattern>/*</url-pattern>
-        </filter-mapping>
-

data-discovery/config/web-xml/web.xml-ia2token-filter

-
-       <filter>
-               <filter-name>TokenFilter</filter-name>
-               <filter-class>it.inaf.ia2.aa.TokenFilter</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>TokenFilter</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
-
-       <filter>
-               <filter-name>UserTypeConverter</filter-name>
-               <filter-class>IA2TokenConvFilter</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>UserTypeConverter</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
-

data-discovery/config/web-xml/web.xml-monitor-filter

-        <filter>
-                <filter-name>MonitorFilter</filter-name>
-                <filter-class>MonitorFilter</filter-class>
-        </filter>
-        <filter-mapping>
-                <filter-name>MonitorFilter</filter-name>
-                <url-pattern>/*</url-pattern>
-        </filter-mapping>
-

data-discovery/config/web-xml/web.xml-servlets

-
-
-<servlet>
-   <servlet-name>vlkb_search</servlet-name>
-   <servlet-class>SearchServlet</servlet-class>
-</servlet>
-<servlet-mapping>
-   <servlet-name>vlkb_search</servlet-name>
-   <url-pattern></url-pattern>
-</servlet-mapping>
-
-
-<servlet>
-   <servlet-name>vlkb_vosi_availability</servlet-name>
-   <servlet-class>VlkbServletFile</servlet-class>
-</servlet>
-<servlet-mapping>
-   <servlet-name>vlkb_vosi_availability</servlet-name>
-   <url-pattern>/availability</url-pattern>
-</servlet-mapping>
-
-
-<servlet>
-   <servlet-name>vlkb_vosi_capabilities</servlet-name>
-   <servlet-class>VlkbServletFile</servlet-class>
-</servlet>
-<servlet-mapping>
-   <servlet-name>vlkb_vosi_capabilities</servlet-name>
-   <url-pattern>/capabilities</url-pattern>
-</servlet-mapping>
-
-

docker/Makefile

@@ -28,10 +28,12 @@ download:
 ast-9.2.9.tar.gz:
 	wget https://github.com/Starlink/ast/files/8843897/ast-9.2.9.tar.gz
 
-
+.PHONY: warlink
+fetchwar:
+	cp ../data-discovery/target/vlkb-siav2-$(VERSION).war .
 
 .PHONY: build
-build:
+build: fetchwar
 	docker build --build-arg VLKB_VERSION=$(VERSION) -t siav2 -f Dockerfile .
 
 # the docker-login below needed a ca-cert(?) which in the middle of the certificate-chain,

java-libs/README.postgresql-jar

-
-
-postgresql-*.jar library should be loaded by tomcat: place it to its tomcat's classpath: .../tomcat/lib/
-
-Note access rights and ownership: tomcat:tomcat
-
--rw-r-----. 1 tomcat tomcat 825943 Mar 23 08:03 /opt/tomcat/latest/lib/postgresql-42.2.5.jar
-
-also schema in URL access should be: jdbc:postgresql (not only postgresql://)
-
-jdbc:postgresql://127.0.0.1:5432/vialactea
-
-
-Manual: https://jdbc.postgresql.org/documentation/use/
-
-