diff -r 1d7c5ae18200 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	Fri Mar 25 01:30:14 2011 +0100
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl	Fri Mar 25 13:21:08 2011 +0100
@@ -267,7 +267,10 @@
                     -->
                     <xsl:attribute name="property">build.deploy.on.save</xsl:attribute>
                     <xsl:attribute name="else">false</xsl:attribute>
-                    <istrue value="${{j2ee.deploy.on.save}}"/>
+                    <or>
+                        <istrue value="${{j2ee.deploy.on.save}}"/>
+                        <istrue value="${{j2ee.compile.on.save}}"/>
+                    </or>
                 </condition>         
             </target>
             
@@ -969,6 +972,15 @@
         <target name="{$targetname}">
             <xsl:attribute name="depends">init</xsl:attribute>
             <xsl:attribute name="unless">no.deps</xsl:attribute>
+            <!--
+            If build.deploy.on.save is not set init-cos hasn't
+            been called so we are running the old style build.
+            -->
+            <condition>
+                <xsl:attribute name="property">build.deploy.on.save</xsl:attribute>
+                <xsl:attribute name="value">false</xsl:attribute>
+                <not><isset property="build.deploy.on.save"/></not>
+            </condition>            
             <xsl:variable name="references" select="/p:project/p:configuration/projdeps:references"/>
             <xsl:for-each select="$references/projdeps:reference[not($type) or projdeps:artifact-type = $type]">
                 <xsl:variable name="subproj" select="projdeps:foreign-project"/>
@@ -983,15 +995,6 @@
                     </xsl:choose>
                 </xsl:variable>
                 <xsl:variable name="script" select="projdeps:script"/>
-                <!--
-                If build.deploy.on.save is not set init-cos hasn't
-                been called so we are running the old style build.
-                -->
-                <condition>
-                    <xsl:attribute name="property">build.deploy.on.save</xsl:attribute>
-                    <xsl:attribute name="value">false</xsl:attribute>
-                    <not><isset property="build.deploy.on.save"/></not>
-                </condition>
                 <ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}">                   
                     <property name="dist.ear.dir" location="${{build.dir}}"/>
                     <xsl:choose>
@@ -1017,15 +1020,6 @@
                     </xsl:choose>
                 </xsl:variable>
                 <xsl:variable name="script" select="projdeps2:script"/>
-                <!--
-                If build.deploy.on.save is not set init-cos hasn't
-                been called so we are running the old style build.
-                -->
-                <condition>
-                    <xsl:attribute name="property">build.deploy.on.save</xsl:attribute>
-                    <xsl:attribute name="value">false</xsl:attribute>
-                    <not><isset property="build.deploy.on.save"/></not>
-                </condition>
                 <ant target="{$subtarget}" inheritall="false" antfile="{$script}">
                     <property name="dist.ear.dir" location="${{build.dir}}"/>
                     <xsl:for-each select="projdeps2:properties/projdeps2:property">
diff -r 1d7c5ae18200 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	Fri Mar 25 01:30:14 2011 +0100
+++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl	Fri Mar 25 13:21:08 2011 +0100
@@ -291,13 +291,17 @@
             </target>
             
             <!-- COS feature - used in run-deploy -->
+            <!-- compiler use deploy.on.save flag to fire changes -->
             <target name="-init-cos">
                 <xsl:attribute name="depends">init</xsl:attribute>
                 <xsl:attribute name="unless">deploy.on.save</xsl:attribute>
                 <condition>
                     <xsl:attribute name="property">deploy.on.save</xsl:attribute>
                     <xsl:attribute name="value">true</xsl:attribute>
-                    <istrue value="${{j2ee.deploy.on.save}}"/>
+                    <or>
+                        <istrue value="${{j2ee.deploy.on.save}}"/>
+                        <istrue value="${{j2ee.compile.on.save}}"/>
+                    </or>
                 </condition>         
             </target>
             
diff -r 1d7c5ae18200 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	Fri Mar 25 01:30:14 2011 +0100
+++ b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl	Fri Mar 25 13:21:08 2011 +0100
@@ -346,13 +346,17 @@
             </target>
             
             <!-- COS feature - used in run-deploy -->
+            <!-- compiler use deploy.on.save flag to fire changes -->
             <target name="-init-cos">
                 <xsl:attribute name="depends">init</xsl:attribute>
                 <xsl:attribute name="unless">deploy.on.save</xsl:attribute>
                 <condition>
                     <xsl:attribute name="property">deploy.on.save</xsl:attribute>
                     <xsl:attribute name="value">true</xsl:attribute>
-                    <istrue value="${{j2ee.deploy.on.save}}"/>
+                    <or>
+                        <istrue value="${{j2ee.deploy.on.save}}"/>
+                        <istrue value="${{j2ee.compile.on.save}}"/>
+                    </or>
                 </condition>            
             </target>