diff --git a/Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.jar b/Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.jar deleted file mode 100644 index d9e9232a10df7d5afcab7041813eed0a78218ce1..0000000000000000000000000000000000000000 Binary files a/Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.jar and /dev/null differ diff --git a/Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.LICENSE b/Kieker.WebGUI/lib/kieker-analysis-1.5-SNAPSHOT.LICENSE similarity index 100% rename from Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.LICENSE rename to Kieker.WebGUI/lib/kieker-analysis-1.5-SNAPSHOT.LICENSE diff --git a/Kieker.WebGUI/lib/kieker-analysis-1.5-SNAPSHOT.jar b/Kieker.WebGUI/lib/kieker-analysis-1.5-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..c3d2b34a4edc986c4417a51582bbfb319c6415b0 Binary files /dev/null and b/Kieker.WebGUI/lib/kieker-analysis-1.5-SNAPSHOT.jar differ diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml index 184ceca958011245e079c8ab6cdc8e3b01021f7d..db03a9202bec41a7dd1d49af9d22c356d87e5d2f 100644 --- a/Kieker.WebGUI/pom.xml +++ b/Kieker.WebGUI/pom.xml @@ -31,21 +31,6 @@ <artifactId>jsf-impl</artifactId> <version>2.1.6</version> </dependency> - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>org.eclipse.emf.common</artifactId> - <version>2.6.0.v20100614-1136</version> - </dependency> - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>ecore-xmi</artifactId> - <version>2.2.3</version> - </dependency> - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>org.eclipse.emf.ecore</artifactId> - <version>2.6.0.v20100614-1136</version> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -217,7 +202,7 @@ <artifactId>kieker</artifactId> <version>1.5-SNAPSHOT</version> <scope>system</scope> - <systemPath>${project.basedir}/lib/kieker-1.5-SNAPSHOT.jar</systemPath> + <systemPath>${project.basedir}/lib/kieker-analysis-1.5-SNAPSHOT.jar</systemPath> </dependency> <dependency> <groupId>commons-io</groupId> @@ -335,7 +320,7 @@ </goals> <configuration> <tasks> - <copy file="${project.basedir}/lib/kieker-1.5-SNAPSHOT.jar" + <copy file="${project.basedir}/lib/kieker-analysis-1.5-SNAPSHOT.jar" todir="${project.build.directory}/Kieker.WebGUI-${project.version}/WEB-INF/lib"/> </tasks> </configuration> diff --git a/Kieker.WebGUI/src/test/java/kieker/webgui/common/PluginFinderTest.java b/Kieker.WebGUI/src/test/java/kieker/webgui/common/PluginFinderTest.java index cd0720f3709b4263713383c2555f9d4d3685414f..d53e5b74fec0527a663841be04eecc633c1d08f1 100644 --- a/Kieker.WebGUI/src/test/java/kieker/webgui/common/PluginFinderTest.java +++ b/Kieker.WebGUI/src/test/java/kieker/webgui/common/PluginFinderTest.java @@ -48,9 +48,9 @@ public class PluginFinderTest extends TestCase { public void testKiekerJarContainsPlugins() { /* It can be assumed that the kieker jar contains at least one plugin. */ try { - PluginClassLoader.getInstance().addURL(new URL("file", "localhost", "lib/kieker-1.5-SNAPSHOT.jar")); + PluginClassLoader.getInstance().addURL(new URL("file", "localhost", "lib/kieker-analysis-1.5-SNAPSHOT.jar")); final List<Class<AbstractPlugin>> availableKiekerPlugins = PluginFinder.getAllPluginsWithinJar(new URL("file", "localhost", - "lib/kieker-1.5-SNAPSHOT.jar")); + "lib/kieker-analysis-1.5-SNAPSHOT.jar")); Assert.assertTrue("Kieker-Jar seems to contain no plugins.", availableKiekerPlugins.size() > 0); } catch (final MalformedURLException ex) { Assert.fail("Exception occured.");