diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
@@ -362,6 +362,7 @@
 
             <target name="-do-compile-deps">
                 <xsl:attribute name="depends">init,deps-jar,pre-pre-compile,pre-compile</xsl:attribute>
+                <xsl:attribute name="unless">directory.deployment.supported</xsl:attribute>
 
                 <xsl:for-each select="/p:project/p:configuration/ear2:data/ear2:web-module-additional-libraries/ear2:library[ear2:path-in-war]">
                     <xsl:variable name="copyto" select=" ear2:path-in-war"/>
@@ -993,6 +994,7 @@
                 </condition>
                 <ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}">                   
                     <property name="dist.ear.dir" location="${{build.dir}}"/>
+                    <property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
                     <xsl:choose>
                         <xsl:when test="$subtarget = 'jar'">
                             <property name="deploy.on.save" value="false"/>
@@ -1026,6 +1028,7 @@
                     <not><isset property="build.deploy.on.save"/></not>
                 </condition>
                 <ant target="{$subtarget}" inheritall="false" antfile="{$script}">
+                    <property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
                     <property name="dist.ear.dir" location="${{build.dir}}"/>
                     <xsl:for-each select="projdeps2:properties/projdeps2:property">
                         <property name="{@name}" value="{.}"/>
diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
--- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
@@ -252,9 +252,18 @@
                     </and>
                 </condition>
                 <condition property="no.dist.ear.dir">
+                    <or>
                     <not>
                         <isset property="dist.ear.dir"/>
                     </not>
+                        <and>
+                            <isset property="dist.ear.dir"/>
+                            <istrue value="${{directory.deployment.supported}}"/>
+                        </and>
+                    </or>
+                </condition>
+                <condition property="is.directory.deployment.supported">
+                    <istrue value="${{directory.deployment.supported}}"/>
                 </condition>
                 <property name="source.encoding" value="${{file.encoding}}"/>
                 <condition property="javadoc.encoding.used" value="${{javadoc.encoding}}">
@@ -1245,6 +1254,7 @@
             
             <target name="-do-ear-dist">
                 <xsl:attribute name="depends">init,compile,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
+                <xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
                 <dirname property="dist.jar.dir" file="${{dist.ear.jar}}"/>
                 <mkdir dir="${{dist.jar.dir}}"/>
                 <jar jarfile="${{dist.ear.jar}}" compress="${{jar.compress}}" manifest="${{build.ear.classes.dir}}/META-INF/MANIFEST.MF">
diff --git a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
--- a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
+++ b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
@@ -232,9 +232,18 @@
                     </and>
                 </condition>
                 <condition property="no.dist.ear.dir">
+                    <or>
                     <not>
                         <isset property="dist.ear.dir"/>
                     </not>
+                        <and>
+                            <isset property="dist.ear.dir"/>
+                            <istrue value="${{directory.deployment.supported}}"/>
+                        </and>
+                    </or>
+                </condition>
+                <condition property="is.directory.deployment.supported">
+                    <istrue value="${{directory.deployment.supported}}"/>
                 </condition>
                 <property name="build.web.excludes" value="${{build.classes.excludes}}"/>
                 <condition property="do.compile.jsps">
@@ -297,12 +306,6 @@
                         </or>
                     </and>
                 </condition>
-                <condition property="do.tmp.war.package">
-                    <or>
-                        <isfalse value="${{directory.deployment.supported}}"/>
-                        <isset property="dist.ear.dir"/>
-                    </or>
-                </condition>
                 
                 <property value="${{build.web.dir}}/META-INF" name="build.meta.inf.dir"/>
                 
@@ -1406,7 +1409,7 @@
 
             <target name="do-ear-dist">
                 <xsl:attribute name="depends">init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
-                <xsl:attribute name="if">do.tmp.war.package</xsl:attribute>
+                <xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
                 <dirname property="dist.jar.dir" file="${{dist.ear.war}}"/>
                 <mkdir dir="${{dist.jar.dir}}"/>
                 <jar jarfile="${{dist.ear.war}}" compress="${{jar.compress}}" manifest="${{build.web.dir}}/META-INF/MANIFEST.MF">