From fe3c88156b7aba90a7272a9c902305aa8ace8ae6 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Thu, 25 Apr 2024 10:01:46 +0200
Subject: [PATCH] build/servlet: changes dir name datasets -> cutout (Also:
 removes common.tex obsolete notes)

---
 data-access/servlet/Makefile                  |  2 +-
 data-access/servlet/src/main/java/common.tex  | 28 -------------------
 .../java/{datasets => cutout}/Cutout.java     |  0
 .../java/{datasets => cutout}/CutoutImpl.java |  0
 .../CutoutImpl.java.backup.notes              |  0
 .../java/{datasets => cutout}/Datasets.java   |  0
 .../{datasets => cutout}/DatasetsImpl.java    |  0
 .../java/{datasets => cutout}/ExecCmd.java    |  0
 .../java/{datasets => cutout}/Regrid.java     |  0
 .../java/{datasets => cutout}/Reproject.java  |  0
 .../json-rpc/JdlMCutout.java                  |  0
 .../json-rpc/JsonDecoder.java                 |  0
 .../json-rpc/JsonEncoder.java                 |  0
 .../json-rpc/JsonEncoderMerge.java            |  0
 .../json-rpc/RpcOverAmqp.java                 |  0
 15 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 data-access/servlet/src/main/java/common.tex
 rename data-access/servlet/src/main/java/{datasets => cutout}/Cutout.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/CutoutImpl.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/CutoutImpl.java.backup.notes (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/Datasets.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/DatasetsImpl.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/ExecCmd.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/Regrid.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/Reproject.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/json-rpc/JdlMCutout.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/json-rpc/JsonDecoder.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/json-rpc/JsonEncoder.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/json-rpc/JsonEncoderMerge.java (100%)
 rename data-access/servlet/src/main/java/{datasets => cutout}/json-rpc/RpcOverAmqp.java (100%)

diff --git a/data-access/servlet/Makefile b/data-access/servlet/Makefile
index a41d758..5ea8d97 100644
--- a/data-access/servlet/Makefile
+++ b/data-access/servlet/Makefile
@@ -10,7 +10,7 @@ INSTALL_DIR ?= target/webapp
 AUTH_DIR    := ../../auth
 #===============================================================================
 # all sources
-SRC_DIR = src/main/java/:src/main/java/common:src/main/java/datasets:src/main/java/datasets/json-rpc:src/main/java/common/vo:src/main/java/common/vo/soda:src/main/java/resolver:src/main/java/webapi:src/main/java/webapi/output:$(AUTH_DIR)/src/main/java
+SRC_DIR = src/main/java/:src/main/java/common:src/main/java/cutout:src/main/java/cutout/json-rpc:src/main/java/common/vo:src/main/java/common/vo/soda:src/main/java/resolver:src/main/java/webapi:src/main/java/webapi/output:$(AUTH_DIR)/src/main/java
 VOSI     = src/main/java/vosi/VlkbServletFile.java
 #IA2CONVFILTER = $(AUTH_DIR)/src/main/java/IA2TokenConvFilter.java
 AUTHFILTERS  = $(wildcard $(AUTH_DIR)/src/main/java/*Filter.java) $(AUTH_DIR)/src/main/java/AuthPolicy.java
diff --git a/data-access/servlet/src/main/java/common.tex b/data-access/servlet/src/main/java/common.tex
deleted file mode 100644
index 9e54b7b..0000000
--- a/data-access/servlet/src/main/java/common.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-GOAL three modules:
-
-AuthZ -> Filter: AuthPolicy*
-
-PSearch -> Servlet: ServletPSearch (SIAv2 + VLKB-legacy API)
-
-DataAccess -> Servlet/UWS: cutout/SODA incl MCutout and Merge
-
-
------
-
-Settings.java (partly: search does not need dirs)
-
-AuthPolicy* : to separate (filter-)module as Psearch
-
-VlkbSql.java (only common part: VlkbSql::dbConn and VlkbSql::doQuery())
-
-Coord.java
-
-Subsurvey*.java --> Subsurvey::findSubsurvey()  and SubsurveyId is the triple [name,species,tran]
-Subsurvey(Id) :
-*in dacc used to retrieve cards from CSV-in-mem to update headers (vlkb-mode)
-*in search : essential param to filter searches (not SIA?, vlkb-mode) and (vlkb) results.xml sorted by subsurveys
-*Settings implements load CSV to memory currently
-
-----------------------------------------------------
-
-conclude TRULY COMMON: Coord Subsurvey* DBconn&doQuery()
diff --git a/data-access/servlet/src/main/java/datasets/Cutout.java b/data-access/servlet/src/main/java/cutout/Cutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/Cutout.java
rename to data-access/servlet/src/main/java/cutout/Cutout.java
diff --git a/data-access/servlet/src/main/java/datasets/CutoutImpl.java b/data-access/servlet/src/main/java/cutout/CutoutImpl.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/CutoutImpl.java
rename to data-access/servlet/src/main/java/cutout/CutoutImpl.java
diff --git a/data-access/servlet/src/main/java/datasets/CutoutImpl.java.backup.notes b/data-access/servlet/src/main/java/cutout/CutoutImpl.java.backup.notes
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/CutoutImpl.java.backup.notes
rename to data-access/servlet/src/main/java/cutout/CutoutImpl.java.backup.notes
diff --git a/data-access/servlet/src/main/java/datasets/Datasets.java b/data-access/servlet/src/main/java/cutout/Datasets.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/Datasets.java
rename to data-access/servlet/src/main/java/cutout/Datasets.java
diff --git a/data-access/servlet/src/main/java/datasets/DatasetsImpl.java b/data-access/servlet/src/main/java/cutout/DatasetsImpl.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/DatasetsImpl.java
rename to data-access/servlet/src/main/java/cutout/DatasetsImpl.java
diff --git a/data-access/servlet/src/main/java/datasets/ExecCmd.java b/data-access/servlet/src/main/java/cutout/ExecCmd.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/ExecCmd.java
rename to data-access/servlet/src/main/java/cutout/ExecCmd.java
diff --git a/data-access/servlet/src/main/java/datasets/Regrid.java b/data-access/servlet/src/main/java/cutout/Regrid.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/Regrid.java
rename to data-access/servlet/src/main/java/cutout/Regrid.java
diff --git a/data-access/servlet/src/main/java/datasets/Reproject.java b/data-access/servlet/src/main/java/cutout/Reproject.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/Reproject.java
rename to data-access/servlet/src/main/java/cutout/Reproject.java
diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JdlMCutout.java b/data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/json-rpc/JdlMCutout.java
rename to data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java
diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JsonDecoder.java b/data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/json-rpc/JsonDecoder.java
rename to data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java
diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java b/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoder.java
rename to data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java
diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java b/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/json-rpc/JsonEncoderMerge.java
rename to data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java
diff --git a/data-access/servlet/src/main/java/datasets/json-rpc/RpcOverAmqp.java b/data-access/servlet/src/main/java/cutout/json-rpc/RpcOverAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/datasets/json-rpc/RpcOverAmqp.java
rename to data-access/servlet/src/main/java/cutout/json-rpc/RpcOverAmqp.java
-- 
GitLab