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

Started with the version string problem.

parent 698261ff
No related branches found
No related tags found
No related merge requests found
......@@ -67,6 +67,7 @@ import kieker.webgui.persistence.impl.util.Class2ModelInstanceConverter;
import kieker.webgui.persistence.impl.util.CloseableURLClassLoader;
import kieker.webgui.persistence.impl.util.PluginFinder;
import kieker.webgui.persistence.impl.util.SimpleCastFunction;
import kieker.webgui.web.beans.application.GlobalPropertiesBean;
import org.primefaces.model.UploadedFile;
......@@ -89,7 +90,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
private static final Log LOG = LogFactory.getLog(FSProjectDAOImpl.class);
private static final MIAnalysisMetaModelFactory FACTORY = MIAnalysisMetaModelFactory.eINSTANCE;
private static final String KIEKER_LIB = "kieker-1.8-SNAPSHOT-emf.jar";
// private static final String KIEKER_LIB = "kieker-1.8-SNAPSHOT-emf.jar";
private static final String META_FILE = "meta.dat";
private static final String KAX_EXTENSION = "kax";
private static final String LIB_EXTENSION = "jar";
......@@ -101,6 +102,8 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
private static final String PROPERTY_KEY_ANALYSIS_LAYOUT = "analysis layout";
private static final String PROPERTY_KEY_COCKPIT_LAYOUT = "cockpit layout";
@Autowired
private GlobalPropertiesBean globalPropertiesBean;
@Autowired
private PluginFinder pluginFinder;
@Autowired
......@@ -716,7 +719,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
* @return The kieker url.
*/
private URL getKiekerURL() {
return Thread.currentThread().getContextClassLoader().getResource(FSProjectDAOImpl.KIEKER_LIB);
return Thread.currentThread().getContextClassLoader().getResource(this.globalPropertiesBean.getKiekerJarFileName());
}
/*
......
......@@ -74,6 +74,8 @@ public class GlobalPropertiesBean implements Serializable {
private String analysisEditorDefaultGridSize;
private String analysisEditorDefaultGridColor;
private String kiekerJarFileName;
/**
* Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
......@@ -145,6 +147,14 @@ public class GlobalPropertiesBean implements Serializable {
return this.themeCookieName;
}
public String getKiekerJarFileName() {
return this.kiekerJarFileName;
}
public void setKiekerJarFileName(final String kiekerJarFileName) {
this.kiekerJarFileName = kiekerJarFileName;
}
public String getMsgProjectLoadingException() {
return GlobalPropertiesBean.getLocalizedString(GlobalPropertiesBean.PROPERTY_MSG_PROJECT_LOADING_EXCEPTION);
}
......
......@@ -23,3 +23,6 @@ kieker.webgui.config.analysisEditor.defaultGridColor = dbdbdb
#------------------------------------------------------------------------------
kieker.webgui.page.projectOverview = projectOverview
kieker.webgui.common.kieker.jar = kieker-1.8-SNAPSHOT-emf.jar
\ No newline at end of file
......@@ -18,6 +18,7 @@
<property name="analysisEditorGridColorCookieName" value="${kieker.webgui.config.analysisEditor.gridColor.cookieName}"/>
<property name="analysisEditorDefaultGridSize" value="${kieker.webgui.config.analysisEditor.defaultGridSize}"/>
<property name="analysisEditorDefaultGridColor" value="${kieker.webgui.config.analysisEditor.defaultGridColor}"/>
<property name="kiekerJarFileName" value="${kieker.webgui.common.kieker.jar}"/>
</bean>
<bean id="themeSwitcherBean" class="kieker.webgui.web.beans.application.ThemeSwitcherBean">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment