Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
===================================================================
RCS file: /cvs/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java,v
retrieving revision 1.1.4.21
diff -u -r1.1.4.21 AppClientProjectGenerator.java
--- j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java	28 Sep 2006 23:09:49 -0000	1.1.4.21
+++ j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java	29 May 2007 16:48:45 -0000
@@ -43,6 +43,7 @@
 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
+import org.netbeans.modules.websvc.api.client.WebServicesClientConstants;
 import org.netbeans.modules.websvc.spi.webservices.WebServicesConstants;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
 import org.netbeans.spi.project.support.ant.EditableProperties;
@@ -453,6 +454,13 @@
         if (j2eePlatform.isToolSupported(J2eePlatform.TOOL_WSCOMPILE)) {
             File[] wsClasspath = j2eePlatform.getToolClasspathEntries(J2eePlatform.TOOL_WSCOMPILE);
             ep.setProperty(WebServicesConstants.J2EE_PLATFORM_WSCOMPILE_CLASSPATH,
+                    Utils.toClasspathString(wsClasspath));
+        }
+        
+        // set j2ee.platform.wsimport.classpath
+        if (j2eePlatform.isToolSupported(J2eePlatform.TOOL_WSIMPORT)) { 
+            File[] wsClasspath = j2eePlatform.getToolClasspathEntries(J2eePlatform.TOOL_WSIMPORT);
+            ep.setProperty(WebServicesConstants.J2EE_PLATFORM_WSIMPORT_CLASSPATH, 
                     Utils.toClasspathString(wsClasspath));
         }
         
Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
===================================================================
RCS file: /cvs/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl,v
retrieving revision 1.1.4.25.8.7
diff -u -r1.1.4.25.8.7 build-impl.xsl
--- j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl	25 Apr 2007 22:52:12 -0000	1.1.4.25.8.7
+++ j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl	29 May 2007 16:48:48 -0000
@@ -567,7 +567,7 @@
                     <mkdir dir="${{build.generated.dir}}/wsimport/client"/>
                     <mkdir dir="${{build.generated.dir}}/wsimport/binaries"/>
                     <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
-                        <classpath path="${{libs.jaxws20.classpath}}"/>
+                        <classpath path="${{java.home}}/../lib/tools.jar:${{j2ee.platform.wsimport.classpath}}:${{javac.classpath}}"/>
                     </taskdef>
                 </target>
             </xsl:if>
Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
===================================================================
RCS file: /cvs/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java,v
retrieving revision 1.1.4.20
diff -u -r1.1.4.20 AppClientProjectProperties.java
--- j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java	28 Sep 2006 23:09:50 -0000	1.1.4.20
+++ j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java	29 May 2007 16:48:49 -0000
@@ -738,6 +738,15 @@
             privateProps.remove(WebServicesConstants.J2EE_PLATFORM_WSCOMPILE_CLASSPATH);
         }
         
+        // update j2ee.platform.wsimport.classpath
+        if (j2eePlatform.isToolSupported(J2eePlatform.TOOL_WSIMPORT)) { 
+            File[] wsClasspath = j2eePlatform.getToolClasspathEntries(J2eePlatform.TOOL_WSIMPORT);
+            privateProps.setProperty(WebServicesConstants.J2EE_PLATFORM_WSIMPORT_CLASSPATH, 
+                    Utils.toClasspathString(wsClasspath));
+        } else {
+            privateProps.remove(WebServicesConstants.J2EE_PLATFORM_WSIMPORT_CLASSPATH);
+        }
+        
         // update j2ee.server.type
         projectProps.setProperty(J2EE_SERVER_TYPE, Deployment.getDefault().getServerID(newServInstID));