diff --git a/makefile b/makefile
index c3382cff866b10b72826fad7c1d75efece3cfa15..c1fc4ffed8183e015145b21b58fadb4bb52bd677 100644
--- a/makefile
+++ b/makefile
@@ -24,19 +24,19 @@
SHELL:=/bin/bash
runserver:
- mvn exec:exec
+ mvn exec:java
run: compile
- mvn exec:exec
+ mvn exec:java
run-debug: compile
- mvn exec:exec -Dexec.args="-classpath %classpath -Djava.util.logging.config.file=./conf/core/logging.conf caosdb.server.CaosDBServer silent debug"
+ mvn exec:java -Dexec.args="silent debug"
compile: easy-units
mvn compile
-run-nobackend:
- mvn exec:exec -Dexec.args="-classpath %classpath -Djava.util.logging.config.file=./conf/core/logging.conf caosdb.server.CaosDBServer silent debug nobackend insecure"
+run-nobackend: compile
+ mvn exec:java -Dexec.args="silent debug nobackend insecure"
start-portforwarding:
sudo iptables -t nat -N CAOSDB
diff --git a/pom.xml b/pom.xml
index e78e1b0d3a4b418065272fec8b46f32a9ce2541d..050b3ddfcb038f7f88cee37d82727f2521e929d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* ** header v3.0
* This file is a part of the CaosDB Project.
@@ -20,22 +21,17 @@
*
* ** end header
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<groupId>bmp.ds.mpg.de</groupId>
<artifactId>caosdb-server</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>jar</packaging>
-
<name>CaosDB Server</name>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.testSourceDirectory>src/test/java</project.build.testSourceDirectory>
</properties>
-
<repositories>
<repository>
<id>maven-central</id>
@@ -48,31 +44,30 @@
<url>http://maven.restlet.com</url>
</repository>
<repository>
- <id>local-maven-repo</id>
- <url>file:///${project.basedir}/.m2-local</url>
+ <id>local-maven-repo</id>
+ <url>file:///${project.basedir}/.m2-local</url>
</repository>
</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>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.8.0-beta2</version>
</dependency>
<dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.3.2</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
+ </dependency>
+ <dependency>
+ <groupId>de.timmfitschen</groupId>
+ <artifactId>easy-units</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -126,45 +121,42 @@
<version>4.7.2</version>
</dependency>
<dependency>
- <groupId>org.restlet.jse</groupId>
- <artifactId>org.restlet.ext.jetty</artifactId>
- <version>2.3.12</version>
+ <groupId>org.restlet.jse</groupId>
+ <artifactId>org.restlet.ext.jetty</artifactId>
+ <version>2.3.12</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.2</version>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.6.0-rc1</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.6.0-rc1</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>org.kohsuke</groupId>
- <artifactId>libpam4j</artifactId>
- <version>1.8</version>
+ <groupId>org.kohsuke</groupId>
+ <artifactId>libpam4j</artifactId>
+ <version>1.8</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>9.2.14.v20151106</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ <version>9.2.14.v20151106</version>
</dependency>
</dependencies>
-
-
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
-
<plugins>
<plugin>
<groupId>org.antlr</groupId>
@@ -195,6 +187,7 @@
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
+
<!-- <descriptorRef>project</descriptorRef> -->
<!-- <descriptorRef>src</descriptorRef> -->
</descriptorRefs>
@@ -210,24 +203,33 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<configuration>
- <includes>
+ <includes>
<include>**/*.java</include>
- </includes>
+ </includes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <executable>java</executable>
- <arguments>
- <argument>-classpath</argument>
- <classpath/>
- <argument>-Djava.util.logging.config.file=./conf/core/logging.conf</argument>
- <argument>caosdb.server.CaosDBServer</argument>
- <argument>silent</argument>
- </arguments>
+ <mainClass>caosdb.server.CaosDBServer</mainClass>
+ <arguments>
+ <argument>silent</argument>
+ </arguments>
+ <systemProperties>
+ <systemProperty>
+ <key>java.util.loggin.config.file</key>
+ <value>./conf/core/logging.conf</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
</plugin>
<plugin>
@@ -235,15 +237,14 @@
<artifactId>fmt-maven-plugin</artifactId>
<version>2.5.1</version>
<executions>
- <execution>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
-
<url>bmp.ds.mpg.de</url>
</project>
diff --git a/src/main/java/caosdb/server/utils/FileUtils.java b/src/main/java/caosdb/server/utils/FileUtils.java
index 4cff856e5f75b34b202da29be8100aed8d31da91..a12cf14bd3e6493c7349b74297d6d3ba911c5038 100644
--- a/src/main/java/caosdb/server/utils/FileUtils.java
+++ b/src/main/java/caosdb/server/utils/FileUtils.java
@@ -40,7 +40,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.file.CopyOption;
import java.nio.file.StandardCopyOption;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;