diff --git a/data-access/servlet/Makefile b/data-access/servlet/Makefile index 7e0712fb6463e1211a7cc5c1376ed8f976b5363f..9bf61a92e47411e9ebf168e9c9c7cb0861c0a31f 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: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/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 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/vo/CutResult.java b/data-access/servlet/src/main/java/common/output/CutResult.java similarity index 100% rename from data-access/servlet/src/main/java/common/vo/CutResult.java rename to data-access/servlet/src/main/java/common/output/CutResult.java diff --git a/data-access/servlet/src/main/java/common/vo/MCutResult.java b/data-access/servlet/src/main/java/common/output/MCutResult.java similarity index 100% rename from data-access/servlet/src/main/java/common/vo/MCutResult.java rename to data-access/servlet/src/main/java/common/output/MCutResult.java diff --git a/data-access/servlet/src/main/java/common/vo/NullValueCount.java b/data-access/servlet/src/main/java/common/output/NullValueCount.java similarity index 100% rename from data-access/servlet/src/main/java/common/vo/NullValueCount.java rename to data-access/servlet/src/main/java/common/output/NullValueCount.java diff --git a/data-access/servlet/src/main/java/common/vo/DataLink.java b/data-access/servlet/src/main/java/webapi/output/DataLink.java similarity index 100% rename from data-access/servlet/src/main/java/common/vo/DataLink.java rename to data-access/servlet/src/main/java/webapi/output/DataLink.java