Index: /trunk/autoquest-runner/bin/run.sh
===================================================================
--- /trunk/autoquest-runner/bin/run.sh	(revision 980)
+++ /trunk/autoquest-runner/bin/run.sh	(revision 981)
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-HOME_DIR=`dirname $0`
+HOME_DIR=`dirname $0`/..
 
 # Given the "java" executable as an argument, find JAVA_HOME
@@ -98,5 +98,5 @@
 cd ${HOME_DIR}
 
-JAR_FILE=`find . -type f -name 'quest-runner-*.jar'`
+JAR_FILE=`find . -type f -name 'autoquest-runner-*.jar'`
 
 if [ ! -f "$JAR_FILE" ] ; then
Index: /trunk/autoquest-runner/pom.xml
===================================================================
--- /trunk/autoquest-runner/pom.xml	(revision 980)
+++ /trunk/autoquest-runner/pom.xml	(revision 981)
@@ -1,239 +1,90 @@
 <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"
+    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"
 >
-  <parent>
-    <groupId>de.ugoe.cs.autoquest</groupId>
-    <artifactId>autoquest</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>autoquest-runner</artifactId>
-  <name>autoquest-runner</name>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <url>${autoquest-scm-trunk-dir}/autoquest-runner</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>de.ugoe.cs</groupId>
-      <artifactId>java-utils</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-core</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-ui-core</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-ui-swt</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-guitar</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-jfc</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-mfc</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-php</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>de.ugoe.cs.autoquest</groupId>
-      <artifactId>autoquest-plugin-html</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[1.0.0,)</versionRange>
-                    <goals>
-                      <goal>get</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[1.0.0,)</versionRange>
-                    <goals>
-                      <goal>unpack</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <classpathPrefix>lib/</classpathPrefix>
-              <mainClass>de.ugoe.cs.autoquest.ui.Runner</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>get-jfc-plugin-config</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>de.ugoe.cs.autoquest</groupId>
-                  <artifactId>autoquest-plugin-jfc</artifactId>
-                  <version>${project.parent.version}</version>
-                  <classifier>config</classifier>
-                  <type>zip</type>
-                  <outputDirectory>${project.build.directory}/data</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>get-mfc-plugin-config</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>de.ugoe.cs.autoquest</groupId>
-                  <artifactId>autoquest-plugin-mfc</artifactId>
-                  <version>${project.parent.version}</version>
-                  <classifier>config</classifier>
-                  <type>zip</type>
-                  <outputDirectory>${project.build.directory}/data</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>get-php-plugin-config</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>de.ugoe.cs.autoquest</groupId>
-                  <artifactId>autoquest-plugin-php</artifactId>
-                  <version>${project.parent.version}</version>
-                  <classifier>config</classifier>
-                  <type>zip</type>
-                  <outputDirectory>${project.build.directory}/data</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>get-html-plugin-config</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>de.ugoe.cs.autoquest</groupId>
-                  <artifactId>autoquest-plugin-html</artifactId>
-                  <version>${project.parent.version}</version>
-                  <classifier>config</classifier>
-                  <type>zip</type>
-                  <outputDirectory>${project.build.directory}/data</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <parent>
+        <groupId>de.ugoe.cs.autoquest</groupId>
+        <artifactId>autoquest</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>autoquest-runner</artifactId>
+    <name>autoquest-runner</name>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <scm>
+        <url>${autoquest-scm-trunk-dir}/autoquest-runner</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>de.ugoe.cs</groupId>
+            <artifactId>java-utils</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>de.ugoe.cs.autoquest</groupId>
+            <artifactId>autoquest-plugin-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.ugoe.cs.autoquest</groupId>
+            <artifactId>autoquest-ui-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.ugoe.cs.autoquest</groupId>
+            <artifactId>autoquest-ui-swt</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jopt-simple</groupId>
+            <artifactId>jopt-simple</artifactId>
+            <version>4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>de.ugoe.cs.autoquest.ui.Runner</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
Index: /trunk/autoquest-runner/src/main/assembly/bin.xml
===================================================================
--- /trunk/autoquest-runner/src/main/assembly/bin.xml	(revision 980)
+++ /trunk/autoquest-runner/src/main/assembly/bin.xml	(revision 981)
@@ -5,24 +5,7 @@
   <id>bin</id>
   <formats>
-    <format>tar.gz</format>
-    <format>dir</format>
-    <!-- format>tar.bz2</format>
-    <format>zip</format-->
+    <format>zip</format>
   </formats>
-  <dependencySets>
-    <dependencySet>
-      <includes></includes>
-      <excludes>
-        <exclude>de.ugoe.cs.autoquest:autoquest-runner</exclude>
-      </excludes>
-      <outputDirectory>lib</outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <includes>
-          <include>de.ugoe.cs.autoquest:autoquest-runner</include>
-      </includes>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-  </dependencySets>
+  <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
@@ -34,18 +17,4 @@
       </includes>
     </fileSet>
-    <!-- <fileSet>
-      <directory>target/plugins</directory>
-      <outputDirectory>plugins</outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>-->
-    <fileSet>
-      <directory>target/data</directory>
-      <outputDirectory>data</outputDirectory>
-      <excludes>
-        <exclude>META-INF/**</exclude>
-      </excludes>
-    </fileSet>
   </fileSets>
 </assembly>
