From 70f411693821366af40bbf99982b27405cdf69d3 Mon Sep 17 00:00:00 2001 From: Robert Butora <robert.butora@inaf.it> Date: Thu, 16 May 2024 16:47:37 +0200 Subject: [PATCH] renames src-dirs: cutout -> ops, cutout/json -> ops/amqp, adds ops/cli --- data-access/servlet/Makefile | 2 +- data-access/servlet/src/main/java/{cutout => ops}/CutArgs.java | 0 .../servlet/src/main/java/{cutout/json => ops}/JdlMCutout.java | 0 data-access/servlet/src/main/java/{cutout => ops}/Regrid.java | 0 .../servlet/src/main/java/{cutout => ops}/Reproject.java | 0 data-access/servlet/src/main/java/{cutout => ops}/Soda.java | 0 data-access/servlet/src/main/java/{cutout => ops}/SodaImpl.java | 0 data-access/servlet/src/main/java/{cutout => ops}/Vlkb.java | 0 data-access/servlet/src/main/java/{cutout => ops}/VlkbAmqp.java | 0 data-access/servlet/src/main/java/{cutout => ops}/VlkbCli.java | 0 .../src/main/java/{cutout/json => ops/amqp}/JsonDecoder.java | 0 .../src/main/java/{cutout/json => ops/amqp}/JsonEncoder.java | 0 .../main/java/{cutout/json => ops/amqp}/JsonEncoderMerge.java | 0 .../servlet/src/main/java/{cutout => ops/amqp}/RpcOverAmqp.java | 0 .../servlet/src/main/java/{cutout => ops/cli}/ExecCmd.java | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename data-access/servlet/src/main/java/{cutout => ops}/CutArgs.java (100%) rename data-access/servlet/src/main/java/{cutout/json => ops}/JdlMCutout.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/Regrid.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/Reproject.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/Soda.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/SodaImpl.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/Vlkb.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/VlkbAmqp.java (100%) rename data-access/servlet/src/main/java/{cutout => ops}/VlkbCli.java (100%) rename data-access/servlet/src/main/java/{cutout/json => ops/amqp}/JsonDecoder.java (100%) rename data-access/servlet/src/main/java/{cutout/json => ops/amqp}/JsonEncoder.java (100%) rename data-access/servlet/src/main/java/{cutout/json => ops/amqp}/JsonEncoderMerge.java (100%) rename data-access/servlet/src/main/java/{cutout => ops/amqp}/RpcOverAmqp.java (100%) rename data-access/servlet/src/main/java/{cutout => ops/cli}/ExecCmd.java (100%) diff --git a/data-access/servlet/Makefile b/data-access/servlet/Makefile index a803aa9..2d58858 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/common/output:src/main/java/cutout:src/main/java/cutout/json: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/common/output:src/main/java/ops:src/main/java/ops/cli:src/main/java/ops/amqp: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/CutArgs.java b/data-access/servlet/src/main/java/ops/CutArgs.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/CutArgs.java rename to data-access/servlet/src/main/java/ops/CutArgs.java diff --git a/data-access/servlet/src/main/java/cutout/json/JdlMCutout.java b/data-access/servlet/src/main/java/ops/JdlMCutout.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/json/JdlMCutout.java rename to data-access/servlet/src/main/java/ops/JdlMCutout.java diff --git a/data-access/servlet/src/main/java/cutout/Regrid.java b/data-access/servlet/src/main/java/ops/Regrid.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/Regrid.java rename to data-access/servlet/src/main/java/ops/Regrid.java diff --git a/data-access/servlet/src/main/java/cutout/Reproject.java b/data-access/servlet/src/main/java/ops/Reproject.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/Reproject.java rename to data-access/servlet/src/main/java/ops/Reproject.java diff --git a/data-access/servlet/src/main/java/cutout/Soda.java b/data-access/servlet/src/main/java/ops/Soda.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/Soda.java rename to data-access/servlet/src/main/java/ops/Soda.java diff --git a/data-access/servlet/src/main/java/cutout/SodaImpl.java b/data-access/servlet/src/main/java/ops/SodaImpl.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/SodaImpl.java rename to data-access/servlet/src/main/java/ops/SodaImpl.java diff --git a/data-access/servlet/src/main/java/cutout/Vlkb.java b/data-access/servlet/src/main/java/ops/Vlkb.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/Vlkb.java rename to data-access/servlet/src/main/java/ops/Vlkb.java diff --git a/data-access/servlet/src/main/java/cutout/VlkbAmqp.java b/data-access/servlet/src/main/java/ops/VlkbAmqp.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/VlkbAmqp.java rename to data-access/servlet/src/main/java/ops/VlkbAmqp.java diff --git a/data-access/servlet/src/main/java/cutout/VlkbCli.java b/data-access/servlet/src/main/java/ops/VlkbCli.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/VlkbCli.java rename to data-access/servlet/src/main/java/ops/VlkbCli.java diff --git a/data-access/servlet/src/main/java/cutout/json/JsonDecoder.java b/data-access/servlet/src/main/java/ops/amqp/JsonDecoder.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/json/JsonDecoder.java rename to data-access/servlet/src/main/java/ops/amqp/JsonDecoder.java diff --git a/data-access/servlet/src/main/java/cutout/json/JsonEncoder.java b/data-access/servlet/src/main/java/ops/amqp/JsonEncoder.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/json/JsonEncoder.java rename to data-access/servlet/src/main/java/ops/amqp/JsonEncoder.java diff --git a/data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java b/data-access/servlet/src/main/java/ops/amqp/JsonEncoderMerge.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java rename to data-access/servlet/src/main/java/ops/amqp/JsonEncoderMerge.java diff --git a/data-access/servlet/src/main/java/cutout/RpcOverAmqp.java b/data-access/servlet/src/main/java/ops/amqp/RpcOverAmqp.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/RpcOverAmqp.java rename to data-access/servlet/src/main/java/ops/amqp/RpcOverAmqp.java diff --git a/data-access/servlet/src/main/java/cutout/ExecCmd.java b/data-access/servlet/src/main/java/ops/cli/ExecCmd.java similarity index 100% rename from data-access/servlet/src/main/java/cutout/ExecCmd.java rename to data-access/servlet/src/main/java/ops/cli/ExecCmd.java -- GitLab