From 94037959e866628f16241a3d8b20a2c6701b46e1 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 26 Apr 2024 16:22:24 +0200
Subject: [PATCH] build: removes unnecessary src dir-level '../vlkb/..'
---
data-discovery/Makefile | 12 ++++++------
.../src/main/java/{vlkb => }/common/Coord.java | 0
.../src/main/java/{vlkb => }/common/Subsurvey.java | 0
.../src/main/java/{vlkb => }/common/SubsurveyId.java | 0
.../src/main/java/{vlkb => }/output/Dataset.java | 0
.../src/main/java/{vlkb => }/output/ObscoreExt.java | 0
.../java/{vlkb => }/output/SearchOutputData.java | 0
.../main/java/{vlkb => }/output/XmlSerializer.java | 0
.../src/main/java/{vlkb => }/search/DbPSearch.java | 0
.../main/java/{vlkb => }/vosi/VlkbServletFile.java | 0
.../webapi/AuthorizationResponseFilter.java | 0
.../webapi/AuthorizationResponseSettings.java | 0
.../src/main/java/{vlkb => }/webapi/DBConn.java | 0
.../java/{vlkb => }/webapi/FormatResponseFilter.java | 0
.../{vlkb => }/webapi/FormatResponseSettings.java | 0
.../main/java/{vlkb => }/webapi/MonitorFilter.java | 0
.../webapi/MultiValuedParamNotSupported.java | 0
.../main/java/{vlkb => }/webapi/SearchServlet.java | 0
.../main/java/{vlkb => }/webapi/SearchSettings.java | 0
19 files changed, 6 insertions(+), 6 deletions(-)
rename data-discovery/src/main/java/{vlkb => }/common/Coord.java (100%)
rename data-discovery/src/main/java/{vlkb => }/common/Subsurvey.java (100%)
rename data-discovery/src/main/java/{vlkb => }/common/SubsurveyId.java (100%)
rename data-discovery/src/main/java/{vlkb => }/output/Dataset.java (100%)
rename data-discovery/src/main/java/{vlkb => }/output/ObscoreExt.java (100%)
rename data-discovery/src/main/java/{vlkb => }/output/SearchOutputData.java (100%)
rename data-discovery/src/main/java/{vlkb => }/output/XmlSerializer.java (100%)
rename data-discovery/src/main/java/{vlkb => }/search/DbPSearch.java (100%)
rename data-discovery/src/main/java/{vlkb => }/vosi/VlkbServletFile.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/AuthorizationResponseFilter.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/AuthorizationResponseSettings.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/DBConn.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/FormatResponseFilter.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/FormatResponseSettings.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/MonitorFilter.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/MultiValuedParamNotSupported.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/SearchServlet.java (100%)
rename data-discovery/src/main/java/{vlkb => }/webapi/SearchSettings.java (100%)
diff --git a/data-discovery/Makefile b/data-discovery/Makefile
index e37baed..5349b91 100644
--- a/data-discovery/Makefile
+++ b/data-discovery/Makefile
@@ -12,10 +12,10 @@ 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/vlkb/:src/main/java/vlkb/common:src/main/java/vlkb/output:src/main/java/vlkb/search:src/main/java/vlkb/webapi:$(AUTH_DIR)/src/main/java
-VOSI = src/main/java/vlkb/vosi/VlkbServletFile.java
-FILTERS = $(wildcard src/main/java/vlkb/webapi/*Filter.java)
-SERVLETS = $(wildcard src/main/java/vlkb/webapi/*Servlet.java)
+SRC_DIR = src/main/java/common:src/main/java/output:src/main/java/search:src/main/java/webapi:$(AUTH_DIR)/src/main/java
+VOSI = src/main/java/vosi/VlkbServletFile.java
+FILTERS = $(wildcard src/main/java/webapi/*Filter.java)
+SERVLETS = $(wildcard src/main/java/webapi/*Servlet.java)
#===============================================================================
JFLAGS = -g
CLASSPATH = $(LIB_DIR)/*
@@ -23,12 +23,12 @@ CLASSPATH = $(LIB_DIR)/*
.PHONY: build
build:
- echo "class Version { static String asString = \"$(VERSION)\";}" > src/main/java/vlkb/Version.java
+ echo "class Version { static String asString = \"$(VERSION)\";}" > src/main/java/output/Version.java
javac $(JFLAGS) -cp :$(CLASSPATH) -sourcepath $(SRC_DIR) -d $(CLASS_DIR) $(SERVLETS) $(FILTERS) $(AUTHFILTERS) $(VOSI)
.PHONY: clean
clean :
- rm -fr src/main/java/vlkb/Version.java target
+ rm -fr src/main/java/output/Version.java target
.PHONY: install
diff --git a/data-discovery/src/main/java/vlkb/common/Coord.java b/data-discovery/src/main/java/common/Coord.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/common/Coord.java
rename to data-discovery/src/main/java/common/Coord.java
diff --git a/data-discovery/src/main/java/vlkb/common/Subsurvey.java b/data-discovery/src/main/java/common/Subsurvey.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/common/Subsurvey.java
rename to data-discovery/src/main/java/common/Subsurvey.java
diff --git a/data-discovery/src/main/java/vlkb/common/SubsurveyId.java b/data-discovery/src/main/java/common/SubsurveyId.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/common/SubsurveyId.java
rename to data-discovery/src/main/java/common/SubsurveyId.java
diff --git a/data-discovery/src/main/java/vlkb/output/Dataset.java b/data-discovery/src/main/java/output/Dataset.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/output/Dataset.java
rename to data-discovery/src/main/java/output/Dataset.java
diff --git a/data-discovery/src/main/java/vlkb/output/ObscoreExt.java b/data-discovery/src/main/java/output/ObscoreExt.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/output/ObscoreExt.java
rename to data-discovery/src/main/java/output/ObscoreExt.java
diff --git a/data-discovery/src/main/java/vlkb/output/SearchOutputData.java b/data-discovery/src/main/java/output/SearchOutputData.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/output/SearchOutputData.java
rename to data-discovery/src/main/java/output/SearchOutputData.java
diff --git a/data-discovery/src/main/java/vlkb/output/XmlSerializer.java b/data-discovery/src/main/java/output/XmlSerializer.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/output/XmlSerializer.java
rename to data-discovery/src/main/java/output/XmlSerializer.java
diff --git a/data-discovery/src/main/java/vlkb/search/DbPSearch.java b/data-discovery/src/main/java/search/DbPSearch.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/search/DbPSearch.java
rename to data-discovery/src/main/java/search/DbPSearch.java
diff --git a/data-discovery/src/main/java/vlkb/vosi/VlkbServletFile.java b/data-discovery/src/main/java/vosi/VlkbServletFile.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/vosi/VlkbServletFile.java
rename to data-discovery/src/main/java/vosi/VlkbServletFile.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java b/data-discovery/src/main/java/webapi/AuthorizationResponseFilter.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseFilter.java
rename to data-discovery/src/main/java/webapi/AuthorizationResponseFilter.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseSettings.java b/data-discovery/src/main/java/webapi/AuthorizationResponseSettings.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/AuthorizationResponseSettings.java
rename to data-discovery/src/main/java/webapi/AuthorizationResponseSettings.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/DBConn.java b/data-discovery/src/main/java/webapi/DBConn.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/DBConn.java
rename to data-discovery/src/main/java/webapi/DBConn.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/FormatResponseFilter.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
rename to data-discovery/src/main/java/webapi/FormatResponseFilter.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseSettings.java b/data-discovery/src/main/java/webapi/FormatResponseSettings.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/FormatResponseSettings.java
rename to data-discovery/src/main/java/webapi/FormatResponseSettings.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/MonitorFilter.java b/data-discovery/src/main/java/webapi/MonitorFilter.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/MonitorFilter.java
rename to data-discovery/src/main/java/webapi/MonitorFilter.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/MultiValuedParamNotSupported.java b/data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/MultiValuedParamNotSupported.java
rename to data-discovery/src/main/java/webapi/MultiValuedParamNotSupported.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/SearchServlet.java
rename to data-discovery/src/main/java/webapi/SearchServlet.java
diff --git a/data-discovery/src/main/java/vlkb/webapi/SearchSettings.java b/data-discovery/src/main/java/webapi/SearchSettings.java
similarity index 100%
rename from data-discovery/src/main/java/vlkb/webapi/SearchSettings.java
rename to data-discovery/src/main/java/webapi/SearchSettings.java
--
GitLab