Revert "Started with the version string problem."

This reverts commit 38c04dbd.

Made sure that the downloaded kieker jar will be copied to the classes directory during compiling (the redundant jar file is unnecessary now).

Kieker.WebGUI/nb-configuration.xml

@@ -9,16 +9,6 @@ Without this configuration present, some functionality in the IDE may be limited
     <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
         <word>xml</word>
     </spellchecker-wordlist>
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.compile.on.save>all</netbeans.compile.on.save>
-        <org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
-    </properties>
     <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
         <config-files>
             <config-file>src/main/webapp/WEB-INF/spring-bean-config.xml</config-file>

Kieker.WebGUI/pom.xml

@@ -298,6 +298,38 @@
                 </configuration>
             </plugin>
             <!-- This is some kind of a hack, as maven doesn't want to include system jars into the war-file. We use ant instead. -->
+            <plugin>
+      
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.kieker-monitoring</groupId>
+                                    <artifactId>kieker</artifactId>
+                                    <version>1.8-SNAPSHOT</version>
+                                    <classifier>emf</classifier>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <destFileName>kieker.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/wars</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>

Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java

@@ -67,7 +67,6 @@ 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;
 
@@ -90,7 +89,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.jar";
 	private static final String META_FILE = "meta.dat";
 	private static final String KAX_EXTENSION = "kax";
 	private static final String LIB_EXTENSION = "jar";
@@ -102,8 +101,6 @@ 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
@@ -719,7 +716,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
 	 * @return The kieker url.
 	 */
 	private URL getKiekerURL() {
-		return Thread.currentThread().getContextClassLoader().getResource(this.globalPropertiesBean.getKiekerJarFileName());
+		return Thread.currentThread().getContextClassLoader().getResource(FSProjectDAOImpl.KIEKER_LIB);
 	}
 
 	/*

Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java

@@ -74,8 +74,6 @@ 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>
 	 */
@@ -147,14 +145,6 @@ 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);
 	}

Kieker.WebGUI/src/main/resources/global.properties

@@ -23,6 +23,3 @@ 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

Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml

@@ -18,7 +18,6 @@
         <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">

Kieker.WebGUI/src/test/java/kieker/webgui/common/ClassAndMethodContainerTest.java

@@ -32,7 +32,7 @@ import kieker.webgui.persistence.impl.util.CloseableURLClassLoader;
  */
 public class ClassAndMethodContainerTest {
 
-	private static final String KIEKER_LIB = "kieker-1.8-SNAPSHOT-emf.jar";
+	private static final String KIEKER_LIB = "kieker.jar";
 
 	/**
 	 * Default constructor. <b>Do not use this constructor. This is just a test class and not to be used outside a JUnit test!</b>

Kieker.WebGUI/src/test/java/kieker/webgui/persistence/impl/util/PluginFinderTest.java

@@ -35,7 +35,7 @@ import kieker.webgui.common.ClassAndMethodContainer;
  */
 public class PluginFinderTest {
 
-	private static final String KIEKER_LIB = "kieker-1.8-SNAPSHOT-emf.jar";
+	private static final String KIEKER_LIB = "kieker.jar";
 
 	/**
 	 * Default constructor. <b>Do not use this constructor. This is just a test class and not to be used outside a JUnit test!</b>