# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /space/cvs/release551/j2ee/clientproject
# 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: src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSVersionProvider.java
*** /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSVersionProvider.java No Base Revision
--- /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSVersionProvider.java Locally New
***************
*** 1,0 ****
--- 1,69 ----
+ /*
+  * The contents of this file are subject to the terms of the Common Development
+  * and Distribution License (the License). You may not use this file except in
+  * compliance with the License.
+  *
+  * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+  * or http://www.netbeans.org/cddl.txt.
+  * 
+  * When distributing Covered Code, include this CDDL Header Notice in each file
+  * and include the License file at http://www.netbeans.org/cddl.txt.
+  * If applicable, add the following below the CDDL Header, with the fields
+  * enclosed by brackets [] replaced by your own identifying information:
+  * "Portions Copyrighted [year] [name of copyright owner]"
+  *
+  * The Original Software is NetBeans. The Initial Developer of the Original
+  * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+  * Microsystems, Inc. All Rights Reserved.
+  */
+ 
+ package org.netbeans.modules.j2ee.clientproject.wsclient;
+ 
+ import java.io.File;
+ import java.util.Map;
+ import org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties;
+ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
+ import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
+ import org.netbeans.modules.websvc.api.jaxws.project.JAXWSVersionProvider;
+ import org.netbeans.modules.websvc.api.jaxws.project.WSUtils;
+ import org.netbeans.spi.project.support.ant.AntProjectHelper;
+ 
+ /**
+  *
+  * @author rico
+  */
+ public class AppClientProjectJAXWSVersionProvider implements JAXWSVersionProvider{
+     
+     private AntProjectHelper h;
+     /** Creates a new instance of WebProjectJAXWSVersionProvider */
+     public AppClientProjectJAXWSVersionProvider(AntProjectHelper h) {
+         this.h = h;
+     }
+     
+     public String getJAXWSVersion(){
+         File appSvrRoot = null;
+         Map properties = h.getStandardPropertyEvaluator().getProperties();
+         if(properties != null){
+             String serverInstance = (String)properties.get("j2ee.server.instance"); //NOI18N
+             if(serverInstance == null){
+                 String serverType = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(AppClientProjectProperties.J2EE_SERVER_TYPE);
+                 if (serverType != null) {
+                     String[] servInstIDs = Deployment.getDefault().getInstancesOfServer(serverType);
+                     if (servInstIDs.length > 0) {
+                         serverInstance = servInstIDs[0];
+                     }
+                 }
+             }
+             if (serverInstance != null) {
+                 J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstance);
+                 if (j2eePlatform != null) {
+                     File[] roots = j2eePlatform.getPlatformRoots();
+                     if(roots != null && roots.length > 0){
+                         appSvrRoot = roots[0];
+                     }
+                 }
+             }
+         }
+         return WSUtils.getJAXWSVersion(appSvrRoot);
+     }
+ }
Index: manifest.mf
*** /space/cvs/release551/j2ee/clientproject/manifest.mf Base (1.1.4.1)
--- /space/cvs/release551/j2ee/clientproject/manifest.mf Locally Modified (Based On 1.1.4.1)
Index: src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
*** /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl Base (1.1.4.25.8.5.4.1)
--- /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl Locally Modified (Based On 1.1.4.25.8.5.4.1)
***************
*** 30,35 ****
--- 30,36 ----
      
      <xsl:param name = "jax_ws_uri">jax-ws.xml</xsl:param>
      <xsl:param name = "jaxws" select="document($jax_ws_uri)"/>
+     <xsl:param name="jaxwsversion"/>
      
      <xsl:template match="/">
          
***************
*** 585,590 ****
--- 586,593 ----
                  </target>
                  <target name="wsimport-client-{$wsname}" depends="wsimport-init,wsimport-client-check-{$wsname}" unless="wsimport-client-{$wsname}.notRequired">
                      <xsl:if test="jaxws:package-name/@forceReplace">
+                        <xsl:choose>
+                          <xsl:when test="$jaxwsversion = 'jaxws21lib'">
                          <wsimport
                              xendorsed="true"
                              extension="true"
***************
*** 598,615 ****
                                  <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
                                      <xsl:attribute name="includes">
                                          <xsl:for-each select="jaxws:binding">
!                                             <xsl:if test="position()!=1"><xsl:text>;</xsl:text></xsl:if>
                                              <xsl:value-of select="normalize-space(jaxws:file-name)"/>
                                          </xsl:for-each>
                                      </xsl:attribute>
                                  </binding>
                              </xsl:if>
                          </wsimport>
                      </xsl:if>
                      <xsl:if test="not(jaxws:package-name/@forceReplace)">
                          <wsimport
                              xendorsed="true"
--- 601,640 ----
                                  <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
                                      <xsl:attribute name="includes">
                                          <xsl:for-each select="jaxws:binding">
!                                             <xsl:if test="position()!=1"><xsl:text> ,</xsl:text></xsl:if>
                                              <xsl:value-of select="normalize-space(jaxws:file-name)"/>
                                          </xsl:for-each>
                                      </xsl:attribute>
                                  </binding>
                              </xsl:if>
                          </wsimport>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <wsimport
+                             sourcedestdir="${{build.generated.dir}}/wsimport/client"
+                             package="{$package_name}"
+                             extension="true"
+                             destdir="${{build.generated.dir}}/wsimport/binaries"
+                             wsdl="${{basedir}}/${{meta.inf}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
+                             wsdlLocation="{$wsdl_url_actual}"
+                             catalog="{$catalog}">
+                             <xsl:if test="jaxws:binding">
+                                 <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
+                                     <xsl:attribute name="includes">
+                                         <xsl:for-each select="jaxws:binding">
+                                             <xsl:if test="position()!=1"><xsl:text> ,</xsl:text></xsl:if>
+                                             <xsl:value-of select="normalize-space(jaxws:file-name)"/>
+                                         </xsl:for-each>
+                                     </xsl:attribute>
+                                 </binding>
                              </xsl:if>
+                         </wsimport> 
+                        </xsl:otherwise>
+                       </xsl:choose>
+                     </xsl:if>
                      <xsl:if test="not(jaxws:package-name/@forceReplace)">
+                       <xsl:choose>
+                          <xsl:when test="$jaxwsversion = 'jaxws21lib'">
                            <wsimport
                              xendorsed="true"
                              extension="true"
***************
*** 619,635 ****
                                  <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
                                      <xsl:attribute name="includes">
                                          <xsl:for-each select="jaxws:binding">
!                                             <xsl:if test="position()!=1"><xsl:text>;</xsl:text></xsl:if>
                                              <xsl:value-of select="normalize-space(jaxws:file-name)"/>
                                          </xsl:for-each>
                                      </xsl:attribute>
                                  </binding>
                              </xsl:if>
                          </wsimport>
                      </xsl:if>
                      <copy todir="${{classes.dir}}">
                          <fileset dir="${{build.generated.dir}}/wsimport/binaries" includes="**/*.xml"/>
--- 647,682 ----
                                  <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
                                      <xsl:attribute name="includes">
                                          <xsl:for-each select="jaxws:binding">
!                                             <xsl:if test="position()!=1"><xsl:text> ,</xsl:text></xsl:if>
                                              <xsl:value-of select="normalize-space(jaxws:file-name)"/>
                                          </xsl:for-each>
                                      </xsl:attribute>
                                  </binding>
                              </xsl:if>
                          </wsimport>
+                         </xsl:when>
+                         <xsl:otherwise>
+                            <wsimport
+                             sourcedestdir="${{build.generated.dir}}/wsimport/client"
+                             extension="true"
+                             destdir="${{build.generated.dir}}/wsimport/binaries"
+                             wsdl="${{basedir}}/${{meta.inf}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
+                             wsdlLocation="{$wsdl_url_actual}"
+                             catalog="{$catalog}">
+                             <xsl:if test="jaxws:binding">
+                                 <binding dir="${{meta.inf}}/xml-resources/web-service-references/{$wsname}/bindings">
+                                     <xsl:attribute name="includes">
+                                         <xsl:for-each select="jaxws:binding">
+                                             <xsl:if test="position()!=1"><xsl:text> ,</xsl:text></xsl:if>
+                                             <xsl:value-of select="normalize-space(jaxws:file-name)"/>
+                                         </xsl:for-each>
+                                     </xsl:attribute>
+                                 </binding>
                              </xsl:if>
+                         </wsimport>
+                         </xsl:otherwise>
+                       </xsl:choose>
+                     </xsl:if>
                      <copy todir="${{classes.dir}}">
                          <fileset dir="${{build.generated.dir}}/wsimport/binaries" includes="**/*.xml"/>
                      </copy>
Index: nbproject/project.properties
*** /space/cvs/release551/j2ee/clientproject/nbproject/project.properties Base (1.1.4.17.8.1.4.1)
--- /space/cvs/release551/j2ee/clientproject/nbproject/project.properties Locally Modified (Based On 1.1.4.17.8.1.4.1)
***************
*** 16,22 ****
  # Microsystems, Inc. All Rights Reserved.
  
  javac.compilerargs=-Xlint:unchecked
! spec.version.base=1.0.31
  javadoc.arch=${basedir}/arch.xml
  javac.source=1.5
  
--- 16,22 ----
  # Microsystems, Inc. All Rights Reserved.
  
  javac.compilerargs=-Xlint:unchecked
! spec.version.base=1.0.32
  javadoc.arch=${basedir}/arch.xml
  javac.source=1.5
  
Index: src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
*** /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java Base (1.1.4.25.8.1)
--- /space/cvs/release551/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java Locally Modified (Based On 1.1.4.25.8.1)
***************
*** 50,55 ****
--- 50,56 ----
  import org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties;
  import org.netbeans.modules.j2ee.clientproject.ui.customizer.CustomizerProviderImpl;
  import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectJAXWSClientSupport;
+ import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectJAXWSVersionProvider;
  import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesClientSupport;
  import org.netbeans.modules.j2ee.clientproject.wsclient.AppClientProjectWebServicesSupportProvider;
  import org.netbeans.modules.j2ee.common.ui.BrokenServerSupport;
***************
*** 236,241 ****
--- 237,243 ----
              this, // never cast an externally obtained Project to AppClientProject - use lookup instead
              new AppClientProjectOperations(this),
              new AppClientProjectWebServicesSupportProvider(),
+             new AppClientProjectJAXWSVersionProvider(helper),
              
              new ProjectAppClientProvider(this),
              appClient,