1.1 --- a/enterprise/openesbaddons/workflow/project/nbproject/project.xml	Thu Aug 30 12:45:13 2007 +0000
     1.2 +++ b/enterprise/openesbaddons/workflow/project/nbproject/project.xml	Fri Aug 31 03:15:24 2007 +0000
     1.3 @@ -265,7 +265,7 @@
     1.4                  <binary-origin>external/log4j-1.2.13.jar</binary-origin>
     1.5              </class-path-extension>
     1.6              <class-path-extension>
     1.7 -                <runtime-relative-path>ext/workflow/chiba.jar</runtime-relative-path>
     1.8 +                <runtime-relative-path>ext/workflow/chiba-1.0.0.jar</runtime-relative-path>
     1.9              </class-path-extension>
    1.10              <class-path-extension>
    1.11                  <runtime-relative-path>ext/xmlbeans-2.1.0/jsr173_1.0_api.jar</runtime-relative-path>

     2.1 --- a/enterprise/openesbaddons/workflow/project/src/org/netbeans/modules/workflow/project/resources/build-impl.xsl	Thu Aug 30 12:45:13 2007 +0000
     2.2 +++ b/enterprise/openesbaddons/workflow/project/src/org/netbeans/modules/workflow/project/resources/build-impl.xsl	Fri Aug 31 03:15:24 2007 +0000
     2.3 @@ -139,37 +139,45 @@
     2.4                  <path id="ant.task.classpath.models">
     2.5                      <pathelement path="${{module.install.dir}}/org-netbeans-modules-workflow-project.jar"/>
     2.6                      <pathelement path="${{module.install.dir}}/ext/workflow/anttask.jar"/> 
     2.7 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/org-netbeans-modules-xml-xam.jar"/>
     2.8 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/org-netbeans-modules-xml-schema-model.jar"/>
     2.9 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/org-netbeans-modules-xml-wsdl-model.jar"/>
    2.10 -                    <pathelement location="${{netbeans.home}}/../../platform7/lib/org-openide-util.jar"/>
    2.11 -                    <pathelement location="${{netbeans.home}}/../../platform7/modules/org-openide-loaders.jar"/>
    2.12 -                    <pathelement location="${{netbeans.home}}/../../soa1/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/>
    2.13 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/org-apache-xml-resolver.jar"/>
    2.14 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/org-netbeans-modules-xml-retriever.jar"/>
    2.15 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/ext/resolver-1_1_nb.jar"/>
    2.16 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/org-netbeans-modules-xml-xam.jar"/>
    2.17 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/org-netbeans-modules-xml-schema-model.jar"/>
    2.18 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/org-netbeans-modules-xml-wsdl-model.jar"/>
    2.19 +                    <pathelement location="${{netbeans.home}}/../platform7/lib/org-openide-util.jar"/>
    2.20 +                    <pathelement location="${{netbeans.home}}/../platform7/modules/org-openide-loaders.jar"/>
    2.21 +                    <pathelement location="${{netbeans.home}}/../soa1/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/>
    2.22 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/org-apache-xml-resolver.jar"/>
    2.23 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/org-netbeans-modules-xml-retriever.jar"/>
    2.24 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/ext/resolver-1_1_nb.jar"/>
    2.25                      <pathelement location="${{module.install.dir}}/ext/workflow/chiba-1.0.0.jar" />
    2.26 -                    <pathelement location="${{netbeans.home}}/../../soa1/modules/ext/jxpath/jxpath1.1.jar"/>
    2.27 -                    <pathelement location="${{netbeans.home}}/../../ide8/modules/ext/jxpath/xerces-2.8.0.jar"/>                
    2.28 +                    <pathelement location="${{netbeans.home}}/../soa1/modules/ext/jxpath/jxpath1.1.jar"/>
    2.29 +                    <pathelement location="${{netbeans.home}}/../ide8/modules/ext/jxpath/xerces-2.8.0.jar"/>                
    2.30                      <pathelement location="${{module.install.dir}}/ext/workflow/log4j-1.2.13.jar"/>       
    2.31                  </path>
    2.32  
    2.33          <path id="generate.jbi">
    2.34 -            <pathelement path="${{module.install.dir}}/org-netbeans-modules-workflow-project.jar"/>
    2.35 -            <pathelement path="${{module.install.dir}}/ext/workflow/anttask.jar"/> 
    2.36 -            <pathelement path="${{module.install.dir}}/ext/workflow/workflowmodel-1.0.0.jar"/>
    2.37 -            <pathelement path="${{module.install.dir}}/ext/workflow/wfse_def.jar-1.0.0.jar"/>
    2.38 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/wsdl4j-1.5.2/wsdl4j.jar" />
    2.39 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/wsdl4j-1.5.2/qname.jar" />
    2.40 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/xmlbeans-2.1.0/xbean.jar"/>
    2.41 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/xmlbeans-2.1.0/xbean_xpath.jar"/>
    2.42 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/xmlbeans-2.1.0/resolver.jar"/>
    2.43 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/xmlbeans-2.1.0/jsr173_1.0_api.jar"/>
    2.44 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/xmlbeans-2.1.0/xmlpublic.jar"/>
    2.45 -            <pathelement path="${{module.install.dir}}/ext/workflow/chiba-1.0.0.jar" />
    2.46 -            <pathelement path="${{netbeans.home}}/../soa1/modules/ext/jxpath/jxpath1.1.jar"/>
    2.47 -            <pathelement path="${{netbeans.home}}/../ide8/modules/ext/jxpath/xerces-2.8.0.jar"/>                
    2.48 -            <pathelement path="${{module.install.dir}}/ext/workflow/log4j-1.2.13.jar"/>       
    2.49 +            <pathelement path="${module.install.dir}/org-netbeans-modules-workflow-project.jar"/>
    2.50 +            <pathelement path="${module.install.dir}/ext/workflow/anttask.jar"/>
    2.51 +            <pathelement path="${module.install.dir}/ext/workflow/workflowmodel-1.0.0.jar"/>
    2.52 +            <pathelement path="${module.install.dir}/ext/workflow/wfse_def.jar-1.0.0.jar"/>
    2.53 +            <pathelement path="${netbeans.home}/../ide8/modules/org-netbeans-modules-xml-xam.jar"/>
    2.54 +            <pathelement path="${netbeans.home}/../ide8/modules/org-netbeans-modules-xml-schema-model.jar"/>
    2.55 +            <pathelement path="${netbeans.home}/../ide8/modules/org-netbeans-modules-xml-wsdl-model.jar"/>
    2.56 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/wsdl4j-1.5.2/wsdl4j.jar"/>
    2.57 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/wsdl4j-1.5.2/qname.jar"/>
    2.58 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/xmlbeans-2.1.0/xbean.jar"/>
    2.59 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/xmlbeans-2.1.0/xbean_xpath.jar"/>
    2.60 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/xmlbeans-2.1.0/resolver.jar"/>
    2.61 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/xmlbeans-2.1.0/jsr173_1.0_api.jar"/>
    2.62 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/xmlbeans-2.1.0/xmlpublic.jar"/>
    2.63 +            <pathelement path="${module.install.dir}/ext/workflow/chiba-1.0.0.jar"/>
    2.64 +            <pathelement path="${netbeans.home}/../soa1/modules/ext/jxpath/jxpath1.1.jar"/>
    2.65 +            <pathelement path="${netbeans.home}/../ide8/modules/ext/jxpath/xerces-2.8.0.jar"/>
    2.66 +            <pathelement path="${netbeans.home}/core/org-openide-filesystems.jar"/>
    2.67 +            <pathelement path="${netbeans.home}/../ide8/modules/org-netbeans-modules-xml-retriever.jar"/>
    2.68 +            <pathelement path="${netbeans.home}/../ide8/modules/org-netbeans-modules-projectapi.jar"/>
    2.69 +            <pathelement path="${netbeans.home}/lib/org-openide-util.jar"/>
    2.70 +            <pathelement path="${netbeans.home}/modules/org-openide-loaders.jar"/>
    2.71 +            <pathelement path="${module.install.dir}/ext/workflow/log4j-1.2.13.jar"/>
    2.72          </path>              
    2.73                   
    2.74              </target>
    2.75 @@ -180,7 +188,12 @@
    2.76          </taskdef>
    2.77          <taskdef name="XFormGen" classname="org.netbeans.modules.workflow.project.anttasks.IDEXFormGenerationTask">
    2.78              <classpath refid="generate.jbi"/>
    2.79 -        </taskdef>        
    2.80 +        </taskdef>
    2.81 +        
    2.82 +        <taskdef name="WFGenClientWSDL" classname="org.netbeans.modules.workflow.project.anttasks.IDEGenerateWSDLTask">
    2.83 +            <classpath refid="generate.jbi"/>
    2.84 +        </taskdef>
    2.85 +                
    2.86          </target>            
    2.87              
    2.88              <target name="init">
    2.89 @@ -397,7 +410,7 @@
    2.90          <delete file="${{build.dir}}/org-netbeans-modules-workflow-project.jar"/>
    2.91          <delete dir="${{build.dir}}/org" />
    2.92                  <replace file="${{basedir}}/${{build.dir}}/${{projectName}}_wf_client_temp.wsdl" token="DEFINITON_TARGETNAMESPACE" value="http://jbi.com.sun/wfse/wsdl/${{projectName}}_wf_client"/>
    2.93 -                <WFGenClientWSDL sourcedirectory="${{basedir}}/${{src.dir}}" builddirectory="${{basedir}}/${{build.dir}}" clientwsdl="${{basedir}}/${{build.dir}}/${{projectName}}_wf_client_temp.wsdl" projectname="${{projectName}}" classpathRef="ant.task.classpath.models" taskFlowClasspath="generate.jbi"/>
    2.94 +                <WFGenClientWSDL sourcedirectory="${{basedir}}/${{src.dir}}" builddirectory="${{basedir}}/${{build.dir}}" clientwsdl="${{basedir}}/${{build.dir}}/${{projectName}}_wf_client_temp.wsdl" projectname="${{projectName}}" />
    2.95          <delete file="${{basedir}}/${{build.dir}}/${{projectName}}_wf_client_temp.wsdl"/>
    2.96  
    2.97                  <generate-asa-artifacts