ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: add logging for jars used by maven project setup

Browse Source
This commit is contained in:
malte_langkabel
2017-06-28 11:55:23 +02:00
parent d60a9c82d5
commit 8370caf705
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/project/SourceGroupJava.cpp
+25 -17
View File
@@ -1,5 +1,11 @@
#include "project/SourceGroupJava.h"
#include "component/view/DialogView.h"
#include "data/indexer/IndexerCommandJava.h"
#include "data/parser/java/JavaEnvironmentFactory.h"
#include "data/parser/java/JavaEnvironment.h"
#include "data/parser/java/JavaParser.h"
#include "settings/ApplicationSettings.h"
#include "utility/file/FileManager.h"
#include "utility/file/FileSystem.h"
#include "utility/messaging/type/MessageStatus.h"
@@ -8,14 +14,7 @@
#include "utility/utility.h"
#include "utility/utilityMaven.h"
#include "utility/utilityString.h"
#include "Application.h"
#include "component/view/DialogView.h"
#include "data/indexer/IndexerCommandJava.h"
#include "data/parser/java/JavaEnvironmentFactory.h"
#include "data/parser/java/JavaEnvironment.h"
#include "data/parser/java/JavaParser.h"
#include "settings/ApplicationSettings.h"
SourceGroupJava::SourceGroupJava(std::shared_ptr<SourceGroupSettingsJava> settings)
: m_settings(settings)
@@ -181,34 +180,43 @@ bool SourceGroupJava::prepareMavenData()
std::vector<FilePath> SourceGroupJava::getClassPath()
{
LOG_INFO("Retrieving classpath for indexer commands");
std::vector<FilePath> classPath;
for (const FilePath& p: m_settings->getClasspathsExpandedAndAbsolute())
for (const FilePath& classpath: m_settings->getClasspathsExpandedAndAbsolute())
{
if (p.exists())
if (classpath.exists())
{
classPath.push_back(p);
LOG_INFO("Adding path to classpath: " + classpath.str());
classPath.push_back(classpath);
}
}
if (m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute().exists())
{
utility::append(
classPath,
FileSystem::getFilePathsFromDirectory(
m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute(),
utility::createVectorFromElements<std::string>(".jar")
)
std::vector<FilePath> mavenJarPaths = FileSystem::getFilePathsFromDirectory(
m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute(),
utility::createVectorFromElements<std::string>(".jar")
);
for (const FilePath& mavenJarPath: mavenJarPaths)
{
LOG_INFO("Adding jar to classpath: " + mavenJarPath.str());
}
utility::append(classPath, mavenJarPaths);
}
for (FilePath rootDirectory: fetchRootDirectories())
for (const FilePath& rootDirectory: fetchRootDirectories())
{
if (rootDirectory.exists())
{
LOG_INFO("Adding root directory to classpath: " + rootDirectory.str());
classPath.push_back(rootDirectory);
}
}
LOG_INFO("Found " + std::to_string(classPath.size()) + " paths for classpath.");
return classPath;
}
src/lib_java/utility/utilityMaven.cpp
+3 -2
View File
@@ -25,12 +25,12 @@ namespace
}
tagString += tags[i];
}
LOG_INFO("Fetching directories for \"" + tagString + "\".");
LOG_INFO("Fetching source directories in \"" + tagString + "\".");
std::vector<std::string> fetchedDirectories = utility::getValuesOfAllXmlElementsOnPath(
xmlAccess, tags
);
LOG_INFO("Found " + std::to_string(fetchedDirectories.size()) + " directories.");
LOG_INFO("Found " + std::to_string(fetchedDirectories.size()) + " source directories.");
for (const std::string& fetchedDirectory: fetchedDirectories)
{
@@ -40,6 +40,7 @@ namespace
path = path.concat(toAppend);
}
pathList.push_back(path);
LOG_INFO("Found directory \"" + path.str() + "\".");
}
}