Commit f97fe36a authored by Robert Butora's avatar Robert Butora
Browse files

removes Makefile build support

parent 820a924e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ tgz:
	&& cd -

war:
	make -C data-discovery create-war && mv data-discovery/target/vlkb-siav2*.war .
	cd data-discovery && ./mvn-build.sh && cd - && mv data-discovery/target/vlkb-siav2*.war .


clean:
	make -C data-discovery clean
	cd data-discovery && ./mvn-clean.sh && cd -



data-discovery/Makefile

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line
#===============================================================================
NAME       := vlkb-siav2
VERSION    := $(shell git describe)
WEBAPP_WAR := $(NAME)-$(VERSION).war
CONTEXT_ROOT ?= vlkb/datasets/siav2
#===============================================================================
LIB_DIR     ?= ../java-libs/lib
CLASS_DIR   := target/classes
INSTALL_DIR ?= target/webapp
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/common:src/main/java/search:src/main/java/webapi:src/main/java/webapi/formatfilter:src/main/java/webapi/authzfilter:$(AUTH_DIR)/src/main/java
VOSI     = src/main/java/vosi/VlkbServletFile.java
FILTERS  = $(wildcard src/main/java/webapi/formatfilter/*Filter.java)
SERVLETS = $(wildcard src/main/java/webapi/*Servlet.java)
#===============================================================================
JFLAGS = -g
CLASSPATH = $(LIB_DIR)/*
#===============================================================================

.PHONY: build
build:
	echo "class Version { static String asString = \"$(VERSION)\";}" > src/main/java/webapi/Version.java
	javac $(JFLAGS) -cp :$(CLASSPATH) -sourcepath $(SRC_DIR) -d $(CLASS_DIR) $(SERVLETS) $(FILTERS) $(AUTHFILTERS) $(VOSI)

.PHONY: clean
clean : 
	rm -fr src/main/java/webapi/Version.java target


.PHONY: install
install:
	mkdir -p $(INSTALL_DIR)
	cp -r src/main/webapp/* $(INSTALL_DIR)
	cp -r $(CLASS_DIR) $(LIB_DIR) $(INSTALL_DIR)/WEB-INF/
	cp ../java-libs/jjwt-*0.11.2.jar $(INSTALL_DIR)/WEB-INF/lib/
	cp src/main/resources/*.properties $(INSTALL_DIR)/WEB-INF/classes/
	cp $(AUTH_DIR)/resources/*.properties $(INSTALL_DIR)/WEB-INF/classes/

.PHONY: uninstall
uninstall:
	rm -rf $(INSTALL_DIR)


.PHONY: war
war:
	@jar -cf target/$(WEBAPP_WAR) -C $(INSTALL_DIR) index.html \
			  $(INSTALL_DIR)/*.xsl \
			  $(INSTALL_DIR)/*.js \
			  $(INSTALL_DIR)/WEB-INF/*.xml \
			  $(INSTALL_DIR)/WEB-INF/classes/* \
			  $(INSTALL_DIR)/WEB-INF/lib/*.jar

.PHONY:
create-war: clean build install war


# vlkb-devel host local:

.PHONY: vlkb-devel
vlkb-devel: stop uninstall clean build install config war start

.PHONY: config
config:
	cp config/*.ini $(INSTALL_DIR)/WEB-INF/classes
	cp config/*.properties $(INSTALL_DIR)/WEB-INF/classes
	cp config/web.xml $(INSTALL_DIR)/WEB-INF/


.PHONY: start
start:
	curl -T target/$(WEBAPP_WAR) -u admin:IA2lbt09 'http://localhost:8080/manager/text/deploy?path=/$(CONTEXT_ROOT)&update=true'

.PHONY: stop
stop:
	-@curl -u  admin:IA2lbt09 'http://localhost:8080/manager/text/undeploy?path=/$(CONTEXT_ROOT)'

.PHONY: status 
status:
	curl localhost:8080/manager/text/list -u admin:IA2lbt09

.PHONY: reload
reload:
	curl -u  admin:IA2lbt09  'http://localhost:8080/manager/text/reload?path=/$(CONTEXT_ROOT)'

data-discovery/config/Makefile

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line
################################################################
DBMS   ?= localhost  # localhost | pasquale | pasquale-devel
AUTH   ?=            # ia2token | garrtoken | <empty>
################################################################

all: formatresponsefilter.properties authpolicy.properties web.xml search.properties

web.xml:
	cd web-xml && cat web.xml-begining web.xml-format-filter web.xml-$(AUTH)-filter web.xml-authorization-filter web.xml-servlets web.xml-ending > ../web.xml

search.properties: dbms.conf-$(DBMS)
	cp dbms.conf-$(DBMS) $@

formatresponsefilter.properties: formatresponsefilter.properties.in
	cat dbms.conf-$(DBMS) formatresponsefilter.properties.in > $@

authpolicy.properties: dbms.conf-$(DBMS)
	cp dbms.conf-$(DBMS) $@

.PHONY:
clean:
	-rm -f formatresponsefilter.properties authpolicy.properties search.properties web.xml
+0 −6
Original line number Diff line number Diff line
db_uri=jdbc:postgresql://127.0.0.1:5432/vialactea
db_schema=datasets
db_user_name=vialactea
db_password=ia2vlkb

+0 −6
Original line number Diff line number Diff line
db_uri=jdbc:postgresql://pasquale.ia2.inaf.it:5432/vialactea
db_schema=datasets
db_user_name=vialactea
db_password=ia2vlkb

Loading