diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt
index e69de29b..e1103410 100644
--- a/bin/test/data/log/test_log.txt
+++ b/bin/test/data/log/test_log.txt
@@ -0,0 +1,74 @@
+Token.cpp ERROR: Location Id was not referenced by this Token.
+Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
+Edge.cpp ERROR: Nodes are not plain copies.
+ INFO: send MessageStatus Enabled console and file logging.
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage2 
+ INFO: send TestMessage 
+ INFO: send TestMessage2 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage2 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+ INFO: send TestMessage 
+NetworkProtocolHelper.cpp ERROR: Failed to parse message, invalid type token: foo. Expected setActiveToken
+NetworkProtocolHelper.cpp ERROR: Failed to parse setActiveToken message, invalid token count
+Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
+Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
+TextAccess.cpp ERROR: Could not open file path/to/test.h
+TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
+TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
+TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
+TextAccess.cpp WARNING: Line numbers start with one, is 0
+TextAccess.cpp WARNING: Line numbers start with one, is 0
+TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 2:3 2:1
+TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 4:1 1:10
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
diff --git a/src/lib/settings/JavaProjectSettings.cpp b/src/lib/settings/JavaProjectSettings.cpp
index dad41ee1..cec35b81 100644
--- a/src/lib/settings/JavaProjectSettings.cpp
+++ b/src/lib/settings/JavaProjectSettings.cpp
@@ -25,6 +25,10 @@ JavaProjectSettings::~JavaProjectSettings()
 
 ProjectType JavaProjectSettings::getProjectType() const
 {
+	if (!getMavenProjectFilePath().empty())
+	{
+		return PROJECT_JAVA_MAVEN;
+	}
 	return PROJECT_JAVA_EMPTY;
 }
 
@@ -63,7 +67,7 @@ bool JavaProjectSettings::setClasspaths(const std::vector<FilePath>& classpaths)
 
 FilePath JavaProjectSettings::getMavenProjectFilePath() const
 {
-	return FilePath(getValue<std::string>("source/maven/project_root", ""));
+	return FilePath(getValue<std::string>("source/maven/project_file_path", ""));
 }
 
 FilePath JavaProjectSettings::getAbsoluteMavenProjectFilePath() const
@@ -73,7 +77,7 @@ FilePath JavaProjectSettings::getAbsoluteMavenProjectFilePath() const
 
 bool JavaProjectSettings::setMavenProjectFilePath(const FilePath& path)
 {
-	return setValue("source/maven/project_root", path.str());
+	return setValue("source/maven/project_file_path", path.str());
 }
 
 FilePath JavaProjectSettings::getMavenDependenciesDirectory() const