Fixes for TUSCANY-2726

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@725590 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 3 deletions

diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index b44dd16a91..202b3c3cec 100644
--- a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
@@ -131,7 +131,14 @@ public class AntGeneratorMojo extends AbstractMojo {
      * in the distribution hierarchy
      * @parameter expression="../.."
      */
-    private String pathToRootDir; 
+    private String pathToRootDir;
+    
+    /**
+     * The path to the webapp dir so that build.xml files can be generated at any level 
+     * in the distribution hierarchy
+     * @parameter expression="src/main/webapp"
+     */
+    private String pathToWebappDir;
     
     public void execute() throws MojoExecutionException {
         if ((buildDependencyFileOnly != null) &&
@@ -249,8 +256,8 @@ public class AntGeneratorMojo extends AbstractMojo {
         } else if (packaging.equals("war")) {
             
             // Build a WAR
-            pw.println("        <war destfile=\"target/" + project.getArtifactId() + ".war\" webxml=\"src/main/webapp/WEB-INF/web.xml\">");
-            pw.println("            <fileset dir=\"src/main/webapp\"/>");
+            pw.println("        <war destfile=\"target/" + project.getArtifactId() + ".war\" webxml=\"" + pathToWebappDir + "/WEB-INF/web.xml\">");
+            pw.println("            <fileset dir=\"" + pathToWebappDir + "\"/>");
             pw.println("            <lib refid=\"tuscany.jars\"/>");
             pw.println("            <lib refid=\"3rdparty.jars\"/>");
             pw.println("            <classes dir=\"target/classes\"/>");