cvs commit: xml-axis/java/samples/addr Main.java Address.java AddressBook.java AddressBookSOAPBindingImpl.java AddressBookSOAPBindingSkeleton.java AddressBookSOAPBindingStub.java AddressBookService.java Phone.java clean.cmd clean.sh deploy.xml undeploy.xml

[du...@apache.org]

dug         01/10/12 05:19:56

  Modified:    java     build.xml
               java/samples/addr Main.java
  Removed:     java/samples/addr Address.java AddressBook.java
                        AddressBookSOAPBindingImpl.java
                        AddressBookSOAPBindingSkeleton.java
                        AddressBookSOAPBindingStub.java
                        AddressBookService.java Phone.java clean.cmd
                        clean.sh deploy.xml undeploy.xml
  Log:
  Remove the generated Addr files from cvs and rebuild them during
  the build process instead - forcing us to make sure we always use
  the latest WSDL2Java emitter code.
  
  Revision  Changes    Path
  1.48      +34 -2     xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build.xml	2001/10/11 19:15:55	1.47
  +++ build.xml	2001/10/12 12:19:56	1.48
  @@ -147,6 +147,12 @@
                 targetfile="${build.javadocs}/index.html">
         <srcfiles dir="${src.dir}" includes="**/*.java" />
       </uptodate>
  +
  +    <uptodate property="addr.uptodate" 
  +              targetfile="${samples.dir}/addr/AddressBookService.java">
  +      <srcfiles dir="${samples.dir}/addr" includes="AddressBook.wsdl" />
  +    </uptodate>
  +
     </target>
   
     <!-- =================================================================== -->
  @@ -190,7 +196,7 @@
     <!-- =================================================================== -->
     <!-- Compiles the samples                                                -->
     <!-- =================================================================== -->
  -  <target name="samples" depends="compile">
  +  <target name="samples" depends="compile,buildAddrSample">
       <javac srcdir="." destdir="${build.dest}"
              debug="${debug}">
         <classpath>
  @@ -204,6 +210,31 @@
       </javac>
     </target>
   
  +  <target name="buildAddrSample" unless="addr.uptodate">
  +    <antcall target="cleanAddr"/>
  +    <java classname="org.apache.axis.wsdl.Wsdl2java" dir="."
  +          fork="true">
  +      <arg value="-s"/>
  +      <arg value="samples\addr\AddressBook.wsdl"/>
  +      <arg value="-p"/>
  +      <arg value="samples.addr"/>
  +    </java>
  +  </target>
  +
  +  <target name="cleanAddr">
  +    <delete file="samples/addr/AddressBook.java" />
  +    <delete file="samples/addr/AddressBookService.java" />
  +    <delete file="samples/addr/AddressBookSOAPBindingImpl.java" />
  +    <delete file="samples/addr/AddressBookSOAPBindingSkeleton.java" />
  +    <delete file="samples/addr/AddressBookSOAPBindingStub.java" />
  +    <delete file="samples/addr/Address.java" />
  +    <delete file="samples/addr/AddressHolder.java" />
  +    <delete file="samples/addr/Phone.java" />
  +    <delete file="samples/addr/PhoneHolder.java" />
  +    <delete file="samples/addr/deploy.xml" />
  +    <delete file="samples/addr/undeploy.xml" />
  +  </target>
  +
     <!-- =================================================================== -->
     <!-- Compiles the JUnit testcases -->
     <!-- =================================================================== -->
  @@ -216,7 +247,7 @@
       <path refid="classpath"/>
     </path>
   
  -  <target name="buildTest" if="junit.present" depends="compile">
  +  <target name="buildTest" if="junit.present" depends="compile,samples">
       <echo message="junit package found ..."/>
   
       <!-- Tests are packaged as test.*, so source dir is main dir -->
  @@ -376,5 +407,6 @@
       <delete dir="${dist.dir}"/>
       <delete file="client-config.xml"/>
       <delete file="server-config.xml"/>
  +    <antcall target="cleanAddr"/>
     </target>
   </project>
  
  
  
  1.5       +1 -2      xml-axis/java/samples/addr/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/addr/Main.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Main.java	2001/09/25 14:31:02	1.4
  +++ Main.java	2001/10/12 12:19:56	1.5
  @@ -58,12 +58,11 @@
   package samples.addr;
   
   import java.net.*;
  -import org.apache.axis.client.ServiceClient;
   import org.apache.axis.utils.Options;
   
   
   /**
  - * This class shows how to use the ServiceClient's ability to
  + * This class shows how to use the Call object's ability to
    * become session aware.
    *
    * @author Rob Jellinghaus (robj@unrealities.com)