# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /export/home/vbk/nbtrunk0611/web/project/src
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: org/netbeans/modules/web/project/resources/build-impl.xsl
*** /export/home/vbk/nbtrunk0611/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl Base (1.138)
--- /export/home/vbk/nbtrunk0611/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl Locally Modified (Based On 1.138)
***************
*** 202,207 ****
--- 202,224 ----
                      </and>
                  </condition>
                  <property name="source.encoding" value="${{file.encoding}}"/>
+                  <!-- used to determine the build strategy for run -->
+                  <condition property="early.war.package.with.custom.manifest">
+                      <and>
+                          <istrue value="${{war.package}}"/>
+                          <isset property="has.custom.manifest"/>
+                          <isfalse value="${{directory.deployment.supported}}"/>
+                      </and>
+                  </condition>
+                  <condition property="early.war.package.without.custom.manifest">
+                      <and>
+                          <istrue value="${{war.package}}"/>
+                          <isfalse value="${{directory.deployment.supported}}"/>
+                          <not>
+                              <isset property="has.custom.manifest"/>
+                          </not>
+                      </and>
+                  </condition>
              </target>
              
              <target name="-post-init">
***************
*** 928,933 ****
--- 945,970 ----
                  </jar>
              </target>
              
+              <!-- target to do war build, if the project is not going to be
+                   directory deployed. used by run-deploy as part of 'run' -->
+              <target name="-package-without-manifest" if="early.war.package.without.custom.manifest">
+                  <xsl:attribute name="depends">init,compile,compile-jsps,-pre-dist</xsl:attribute>
+                  <dirname property="dist.jar.dir" file="${{dist.war}}"/>
+                  <mkdir dir="${{dist.jar.dir}}"/>
+                  <jar jarfile="${{dist.war}}" compress="${{jar.compress}}">
+                      <fileset dir="${{build.web.dir.real}}"/>
+                  </jar>
+              </target>
+              
+              <target name="-package-with-manifest" if="early.war.package.with.custom.manifest">
+                  <xsl:attribute name="depends">init,compile,compile-jsps,-pre-dist</xsl:attribute>
+                  <dirname property="dist.jar.dir" file="${{dist.war}}"/>
+                  <mkdir dir="${{dist.jar.dir}}"/>
+                  <jar manifest="${{build.meta.inf.dir}}/MANIFEST.MF" jarfile="${{dist.war}}" compress="${{jar.compress}}">
+                      <fileset dir="${{build.web.dir.real}}"/>
+                  </jar>
+              </target>
+  
              <target name="do-dist">
                  <xsl:attribute name="depends">init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest</xsl:attribute>
              </target>
***************
*** 1178,1184 ****
              </target>
              
              <target name="run-deploy">
!                 <xsl:attribute name="depends">init,compile,compile-jsps,-do-compile-single-jsp,dist,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy</xsl:attribute>
              </target>
              
              <target name="-run-deploy-nb" if="netbeans.home">
--- 1215,1221 ----
              </target>
              
              <target name="run-deploy">
!                 <xsl:attribute name="depends">init,compile,compile-jsps,-do-compile-single-jsp,-package-without-manifest,-package-with-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy</xsl:attribute>
              </target>
              
              <target name="-run-deploy-nb" if="netbeans.home">
Index: org/netbeans/modules/web/project/WebActionProvider.java
*** /export/home/vbk/nbtrunk0611/web/project/src/org/netbeans/modules/web/project/WebActionProvider.java Base (1.89)
--- /export/home/vbk/nbtrunk0611/web/project/src/org/netbeans/modules/web/project/WebActionProvider.java Locally Modified (Based On 1.89)
***************
*** 86,91 ****
--- 86,94 ----
   */
  class WebActionProvider implements ActionProvider {
  
+     // property definitions
+     private static final String DIRECTORY_DEPLOYMENT_SUPPORTED = "directory.deployment.supported"; // NOI18N
+     
      // Definition of commands
      
      private static final String COMMAND_COMPILE = "compile"; //NOI18N
***************
*** 226,231 ****
--- 229,235 ----
          
          // RUN-SINGLE
          if (command.equals(COMMAND_RUN_SINGLE)) {
+             setDirectoryDeploymentProperty(p);
              FileObject[] files = findTestSources(context, false);
              if (files != null) {
                  targetNames = setupTestSingle(p, files);
***************
*** 330,335 ****
--- 334,340 ----
  
          // RUN, REDEPLOY
          } else if (command.equals(COMMAND_RUN) || command.equals (WebProjectConstants.COMMAND_REDEPLOY)) {
+             setDirectoryDeploymentProperty(p);
              FileObject[] files = findTestSources(context, false);
              if (files != null) {
                  targetNames = setupTestSingle(p, files);
***************
*** 356,361 ****
--- 361,367 ----
  
          // DEBUG-SINGLE
          } else if (command.equals(COMMAND_DEBUG_SINGLE)) {
+             setDirectoryDeploymentProperty(p);
              FileObject[] files = findTestSources(context, false);
              if (files != null) {
                  targetNames = setupDebugTestSingle(p, files);
***************
*** 457,462 ****
--- 463,469 ----
  
          //DEBUG
          } else if (command.equals (COMMAND_DEBUG)) {
+             setDirectoryDeploymentProperty(p);
              if (!isSelectedServer ()) {
                  return null;
              }
***************
*** 541,546 ****
--- 548,554 ----
              }
  
          } else if (command.equals(JavaProjectConstants.COMMAND_DEBUG_FIX)) {
+             setDirectoryDeploymentProperty(p);
              FileObject[] files = findJavaSources(context);
              String path = null;
              if (files != null) {
***************
*** 588,598 ****
--- 596,609 ----
          //TEST PART
          } else if ( command.equals( COMMAND_TEST_SINGLE ) ) {
              FileObject[] files = findTestSourcesForSources(context);
+             setDirectoryDeploymentProperty(p);
              targetNames = setupTestSingle(p, files);
          } else if ( command.equals( COMMAND_DEBUG_TEST_SINGLE ) ) {
              FileObject[] files = findTestSourcesForSources(context);
+             setDirectoryDeploymentProperty(p);
              targetNames = setupDebugTestSingle(p, files);
          } else if ( command.equals( RestSupport.COMMAND_TEST_RESTBEANS ) ) {
+             setDirectoryDeploymentProperty(p);
              setupTestRestBeans(p);
          } else {
              if (targetNames == null) {
***************
*** 1142,1152 ****
          return null;
      }
  
      
-     
-     
  }
--- 1153,1175 ----
          return null;
      }
  
+     private void setDirectoryDeploymentProperty(Properties p) {
+          String instance = updateHelper.getAntProjectHelper().getStandardPropertyEvaluator ().getProperty (WebProjectProperties.J2EE_SERVER_INSTANCE);
+          if (instance != null) {
+              J2eeModuleProvider jmp = (J2eeModuleProvider)project.getLookup().lookup(J2eeModuleProvider.class);
+              String sdi = jmp.getServerInstanceID();
+              J2eeModule mod = jmp.getJ2eeModule();
+              if (sdi != null && mod != null) {
+                  boolean cFD = Deployment.getDefault().canFileDeploy(instance, mod);
+                  if (cFD) {
+                      p.setProperty(DIRECTORY_DEPLOYMENT_SUPPORTED, ""+cFD);     // NOI18N
+                  }
+              }
+          }
+      }
       
  }