Index: build-impl.xsl
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/resources/build-impl.xsl,v
retrieving revision 1.116
retrieving revision 1.116.6.6
diff -b -r1.116 -r1.116.6.6
111a112,138
>             <target name="-init-rest">
>                 <condition property="do.rest" value="true">
>                     <and>
>                     <istrue value="${{rest.support.on}}"/>
>                     <resourcecount when="greater" count="0">
>                         <fileset includes="**/*.java" dir="src"/>
>                     </resourcecount>
>                     </and>
>                 </condition>
>                 <condition property="file.reference.tools.jar" value="${{java.home}}/lib/tools.jar">
>                     <available type="file" file="${{java.home}}/lib/tools.jar"/>
>                 </condition>
>                 <condition property="file.reference.tools.jar" value="${{java.home}}/../lib/tools.jar">
>                     <and>
>                         <not><isset property="file.reference.tools.jar"/></not>
>                         <available type="file" file="${{java.home}}/../lib/tools.jar"/>
>                     </and>
>                 </condition>
>                 <path id="apt.classpath.id">
>                     <path path="${{libs.swdp.classpath}}"/>
>                     <pathelement location="${{file.reference.tools.jar}}"/>
>                 </path>
>                 <taskdef name="apt" classname="com.sun.tools.ws.ant.Apt">
>                     <classpath refid="apt.classpath.id"/>
>                 </taskdef>
>             </target>
>             
113c140
<                 <xsl:attribute name="depends">-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property, -do-ear-init</xsl:attribute>
---
>                 <xsl:attribute name="depends">-pre-init,-init-rest,-init-private,-init-user,-init-project,-init-macrodef-property,-do-ear-init</xsl:attribute>
993a1021,1042
>             <target name="-rest-pre-compile" if="do.rest">
>                 <mkdir dir="${{build.generated.dir}}/rest-gen"/>
>                 <apt fork="true" debug="true" verbose="false" 
>                      nocompile="false"
>                      destdir="${{build.classes.dir.real}}"
>                      sourcedestdir="${{build.generated.dir}}/rest-gen"  
>                      sourcePath="${{src.dir}}" endorseddirs="${{jaxws.endorsed.dir}}">
>                     <classpath>
>                         <path refid="apt.classpath.id"/>
>                         <path path="${{javac.classpath}}"/>
>                         <path path="${{j2ee.platform.classpath}}"/>
>                         <pathelement location="${{build.web.dir}}/WEB-INF/classes"/>
>                     </classpath>
>                     <source dir="${{src.dir}}">
>                         <include name="**/*.java"/>
>                     </source>
>                 </apt>    
>                 <copy todir="${{build.classes.dir}}">
>                     <fileset dir="${{src.dir}}" excludes="**/*.java"/>
>                 </copy>
>             </target>
> 
995c1044
<                 <xsl:attribute name="depends">init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest<xsl:if test="/p:project/p:configuration/webproject3:data/webproject3:web-service-clients/webproject3:web-service-client">,web-service-client-compile</xsl:if><xsl:if test="$jaxws/jaxws:jax-ws/jaxws:clients/jaxws:client">,wsimport-client-compile</xsl:if><xsl:if test="$jaxws/jaxws:jax-ws/jaxws:services/jaxws:service/jaxws:wsdl-url">,wsimport-service-compile</xsl:if></xsl:attribute>
---
>                 <xsl:attribute name="depends">init, deps-jar, -pre-pre-compile, -pre-compile, -rest-pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest<xsl:if test="/p:project/p:configuration/webproject3:data/webproject3:web-service-clients/webproject3:web-service-client">,web-service-client-compile</xsl:if><xsl:if test="$jaxws/jaxws:jax-ws/jaxws:clients/jaxws:client">,wsimport-client-compile</xsl:if><xsl:if test="$jaxws/jaxws:jax-ws/jaxws:services/jaxws:service/jaxws:wsdl-url">,wsimport-service-compile</xsl:if></xsl:attribute>
1542a1592,1595
>             <target name="test-restbeans" if="do.rest" depends="run-deploy,-init-display-browser">
>                 <replace file="${{restbeans.test.file}}" token="${{base.url.token}}" value="${{client.url}}"/>
>                 <nbbrowse url="${{restbeans.test.url}}"/>
>             </target>