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

.gitignore

@@ -18,3 +18,6 @@ target/
 .classpath
 .project
 .settings
+
+# logfiles
+screen*log*

caosdb-webui @ e27ab256

-Subproject commit d02f34facc0409817daeac8a3a226a6cfcd0b895
+Subproject commit e27ab2564b50c703181b9ddce2e23cd879149287

makefile

@@ -21,6 +21,10 @@
 # ** end header
 #
 
+SHELL:=/bin/bash
+
+runserver:
+	mvn exec:exec
 
 run: compile
 	mvn exec:exec
@@ -60,9 +64,14 @@ clean: clean-antlr
 clean-antlr:
 	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
-	@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
 	@while [ 1 -eq 1 ] ; do \
 		screen -S caosdb-screen -X hardcopy .screen.log || break ; \
@@ -70,11 +79,33 @@ run-debug-screen:
 	done; \
 
 
-stop-debug-screen:
-	# stop screen session with debug server
+.PHONY: stop-server-screen
+stop-server-screen:
+	# stop screen session with server
 	@screen -S caosdb-screen -X hardcopy screen.log || true
 	@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:
 	mkdir .m2-local
 

misc/pam_authentication/makefile

@@ -23,5 +23,5 @@
 # Makefile for pam_authentication.c
 
 main: pam_authentication.c
-	mkdir ./bin
+	mkdir -p ./bin
 	gcc -o ./bin/pam_authentication pam_authentication.c -lpam -lpam_misc

pom.xml

@@ -54,6 +54,16 @@
   </repositories>
   
   <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>
         <groupId>de.timmfitschen</groupId>
         <artifactId>easy-units</artifactId>
@@ -78,12 +88,12 @@
     <dependency>
       <groupId>org.restlet.jse</groupId>
       <artifactId>org.restlet</artifactId>
-      <version>2.3.9</version>
+      <version>2.3.12</version>
     </dependency>
     <dependency>
       <groupId>org.restlet.jse</groupId>
       <artifactId>org.restlet.ext.fileupload</artifactId>
-      <version>2.3.9</version>
+      <version>2.3.12</version>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>
@@ -118,7 +128,7 @@
     <dependency>
     	<groupId>org.restlet.jse</groupId>
     	<artifactId>org.restlet.ext.jetty</artifactId>
-    	<version>2.3.9</version>
+    	<version>2.3.12</version>
     </dependency>
     <dependency>
     	<groupId>org.apache.commons</groupId>