Index: build-impl.xsl
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl,v
retrieving revision 1.100.12.6.2.53.6.5
diff -w -r1.100.12.6.2.53.6.5 build-impl.xsl
648c648,649
<                     <xsl:if test="jaxws:package-name/@forceReplace">
---
>                     <xsl:variable name="jaxws21_var" select="$jaxwsversion = 'jaxws21lib'"/>
>                     <xsl:variable name="jsr109_var">
650,672c651,652
<                             <xsl:when test="not($isJSR109 = 'false')"> 
<                                 <xsl:choose>
<                                     <xsl:when test="$jaxwsversion = 'jaxws21lib'">  
<                                         <wsimport
<                                             xendorsed="true"
<                                             sourcedestdir="${{build.generated.dir}}/wsimport/client"
<                                             extension="true"
<                                             package="{$package_name}"
<                                             destdir="${{build.generated.dir}}/wsimport/binaries"
<                                             wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                             wsdlLocation="{$wsdl_url_actual}"
<                                             catalog="{$catalog}">
<                                             <xsl:if test="jaxws:binding">
<                                                 <binding dir="${{conf.dir}}/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 test="$isJSR109 = 'false'">
>                                 <xsl:value-of select="false()" />                 
675,693c655
<                                         <wsimport
<                                             sourcedestdir="${{build.generated.dir}}/wsimport/client"
<                                             extension="true"
<                                             package="{$package_name}"
<                                             destdir="${{build.generated.dir}}/wsimport/binaries"
<                                             wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                             wsdlLocation="{$wsdl_url_actual}"
<                                             catalog="{$catalog}">
<                                             <xsl:if test="jaxws:binding">
<                                                 <binding dir="${{conf.dir}}/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:value-of select="true()" />  
696,790c658,671
<                             </xsl:when>
<                             <xsl:otherwise> <!--For Tomcat -->
<                                 <wsimport
<                                     xendorsed="true"
<                                     sourcedestdir="${{build.generated.dir}}/wsimport/client"
<                                     extension="true"
<                                     package="{$package_name}"
<                                     destdir="${{build.generated.dir}}/wsimport/binaries"
<                                     wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                     wsdlLocation="{$wsdl_url_actual}"
<                                     catalog="{$catalog}">
<                                     <xsl:if test="jaxws:binding">
<                                         <binding dir="${{conf.dir}}/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="not($isJSR109 = 'false')"> 
<                                 <xsl:choose>
<                                     <xsl:when test="$jaxwsversion = 'jaxws21lib'">
<                                         <wsimport
<                                             xendorsed="true"
<                                             sourcedestdir="${{build.generated.dir}}/wsimport/client"
<                                             extension="true"
<                                             destdir="${{build.generated.dir}}/wsimport/binaries"
<                                             wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                             wsdlLocation="{$wsdl_url_actual}"
<                                             catalog="{$catalog}">
<                                             <xsl:if test="jaxws:binding">
<                                                 <binding dir="${{conf.dir}}/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}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                             wsdlLocation="{$wsdl_url_actual}"
<                                             catalog="{$catalog}">
<                                             <xsl:if test="jaxws:binding">
<                                                 <binding dir="${{conf.dir}}/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:when>
<                             <xsl:otherwise>
<                                 <wsimport
<                                     xendorsed="true" 
<                                     sourcedestdir="${{build.generated.dir}}/wsimport/client"
<                                     extension="true"
<                                     destdir="${{build.generated.dir}}/wsimport/binaries"
<                                     wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-service-references/{$wsname}/wsdl/{$wsdl_url}"
<                                     wsdlLocation="{$wsdl_url_actual}"
<                                     catalog="{$catalog}">
<                                     <xsl:if test="jaxws:binding">
<                                         <binding dir="${{conf.dir}}/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:variable>   
>                     <xsl:variable name="forceReplace_var" select="jaxws:package-name/@forceReplace"/> 
>                     <xsl:variable name="isService_var" select="false()"/>           
>                     <xsl:call-template name="invokeWsimport">
>                         <xsl:with-param name="isService" select="$isService_var"/>          
>                         <xsl:with-param name="forceReplace" select="$forceReplace_var"/>
>                         <xsl:with-param name="isJSR109" select="$jsr109_var"/> 
>                         <xsl:with-param name="isJaxws21" select="$jaxws21_var"/>
>                         <xsl:with-param name="packageName" select="$package_name"/>                         
>                         <xsl:with-param name="wsName" select="$wsname" />
>                         <xsl:with-param name="wsdlUrl" select="$wsdl_url"/>
>                         <xsl:with-param name="wsdlUrlActual" select="$wsdl_url_actual"/>
>                         <xsl:with-param name="Catalog" select="$catalog"/>  
>                     </xsl:call-template> 
816,818c697,698
<                         <xsl:if test="jaxws:package-name/@forceReplace">
<                             <xsl:choose>
<                                 <xsl:when test="not($isJSR109 = 'false')"> 
---
>                         <xsl:variable name="jaxws21_var" select="$jaxwsversion = 'jaxws21lib'" />
>                         <xsl:variable name="jsr109_var">
820,840c700,701
<                                         <xsl:when test="$jaxwsversion = 'jaxws21lib'">
<                                             <wsimport
<                                                 xendorsed="true"
<                                                 sourcedestdir="${{build.generated.dir}}/wsimport/service"
<                                                 extension="true"
<                                                 verbose="true"
<                                                 package="{$package_name}"
<                                                 destdir="${{build.classes.dir.real}}"
<                                                 wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                                 catalog="{$catalog}">
<                                                 <xsl:if test="jaxws:binding">
<                                                     <binding dir="${{conf.dir}}/xml-resources/web-services/{$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 test="$isJSR109 = 'false'">
>                                     <xsl:value-of select="false()" />                 
843,955c704
<                                             <wsimport  
<                                                 sourcedestdir="${{build.generated.dir}}/wsimport/service"
<                                                 extension="true"
<                                                 verbose="true"
<                                                 package="{$package_name}"
<                                                 destdir="${{build.classes.dir.real}}"
<                                                 wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                                 catalog="{$catalog}">
<                                                 <xsl:if test="jaxws:binding">
<                                                     <binding dir="${{conf.dir}}/xml-resources/web-services/{$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:when>
<                                 <xsl:otherwise> <!--for Tomcat-->
<                                     <wsimport
<                                         xendorsed="true"
<                                         sourcedestdir="${{build.generated.dir}}/wsimport/service"
<                                         extension="true"
<                                         verbose="true" 
<                                         package="{$package_name}"
<                                         destdir="${{build.classes.dir.real}}"
<                                         wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                         catalog="{$catalog}">
<                                         <xsl:if test="jaxws:binding">
<                                             <binding dir="${{conf.dir}}/xml-resources/web-services/{$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="not($isJSR109 = 'false')"> 
<                                     <xsl:choose>
<                                         <xsl:when test="$jaxwsversion = 'jaxws21lib'">
<                                             <wsimport
<                                                 xendorsed="true"
<                                                 sourcedestdir="${{build.generated.dir}}/wsimport/service"
<                                                 extension="true"
<                                                 verbose="true"
<                                                 destdir="${{build.classes.dir.real}}"
<                                                 wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                                 catalog="{$catalog}">
<                                                 <xsl:if test="jaxws:binding">
<                                                     <binding dir="${{conf.dir}}/xml-resources/web-services/{$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/service"
<                                                 extension="true"
<                                                 verbose="true"
<                                                 destdir="${{build.classes.dir.real}}"
<                                                 wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                                 catalog="{$catalog}">
<                                                 <xsl:if test="jaxws:binding">
<                                                     <binding dir="${{conf.dir}}/xml-resources/web-services/{$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:when>
<                                 <xsl:otherwise>
<                                     <wsimport
<                                         xendorsed="true"
<                                         sourcedestdir="${{build.generated.dir}}/wsimport/service"
<                                         extension="true"
<                                         verbose="true"
<                                         destdir="${{build.classes.dir.real}}"
<                                         wsdl="${{basedir}}/${{conf.dir}}/xml-resources/web-services/{$wsname}/wsdl/{$wsdl_url}"
<                                         catalog="{$catalog}">
<                                         <xsl:if test="jaxws:binding">
<                                             <binding dir="${{conf.dir}}/xml-resources/web-services/{$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:value-of select="true()" />  
958c707,719
<                         </xsl:if>    
---
>                         </xsl:variable>
>                         <xsl:variable name="forceReplace_var" select="jaxws:package-name/@forceReplace" /> 
>                         <xsl:variable name="isService_var" select="true()"/>     
>                         <xsl:call-template name="invokeWsimport">
>                             <xsl:with-param name="isService" select="$isService_var"/>          
>                             <xsl:with-param name="forceReplace" select="$forceReplace_var"/>
>                             <xsl:with-param name="isJSR109" select="$jsr109_var"/> 
>                             <xsl:with-param name="isJaxws21" select="$jaxws21_var"/>
>                             <xsl:with-param name="packageName" select="$package_name"/>                         
>                             <xsl:with-param name="wsName" select="$wsname" />
>                             <xsl:with-param name="wsdlUrl" select="$wsdl_url"/>
>                             <xsl:with-param name="Catalog" select="$catalog"/>  
>                         </xsl:call-template>  
2366a2128,2198
>     
>     <xsl:template name="invokeWsimport">
>         <xsl:param name="isJaxws21" />
>         <xsl:param name="forceReplace"/>
>         <xsl:param name="packageName"/>
>         <xsl:param name="isJSR109"/>
>         <xsl:param name="isService" />
>         <xsl:param name="wsName" />
>         <xsl:param name="wsdlUrl"/>
>         <xsl:param name="wsdlUrlActual"/>
>         <xsl:param name="Catalog"/>
>         <wsimport>
>             <xsl:if test="$isJaxws21 or $isJSR109 = 'false'">
>                 <xsl:attribute name="xendorsed">true</xsl:attribute>  
>             </xsl:if>
>             <xsl:if test="$forceReplace">
>                 <xsl:attribute name="package"><xsl:value-of select="$packageName"/></xsl:attribute>
>             </xsl:if>
>             <xsl:variable name="wsType">
>                 <xsl:choose>
>                     <xsl:when test="$isService">
>                         <xsl:text>service</xsl:text>
>                     </xsl:when>
>                     <xsl:otherwise>
>                         <xsl:text>client</xsl:text>
>                     </xsl:otherwise>    
>                 </xsl:choose>     
>             </xsl:variable>
>             <xsl:attribute name="verbose">true</xsl:attribute> 
>             <xsl:attribute name="sourcedestdir">${build.generated.dir}/wsimport/<xsl:value-of select="$wsType"/></xsl:attribute>
>             <xsl:attribute name="extension">true</xsl:attribute>
>             <xsl:variable name="destination" >
>                 <xsl:choose>
>                     <xsl:when test="$isService">
>                         <xsl:text>${build.classes.dir.real}</xsl:text>               
>                     </xsl:when>
>                     <xsl:otherwise>
>                         <xsl:text>${build.generated.dir}/wsimport/binaries</xsl:text> 
>                     </xsl:otherwise>
>                 </xsl:choose>
>             </xsl:variable>
>             <xsl:attribute name="destdir"><xsl:value-of select="$destination" /></xsl:attribute>
>             <xsl:variable name="wsDir">
>                 <xsl:choose>
>                     <xsl:when test="$isService">
>                         <xsl:text>web-services</xsl:text>               
>                     </xsl:when>
>                     <xsl:otherwise>
>                         <xsl:text>web-service-references</xsl:text> 
>                     </xsl:otherwise>
>                 </xsl:choose>  
>             </xsl:variable>
>             <xsl:attribute name="wsdl">${basedir}/${conf.dir}/xml-resources/<xsl:value-of select="$wsDir"/>/<xsl:value-of select="$wsName"/>/wsdl/<xsl:value-of select="$wsdlUrl"/></xsl:attribute>
>             <xsl:if test="not($isService)">
>                 <xsl:attribute name="wsdlLocation"><xsl:value-of select="$wsdlUrlActual" /></xsl:attribute>
>             </xsl:if> 
>             <xsl:attribute name="catalog"><xsl:value-of select="$Catalog" /></xsl:attribute>
>             
>             <xsl:if test="jaxws:binding">
>                 <binding>
>                     <xsl:attribute name="dir">${conf.dir}/xml-resources/<xsl:value-of select="$wsDir"/>/<xsl:value-of select="$wsName"/>/bindings</xsl:attribute>
>                     <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>ro
>                 </binding>
>             </xsl:if>
>         </wsimport>
>     </xsl:template>