diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index e2b891e01..d35415525 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -34,6 +34,7 @@
${basedir}/src/test/tomcat/tomcat-context-archiva.xml
+ ${project.build.directory}/appserver-base
@@ -1388,10 +1389,10 @@
/archiva
${tomcatContextXml}
- ${project.build.directory}/appserver-base
- ${project.build.directory}/appserver-base
- ${project.build.directory}/appserver-home
- ${project.build.directory}/appserver-base/logs
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}/logs
${basedir}/target/auto-admin-creation.properties
${project.build.directory}
@@ -1418,10 +1419,10 @@
/archiva
${tomcatContextXml}
- ${project.build.directory}/appserver-base
- ${project.build.directory}/appserver-base
- ${project.build.directory}/appserver-home
- ${project.build.directory}/appserver-base/logs
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}
+ ${archivaAppServerBase}/logs
${basedir}/target/auto-admin-creation.properties
${project.build.directory}