Index: build-impl.xsl
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl,v
retrieving revision 1.118
retrieving revision 1.119
diff -w -r1.118 -r1.119
41a42
>     <xsl:param name="jaxwsversion"/>
660a662,664
>                 <xsl:variable name="isJSR109">
>                     <xsl:value-of select="$jaxws/jaxws:jax-ws/jaxws:jsr109"/>
>                 </xsl:variable>
667a672,720
>                         <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"
>                                             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>
>                                     <xsl:otherwise>
>                                         <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:otherwise>
>                                 </xsl:choose>
>                             </xsl:when>
>                             <xsl:otherwise> <!--For Tomcat -->
688a742,743
>                             </xsl:otherwise> 
>                         </xsl:choose>      
690a746,792
>                        <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> <!-- for Tomcat -->
710a813,814
>                        </xsl:otherwise>
>                       </xsl:choose>
733a838,840
>                         <xsl:variable name="isJSR109">
>                             <xsl:value-of select="$jaxws/jaxws:jax-ws/jaxws:jsr109"/>
>                         </xsl:variable>
734a842,890
>                             <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"
>                                                 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>
>                                         <xsl:otherwise>
>                                             <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 -->              
748c904
<                                                 <xsl:if test="position()!=1"><xsl:text>;</xsl:text></xsl:if>
---
>                                                         <xsl:if test="position()!=1"><xsl:text>, </xsl:text></xsl:if>
755a912,913
>                                 </xsl:otherwise>
>                             </xsl:choose>
757a916,962
>                             <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>  <!--Tomcat -->
770c975
<                                                 <xsl:if test="position()!=1"><xsl:text>;</xsl:text></xsl:if>
---
>                                                         <xsl:if test="position()!=1"><xsl:text>, </xsl:text></xsl:if>
777a983,984
>                                 </xsl:otherwise>
>                             </xsl:choose>