Merge branch 'featureWish-983'

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

@@ -29,6 +29,7 @@
         <klay.jar>klay_0.2.0.jar</klay.jar>
         <spring.version>3.1.2.RELEASE</spring.version>
         <slf4j.version>1.7.2</slf4j.version>
+        <display_version>${project.version}</display_version>
     </properties>
 
     <repositories>
@@ -298,6 +299,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>
@@ -325,6 +358,19 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>gif</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>png</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>

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

@@ -89,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";

Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml

@@ -13,7 +13,7 @@
             <h:outputText value="Kieker.WebGUI" />
             <br />
             <br />
-            <h:outputText value="Version: 1.8-SNAPSHOT" />
+            <h:outputText value="Version: ${display_version}" />
             <br />
             <h:outputText value="Copyright (c) 2013 Kieker Project" />
             <br />

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>