Loading data-access/servlet/Makefile +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading data-access/servlet/src/main/java/common.texdeleted 100644 → 0 +0 −28 Original line number Diff line number Diff line 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() data-access/servlet/src/main/java/datasets/Cutout.java→data-access/servlet/src/main/java/cutout/Cutout.java +0 −0 File moved. View file data-access/servlet/src/main/java/datasets/CutoutImpl.java→data-access/servlet/src/main/java/cutout/CutoutImpl.java +0 −0 File moved. View file data-access/servlet/src/main/java/datasets/CutoutImpl.java.backup.notes→data-access/servlet/src/main/java/cutout/CutoutImpl.java.backup.notes +0 −0 File moved. View file Loading
data-access/servlet/Makefile +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading
data-access/servlet/src/main/java/common.texdeleted 100644 → 0 +0 −28 Original line number Diff line number Diff line 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()
data-access/servlet/src/main/java/datasets/Cutout.java→data-access/servlet/src/main/java/cutout/Cutout.java +0 −0 File moved. View file
data-access/servlet/src/main/java/datasets/CutoutImpl.java→data-access/servlet/src/main/java/cutout/CutoutImpl.java +0 −0 File moved. View file
data-access/servlet/src/main/java/datasets/CutoutImpl.java.backup.notes→data-access/servlet/src/main/java/cutout/CutoutImpl.java.backup.notes +0 −0 File moved. View file