Skip to content
Snippets Groups Projects
Commit 51d388a1 authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Updated kieker-jar, solved the class loader problem.

parent 0b0a082b
No related branches found
No related tags found
No related merge requests found
No preview for this file type
...@@ -29,6 +29,7 @@ import kieker.analysis.AnalysisController; ...@@ -29,6 +29,7 @@ import kieker.analysis.AnalysisController;
import kieker.analysis.model.analysisMetaModel.MIProject; import kieker.analysis.model.analysisMetaModel.MIProject;
import kieker.common.logging.Log; import kieker.common.logging.Log;
import kieker.common.logging.LogFactory; import kieker.common.logging.LogFactory;
import kieker.webgui.common.PluginClassLoader;
/** /**
* *
...@@ -83,7 +84,7 @@ public class AnalysisControllerBean { ...@@ -83,7 +84,7 @@ public class AnalysisControllerBean {
final File tempFile = File.createTempFile("java", ".tmp"); final File tempFile = File.createTempFile("java", ".tmp");
AnalysisController.saveToFile(tempFile, mProject); AnalysisController.saveToFile(tempFile, mProject);
/* Try to create the controller. */ /* Try to create the controller. */
this.controller = new AnalysisController(tempFile); this.controller = new AnalysisController(tempFile, PluginClassLoader.getInstance());
/* Don't forget to remove the temporary file. */ /* Don't forget to remove the temporary file. */
tempFile.delete(); tempFile.delete();
} catch (final IOException ex) { } catch (final IOException ex) {
......
...@@ -42,9 +42,11 @@ import kieker.analysis.model.analysisMetaModel.MIPlugin; ...@@ -42,9 +42,11 @@ import kieker.analysis.model.analysisMetaModel.MIPlugin;
import kieker.analysis.model.analysisMetaModel.MIProject; import kieker.analysis.model.analysisMetaModel.MIProject;
import kieker.analysis.model.analysisMetaModel.MIProperty; import kieker.analysis.model.analysisMetaModel.MIProperty;
import kieker.analysis.model.analysisMetaModel.impl.MAnalysisMetaModelFactory; import kieker.analysis.model.analysisMetaModel.impl.MAnalysisMetaModelFactory;
import kieker.analysis.plugin.AbstractFilterPlugin; import kieker.analysis.plugin.filter.AbstractFilterPlugin;
import kieker.analysis.plugin.AbstractPlugin; import kieker.analysis.plugin.AbstractPlugin;
import kieker.analysis.plugin.AbstractReaderPlugin; import kieker.analysis.plugin.reader.AbstractReaderPlugin;
import kieker.analysis.plugin.filter.AbstractFilterPlugin;
import kieker.analysis.plugin.reader.AbstractReaderPlugin;
import kieker.analysis.repository.AbstractRepository; import kieker.analysis.repository.AbstractRepository;
import kieker.common.configuration.Configuration; import kieker.common.configuration.Configuration;
import kieker.common.logging.Log; import kieker.common.logging.Log;
......
...@@ -142,7 +142,7 @@ public final class FileManager { ...@@ -142,7 +142,7 @@ public final class FileManager {
final File fileProject = new File(dirProject, projectName + FileManager.EXTENSION); final File fileProject = new File(dirProject, projectName + FileManager.EXTENSION);
try { try {
// TODO Copy before saving as the controller destroys at least the dependencies. // TODO Copy before saving as the controller destroys at least the dependencies.
final AnalysisController controller = new AnalysisController(project); final AnalysisController controller = new AnalysisController(project, PluginClassLoader.getInstance());
if (controller.saveToFile(fileProject)) { if (controller.saveToFile(fileProject)) {
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", "Project saved: " + project.getName())); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", "Project saved: " + project.getName()));
return true; return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment