diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties
index 4bdc9a3a..638a05cb 100644
Binary files a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties differ
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties
index 4bdc9a3a..638a05cb 100644
Binary files a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties differ
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss
index 4bdc9a3a..687af2ed 100644
Binary files a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss and b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties
index 5e3b141b..85392ff3 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties
+++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties
@@ -1,6 +1,6 @@
maven.xdoc.date=left
-maven.ejb.src=target/xdoclet/ejb
-maven.eclipse.classpath.include=target/xdoclet/ejbdoclet,src/test-cactus
+maven.ejb.src=${maven.build.dir}/xdoclet/ejb
+maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus
maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true
maven.xdoclet.ejbdoclet.utilobject.0.includeGUID=true
maven.xdoclet.ejbdoclet.dataobject.0=true
@@ -8,4 +8,4 @@ maven.xdoclet.ejbdoclet.entityfacade.0=true
maven.xdoclet.ejbdoclet.valueobject.0=true
maven.xdoclet.ejbdoclet.deploymentdescriptor.0.validateXML=true
cactus.src.mergewebxml = src/conf/cactus-web.xml
-cactus.is.ear=true
\ No newline at end of file
+cactus.is.ear=true
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties differ
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss and b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml
index ece109d8..84d32f30 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/genapp/src/plugin-resources/ejb/template-resources/build.properties.jboss b/genapp/src/plugin-resources/ejb/template-resources/build.properties.jboss
index e18ceb1f..bfc076a0 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/build.properties.jboss
+++ b/genapp/src/plugin-resources/ejb/template-resources/build.properties.jboss
@@ -6,5 +6,5 @@ maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
-maven.xdoclet.ejbdoclet.jboss.0.destDir=target/xdoclet/ejb/META-INF
-
\ No newline at end of file
+maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF
+
diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.properties b/genapp/src/plugin-resources/ejb/template-resources/project.properties
index 4d25403b..08a13904 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/project.properties
+++ b/genapp/src/plugin-resources/ejb/template-resources/project.properties
@@ -15,8 +15,8 @@
# -------------------------------------------------------------------
maven.xdoc.date=left
-maven.ejb.src=target/xdoclet/ejb
-maven.eclipse.classpath.include=target/xdoclet/ejbdoclet,src/test-cactus
+maven.ejb.src=${maven.build.dir}/xdoclet/ejb
+maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus
maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true
maven.xdoclet.ejbdoclet.utilobject.0.includeGUID=true
maven.xdoclet.ejbdoclet.dataobject.0=true
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
index 73bbfb59..d40cc6f5 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/struts/template-resources/maven.xml b/genapp/src/plugin-resources/struts/template-resources/maven.xml
index 73bbfb59..d40cc6f5 100644
--- a/genapp/src/plugin-resources/struts/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/maven.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
index 73bbfb59..d40cc6f5 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/genapp/src/plugin-resources/web/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web/template-resources/build.properties.jboss
index 936f4802..a4afe3d2 100644
Binary files a/genapp/src/plugin-resources/web/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/web/template-resources/build.properties.jboss differ
diff --git a/genapp/src/plugin-resources/web/template-resources/maven.xml b/genapp/src/plugin-resources/web/template-resources/maven.xml
index 73bbfb59..d40cc6f5 100644
--- a/genapp/src/plugin-resources/web/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/web/template-resources/maven.xml
@@ -19,7 +19,7 @@
-
+