From: Steve L. <st...@us...> - 2004-09-02 19:13:16
|
Update of /cvsroot/smartfrog/core/components/cddlm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6156/components/cddlm Modified Files: build.xml Log Message: 1. XML fault file and XSL to create java source from it 2. Options class for setting options at the client 3. Tests that verify mustUnderstand handling works Index: build.xml =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/build.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** build.xml 1 Sep 2004 15:06:52 -0000 1.29 --- build.xml 2 Sep 2004 19:13:05 -0000 1.30 *************** *** 68,71 **** --- 68,75 ---- <property name="cddlm.xsd" location="${xsd.dir}/cddlm.xsd"/> + <property name="faults.xml.dir" + location="${xsd.dir}/faults"/> + <property name="faults.xml" location="${faults.xml.dir}/faults.xml"/> + <!-- declare client information --> *************** *** 77,80 **** --- 81,110 ---- <mkdir dir="${build.client.classes.dir}"/> + <!-- SOAP properties --> + <property name="deployAPIschema.xsd" + location="${xsd.dir}/deployAPI.xsd"/> + <property name="deploymentAPI.wsdl" + location="${xsd.dir}/deploymentAPI.wsdl"/> + <property name="callbackAPI.wsdl" + location="${xsd.dir}/callbackAPI.wsdl"/> + <property name="mapping.file" + location="${xsd.dir}/namespace-package-mapping.properties"/> + <property name="client.mapping.file" + location="${xsd.dir}/client-mapping.properties"/> + + <property name="soapapi.touch.file" + location="${build.dir}/soapapi-uptodate.txt"/> + + <property name="build.soap.dir" location="${build.dir}/soap"/> + <property name="build.soap.client.dir" location="${build.dir}/soap/"/> + <property name="soap.server.dir" location="${build.soap.dir}/server"/> + <property name="soap.client.dir" location="${build.soap.dir}/client"/> + <property name="soap.dotnet.dir" location="${build.soap.dir}/dotnet"/> + + <mkdir dir="${build.soap.dir}"/> + <mkdir dir="${soap.server.dir}"/> + <mkdir dir="${soap.client.dir}"/> + <mkdir dir="${soap.dotnet.dir}"/> + </target> *************** *** 230,248 **** <target name="init-soap" depends="init,init-deploy-properties,import-axis-tasks,init-proxy"> - <!-- SOAP properties --> - <property name="deploymentAPI.wsdl" - location="${xsd.dir}/deploymentAPI.wsdl"/> - <property name="callbackAPI.wsdl" - location="${xsd.dir}/callbackAPI.wsdl"/> - <property name="mapping.file" - location="${xsd.dir}/namespace-package-mapping.properties"/> - <property name="client.mapping.file" - location="${xsd.dir}/client-mapping.properties"/> - - <property name="soapapi.touch.file" - location="${build.dir}/soapapi-uptodate.txt"/> - - <property name="build.soap.dir" location="${build.dir}/soap"/> - <property name="build.soap.client.dir" location="${build.dir}/soap/"/> <property name="soapapi.touch.file" --- 260,263 ---- *************** *** 250,265 **** <property name="soapapi.client.touch.file" location="${build.soap.dir}/soapapi.client-uptodate.txt"/> - <property name="soap.server.dir" location="${build.soap.dir}/server"/> - <property name="soap.client.dir" location="${build.soap.dir}/client"/> - - <property name="soap.dotnet.dir" location="${build.soap.dir}/dotnet"/> <property name="soap.dotnet.proxy.class" location="${soap.dotnet.dir}/deployProxy.cs"/> - <mkdir dir="${build.soap.dir}"/> - <mkdir dir="${soap.server.dir}"/> - <mkdir dir="${soap.client.dir}"/> - <mkdir dir="${soap.dotnet.dir}"/> - <sf-tourl property="deploymentAPI.wsdl.url" file="${deploymentAPI.wsdl}"/> <sf-tourl property="callbackAPI.wsdl.url" file="${callbackAPI.wsdl}"/> --- 265,271 ---- *************** *** 436,440 **** <!-- ========================================================== --> <target name="compile" ! depends="pre-compile,server-wsdl"> <depend srcdir="${src.dir}" destdir="${build.classes.dir}" --- 442,446 ---- <!-- ========================================================== --> <target name="compile" ! depends="pre-compile,server-wsdl,xml-javafaults"> <depend srcdir="${src.dir}" destdir="${build.classes.dir}" *************** *** 554,557 **** --- 560,582 ---- </target> + <target name="xml-validate" description="validate the XML against the DTD" + depends="init"> + <xmlvalidate file="${faults.xml}"> + </xmlvalidate> + </target> + <target name="xml-javafaults" depends="xml-validate"> + <!-- currently the package is hard coded into the XSL file, BTW --> + <property name="faults.package" value="org.smartfrog.services.cddlm.generated.faults"/> + <property name="faults.package.path" value="org/smartfrog/services/cddlm/generated/faults"/> + <property name="faults.generated.dir" location="${soap.server.dir}/${faults.package.path}"/> + <mkdir dir="${faults.generated.dir}"/> + <property name="generated.faults.java" + location="${soap.server.dir}/${faults.package.path}/FaultCodes.java"/> + <xslt in="${faults.xml}" + out="${generated.faults.java}" + style="${faults.xml.dir}/createJavaFaults.xsl"> + <param name="package" expression="${faults.package}"/> + </xslt> + </target> </project> |