summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/App.java
diff options
context:
space:
mode:
authorNils Schwabe2014-04-08 12:23:58 +0200
committerNils Schwabe2014-04-08 12:23:58 +0200
commitc5c204b42ef294ecaf5ff7b048d26e117ddb8c57 (patch)
treee3aa563b42e631994818ca624796a076cbe50725 /src/main/java/org/openslx/imagemaster/App.java
parentInitial Commit (diff)
downloadmasterserver-c5c204b42ef294ecaf5ff7b048d26e117ddb8c57.tar.gz
masterserver-c5c204b42ef294ecaf5ff7b048d26e117ddb8c57.tar.xz
masterserver-c5c204b42ef294ecaf5ff7b048d26e117ddb8c57.zip
LDAP functionallity
- added apache ldap client api to pom.xml - added the LDAP user which authenticates to the LDAP server - added testAuthentication to AppTest - users get inserted into db after authenticating - added log4j properties to filter unuseful debug messages
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/App.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index ef04e54..8040d35 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -3,7 +3,6 @@ package org.openslx.imagemaster;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Logger;
import org.openslx.imagemaster.thrift.server.BinaryListener;
@@ -20,8 +19,8 @@ public class App
public static void main( String[] args )
{
// Init logging
- BasicConfigurator.configure();
- log.info( "Starting Application" );
+ log.info( "Starting Application" );
+
// Create binary listener
Thread t;
t = new Thread(new BinaryListener(), "BinaryListener");