Index: /trunk/quest-runner/.classpath
===================================================================
--- /trunk/quest-runner/.classpath	(revision 532)
+++ /trunk/quest-runner/.classpath	(revision 533)
@@ -2,10 +2,4 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
Index: /trunk/quest-runner/pom.xml
===================================================================
--- /trunk/quest-runner/pom.xml	(revision 532)
+++ /trunk/quest-runner/pom.xml	(revision 533)
@@ -1,8 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>de.ugoe.cs.quest</groupId>
-  <artifactId>quest-runner</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>quest-runner</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>de.ugoe.cs.quest</groupId>
+	<artifactId>quest-runner</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>quest-runner</name>
 	<scm>
 		<url>https://quest.informatik.uni-goettingen.de/svn/quest/trunk/quest-runner</url>
@@ -12,4 +13,9 @@
 			<groupId>de.ugoe.cs</groupId>
 			<artifactId>java-utils</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>de.ugoe.cs.quest</groupId>
+			<artifactId>quest-plugin-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
@@ -38,4 +44,6 @@
 					<source>1.6</source>
 					<target>1.6</target>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
Index: /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java
===================================================================
--- /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java	(revision 532)
+++ /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java	(revision 533)
@@ -1,4 +1,5 @@
 package de.ugoe.cs.quest.ui;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
@@ -9,4 +10,6 @@
 import joptsimple.OptionSpec;
 import de.ugoe.cs.quest.log4j.Log4JLogger;
+import de.ugoe.cs.quest.plugin.PluginLoader;
+import de.ugoe.cs.quest.plugin.QuestPlugin;
 import de.ugoe.cs.quest.ui.swt.MainWindow;
 import de.ugoe.cs.util.console.CommandExecuter;
@@ -46,8 +49,13 @@
 	 */
 	public static void main(String[] args) {
+
 		CommandExecuter.getInstance().addCommandPackage(
 				"de.ugoe.cs.quest.ui.commands");
 		CommandExecuter.getInstance().addCommandPackage(
 				"de.ugoe.cs.quest.ui.swt.commands");
+
+		// The following four command packages are added automatically, once the
+		// plugin-mechanism works correctly. Hence, these calls should be
+		// removed then.
 		CommandExecuter.getInstance().addCommandPackage(
 				"de.ugoe.cs.quest.plugin.mfc.commands");
@@ -58,4 +66,16 @@
 		CommandExecuter.getInstance().addCommandPackage(
 				"de.ugoe.cs.quest.plugin.jfc.commands");
+
+		/*
+		 * Code for loading plugins. Should be uncommented once the
+		 * plugin-mechanism works correctly.
+		 * 
+		 * PluginLoader pluginLoader = new PluginLoader(new File("plugins"));
+		 * pluginLoader.load();
+		 * 
+		 * for( QuestPlugin plugin : pluginLoader.getPlugins()) { for( String
+		 * commandPackage : plugin.getCommandPackages()) {
+		 * CommandExecuter.getInstance().addCommandPackage(commandPackage); } }
+		 */
 
 		OptionParser parser = new OptionParser();