From b9286b15d24adb75a6eba96a02ce7aab2a7ffc6d Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Thu, 25 Apr 2024 10:17:05 +0200
Subject: [PATCH] build/servelt: move RpcAmqp-module to cutout/ and renames dir
json-rpc -> json
---
data-access/servlet/Makefile | 2 +-
.../src/main/java/cutout/{json-rpc => }/RpcOverAmqp.java | 0
.../src/main/java/cutout/{json-rpc => json}/JdlMCutout.java | 0
.../src/main/java/cutout/{json-rpc => json}/JsonDecoder.java | 0
.../src/main/java/cutout/{json-rpc => json}/JsonEncoder.java | 0
.../main/java/cutout/{json-rpc => json}/JsonEncoderMerge.java | 0
6 files changed, 1 insertion(+), 1 deletion(-)
rename data-access/servlet/src/main/java/cutout/{json-rpc => }/RpcOverAmqp.java (100%)
rename data-access/servlet/src/main/java/cutout/{json-rpc => json}/JdlMCutout.java (100%)
rename data-access/servlet/src/main/java/cutout/{json-rpc => json}/JsonDecoder.java (100%)
rename data-access/servlet/src/main/java/cutout/{json-rpc => json}/JsonEncoder.java (100%)
rename data-access/servlet/src/main/java/cutout/{json-rpc => json}/JsonEncoderMerge.java (100%)
diff --git a/data-access/servlet/Makefile b/data-access/servlet/Makefile
index 5ea8d97..7e0712f 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/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
+SRC_DIR = src/main/java/:src/main/java/common:src/main/java/cutout:src/main/java/cutout/json: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/cutout/json-rpc/RpcOverAmqp.java b/data-access/servlet/src/main/java/cutout/RpcOverAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/RpcOverAmqp.java
rename to data-access/servlet/src/main/java/cutout/RpcOverAmqp.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java b/data-access/servlet/src/main/java/cutout/json/JdlMCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java
rename to data-access/servlet/src/main/java/cutout/json/JdlMCutout.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java b/data-access/servlet/src/main/java/cutout/json/JsonDecoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java
rename to data-access/servlet/src/main/java/cutout/json/JsonDecoder.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java b/data-access/servlet/src/main/java/cutout/json/JsonEncoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java
rename to data-access/servlet/src/main/java/cutout/json/JsonEncoder.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java b/data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java
rename to data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java
--
GitLab