Ensure that we apply patches to the correct directory.
diff --git a/server-webapp/pom.xml b/server-webapp/pom.xml
index 4a1cdfa..f5d7584 100644
--- a/server-webapp/pom.xml
+++ b/server-webapp/pom.xml
@@ -25,6 +25,7 @@
<version.jdoapi>3.0.1</version.jdoapi>
<forker.module>server-unix-forker</forker.module>
<util.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/util</util.dir>
+ <cmdline.dir>${util.dir}/taverna-commandline-${edition.commandline}-${version.commandline}</cmdline.dir>
</properties>
<dependencies>
@@ -719,7 +720,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${util.dir}/taverna-commandline-${version.commandline}</outputDirectory>
+ <outputDirectory>${cmdline.dir}</outputDirectory>
<resources>
<resource>
<directory>src/main/replacementscripts</directory>
@@ -744,9 +745,9 @@
</goals>
<configuration>
<executable>/bin/sh</executable>
- <workingDirectory>${util.dir}/taverna-commandline-${version.commandline}</workingDirectory>
+ <workingDirectory>${cmdline.dir}</workingDirectory>
<environmentVariables>
- <RAVEN_APPHOME>${util.dir}/taverna-commandline-${version.commandline}</RAVEN_APPHOME>
+ <RAVEN_APPHOME>${cmdline.dir}</RAVEN_APPHOME>
</environmentVariables>
<arguments>
<argument>./executeworkflow.sh</argument>
