Skip to content
Snippets Groups Projects
Unverified Commit b1f94ab1 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-server-side-scripting' into f-awi

parents 05eb469c fab49a8d
Branches
Tags
No related merge requests found
...@@ -18,3 +18,6 @@ target/ ...@@ -18,3 +18,6 @@ target/
.classpath .classpath
.project .project
.settings .settings
# logfiles
screen*log*
caosdb-webui @ e27ab256
Subproject commit d02f34facc0409817daeac8a3a226a6cfcd0b895 Subproject commit e27ab2564b50c703181b9ddce2e23cd879149287
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
# ** end header # ** end header
# #
SHELL:=/bin/bash
runserver:
mvn exec:exec
run: compile run: compile
mvn exec:exec mvn exec:exec
...@@ -60,9 +64,14 @@ clean: clean-antlr ...@@ -60,9 +64,14 @@ clean: clean-antlr
clean-antlr: clean-antlr:
rm -rf target/generated-sources/antlr4/ rm -rf target/generated-sources/antlr4/
run-debug-screen: .PHONY: run-server-screen
run-server-screen:
@if test "$$(screen -ls | grep -c 'caosdb-screen')" -eq "1"; then \
echo "server is probably running. try 'screen -ls'"; \
exit 1 ; \
fi
# start and wait for server # start and wait for server
@screen -L -S caosdb-screen -t server -d -m -A make run-debug @screen -L -S caosdb-screen -t server -d -m -A make run
@sleep 2 @sleep 2
@while [ 1 -eq 1 ] ; do \ @while [ 1 -eq 1 ] ; do \
screen -S caosdb-screen -X hardcopy .screen.log || break ; \ screen -S caosdb-screen -X hardcopy .screen.log || break ; \
...@@ -70,11 +79,33 @@ run-debug-screen: ...@@ -70,11 +79,33 @@ run-debug-screen:
done; \ done; \
stop-debug-screen: .PHONY: stop-server-screen
# stop screen session with debug server stop-server-screen:
# stop screen session with server
@screen -S caosdb-screen -X hardcopy screen.log || true @screen -S caosdb-screen -X hardcopy screen.log || true
@screen -S caosdb-screen -p server -X stuff "^C" @screen -S caosdb-screen -p server -X stuff "^C"
.PHONY: run-debug-screen
run-debug-screen:
@if test "$$(screen -ls | grep -c 'caosdb-debug-screen')" -eq "1"; then \
echo "server is probably running. try 'screen -ls'"; \
exit 1 ; \
fi
# start and wait for server
@screen -L -S caosdb-debug-screen -t server -d -m -A make run-debug
@sleep 2
@while [ 1 -eq 1 ] ; do \
screen -S caosdb-debug-screen -X hardcopy .screen.log || break ; \
[ $$(grep -c "org.restlet.ext.jetty.JettyServerHelper start" .screen.log) -eq 0 ] || break ; \
done; \
.PHONY: stop-debug-screen
stop-debug-screen:
# stop screen session with debug server
@screen -S caosdb-debug-screen -X hardcopy screen.log || true
@screen -S caosdb-debug-screen -p server -X stuff "^C"
.m2-local: .m2-local:
mkdir .m2-local mkdir .m2-local
......
...@@ -23,5 +23,5 @@ ...@@ -23,5 +23,5 @@
# Makefile for pam_authentication.c # Makefile for pam_authentication.c
main: pam_authentication.c main: pam_authentication.c
mkdir ./bin mkdir -p ./bin
gcc -o ./bin/pam_authentication pam_authentication.c -lpam -lpam_misc gcc -o ./bin/pam_authentication pam_authentication.c -lpam -lpam_misc
...@@ -54,6 +54,16 @@ ...@@ -54,6 +54,16 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-beta2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.8.0-beta2</version>
</dependency>
<dependency> <dependency>
<groupId>de.timmfitschen</groupId> <groupId>de.timmfitschen</groupId>
<artifactId>easy-units</artifactId> <artifactId>easy-units</artifactId>
...@@ -78,12 +88,12 @@ ...@@ -78,12 +88,12 @@
<dependency> <dependency>
<groupId>org.restlet.jse</groupId> <groupId>org.restlet.jse</groupId>
<artifactId>org.restlet</artifactId> <artifactId>org.restlet</artifactId>
<version>2.3.9</version> <version>2.3.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.restlet.jse</groupId> <groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.fileupload</artifactId> <artifactId>org.restlet.ext.fileupload</artifactId>
<version>2.3.9</version> <version>2.3.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
...@@ -118,7 +128,7 @@ ...@@ -118,7 +128,7 @@
<dependency> <dependency>
<groupId>org.restlet.jse</groupId> <groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jetty</artifactId> <artifactId>org.restlet.ext.jetty</artifactId>
<version>2.3.9</version> <version>2.3.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment