diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index 61adc53a..e3d93171 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -26,6 +26,9 @@
       <j:set var="maven.mode.online" value="true" />
     </j:if>
 
+    <j:set var="factory"
+      value="${pom.getPluginContext('maven-changelog-plugin').getVariable('maven.changelog.factory')}"/>
+
     <j:choose>
       <j:when test="${maven.mode.online}">
         <j:set var="_connection">${pom.repository.connection}</j:set>
@@ -47,7 +50,7 @@
             <changelog:changelog
               basedir="${basedir}"
               developers="${pom.developers}"
-              factory="${maven.changelog.factory}"
+              factory="${factory}"
               output="${maven.build.dir}/changelog.xml"
               outputEncoding="${maven.docs.outputencoding}"
               range="${maven.activitylog.range}"
diff --git a/file-activity/plugin.properties b/file-activity/plugin.properties
index 03ede927..25b03fbe 100644
--- a/file-activity/plugin.properties
+++ b/file-activity/plugin.properties
@@ -4,11 +4,8 @@
 # Activity log plugin.
 # -------------------------------------------------------------------
 
-maven.src.dir = ${basedir}/src
 maven.build.dir = ${basedir}/target
 
-maven.docs.dest = ${maven.build.dir}/docs
 maven.docs.outputencoding = ISO-8859-1
 
 maven.activitylog.range = 30
-maven.changelog.factory = org.apache.maven.cvslib.CvsChangeLogFactory
diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly
index ea32c606..266a0d15 100644
--- a/j2ee/plugin.jelly
+++ b/j2ee/plugin.jelly
@@ -23,8 +23,11 @@
         <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
       </classpath>
     </taskdef>
+    
+    <j:set var="warBuildDir"
+      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
 
-    <warvalidator warFileName="${maven.war.build.dir}/${pom.artifactId}.war">
+    <warvalidator warFileName="${warBuildDir}/${pom.artifactId}.war">
       <formatter type="plain" usefile="false"/>
     </warvalidator>
   </goal>
@@ -36,8 +39,11 @@
     description="Create an EAR file from the project">
 
     <echo>Building EAR ${pom.artifactId}</echo>
-    <mkdir dir="${maven.war.build.dir}" />
-    <ear earfile="${maven.war.build.dir}/${pom.artifactId}.ear"
+    <j:set var="warBuildDir"
+      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
+
+    <mkdir dir="${warBuildDir}" />
+    <ear earfile="${warBuildDir}/${pom.artifactId}.ear"
          appxml="${maven.j2ee.ear.appxml}">
 
       <!-- include the actual project files -->