1.1 --- a/visualweb.websvcmgr/release/ws_import_compile.xml	Wed Jun 27 18:56:31 2007 +0000
     1.2 +++ b/visualweb.websvcmgr/release/ws_import_compile.xml	Wed Jun 27 20:25:24 2007 +0000
     1.3 @@ -109,7 +109,8 @@
     1.4                 debug="on" source="1.5" fork="true">
     1.5              <compilerarg value="-Djava.endorsed.dirs=${jaxws.endorsed.dir}"/>
     1.6          </javac>
     1.7 -        <delete failonerror="false" dir="${jaxws.base}/../catalog"/>
     1.8 +        <dirname property="catalog.dir" file="${catalog.file}"/>
     1.9 +        <delete failonerror="false" dir="${catalog.dir}"/>
    1.10      </target>
    1.11      
    1.12      <target name="-create-proxy-jars" depends="-set-wsimport-base, -set-wscompile-base">

     2.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/Bundle.properties	Wed Jun 27 18:56:31 2007 +0000
     2.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/Bundle.properties	Wed Jun 27 20:25:24 2007 +0000
     2.3 @@ -23,5 +23,6 @@
     2.4  
     2.5  WebServiceModuleInstaller.msg.installdir_notfound=Can not find installation properties to retrieve application server port information!  Web Service endpoint ports will be incorrect
     2.6  WS_MODELER_ERROR=There was an error generating the JAX-WS model for the specified web service.  Cause:
     2.7 +WSDL_COPY_ERROR=There was an error retrieving the WSDL file.
     2.8  WSDL_ALREADY_EXISTS_ERROR=The specified WSDL file already exists.  Use a local copy with a unique file name to create a client for this web service.
     2.9  WS_ALREADY_EXISTS_ERROR=Another web service with the same name already exists:
    2.10 \ No newline at end of file

     3.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImpl.java	Wed Jun 27 18:56:31 2007 +0000
     3.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImpl.java	Wed Jun 27 20:25:24 2007 +0000
     3.3 @@ -40,6 +40,7 @@
     3.4  import org.apache.tools.ant.module.api.support.ActionUtils;
     3.5  import org.netbeans.modules.visualweb.websvcmgr.WebServiceDescriptor;
     3.6  import org.netbeans.modules.visualweb.websvcmgr.WebServiceDescriptor.JarEntry;
     3.7 +import org.netbeans.modules.visualweb.websvcmgr.WebServiceManager;
     3.8  import org.netbeans.modules.visualweb.websvcmgr.WebServiceManagerExt;
     3.9  import org.netbeans.modules.visualweb.websvcmgr.codegen.DataProviderBeanInfoWriter;
    3.10  import org.netbeans.modules.visualweb.websvcmgr.codegen.DataProviderDesignInfoWriter;
    3.11 @@ -79,7 +80,6 @@
    3.12      private static File wsImportCompileScript;
    3.13      
    3.14      private final String userDir = System.getProperty("netbeans.user");
    3.15 -    private final String websvcHome = userDir + "/websvc";
    3.16      
    3.17      public DesignerWebServiceExtImpl() {
    3.18      }
    3.19 @@ -160,7 +160,7 @@
    3.20          
    3.21          Properties properties = new Properties();
    3.22          
    3.23 -        properties.put(WEBSVC_HOME_PROP, websvcHome);
    3.24 +        properties.put(WEBSVC_HOME_PROP, WebServiceManager.WEBSVC_HOME);
    3.25          // INFO - This build properties file contains the classpath information
    3.26          // about all the library reference in the IDE
    3.27          properties.put(USER_FILE_PROP, userDir+"/build.properties");