cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl Wsdl2javaAntTask.java

[st...@apache.org]

stevel      2004/07/23 04:46:40

  Modified:    java/tools build.xml
               java/tools/org/apache/axis/tools/ant/wsdl
                        Wsdl2javaAntTask.java
  Added:       java/tools log4j.properties
  Log:
  1. adding a properties file to the tasks jar, so that the tasks stop complaining about not being configured. I still see those complaints though.
  
  2. fix wsdl2java so that even when stack trace is off, you get the text of the error thrown in the build exception.
  
  3. build file tuning; clean target really cleans, we copy everything in to place before making the JAR. This makes it easier to examine the contents of the jar.
  
  Incidentally, why are bsf.jar and js.jar in the source tree of the tools here?
  
  Revision  Changes    Path
  1.19      +14 -10    ws-axis/java/tools/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	2 Jun 2004 17:05:22 -0000	1.18
  +++ build.xml	23 Jul 2004 11:46:40 -0000	1.19
  @@ -1,9 +1,9 @@
   <?xml version="1.0" ?>
   <!DOCTYPE project [
  -        <!ENTITY properties SYSTEM "file:../xmls/properties.xml">
  -        <!ENTITY paths  SYSTEM "file:../xmls/path_refs.xml">
  -        <!ENTITY taskdefs SYSTEM "file:../xmls/taskdefs.xml">
  -        <!ENTITY targets SYSTEM "file:../xmls/targets.xml">
  +        <!ENTITY properties SYSTEM "../xmls/properties.xml">
  +        <!ENTITY paths  SYSTEM "../xmls/path_refs.xml">
  +        <!ENTITY taskdefs SYSTEM "../xmls/taskdefs.xml">
  +        <!ENTITY targets SYSTEM "../xmls/targets.xml">
   ]>
   
   <!-- ===================================================================
  @@ -98,18 +98,22 @@
       <include name="${componentName}/wsdl/*.java" />
     </javac>
   
  -  <copy todir="${build.dir}/tools/${componentName}/foreach" >
  +  <copy todir="${tools.build.dir}/${componentName}/foreach" >
        <fileset dir="${tools.dir}/${componentName}/foreach" excludes="**/*.java"/>
     </copy>
   
  +  <copy todir="${tools.build.dir}" >
  +    <fileset dir="${tools.dir}"
  +      includes="*-tasks.properties"/>
  +    <fileset dir="${tools.dir}" includes="org/**/*.xml"/>
  +    <fileset dir="${tools.dir}" file="log4j.properties"/>
  +  </copy>
  +  
     <tstamp/>
     <jar jarfile="${build.lib}/axis-ant.jar" >
  -    <fileset dir="${tools.build.dir}">
  -      <include name="${componentName}/**"/>
  +    <fileset dir="${tools.build.dir}"
  +      includes="**/*.class, **/*.xml, **/*.properties">
       </fileset>
  -    <fileset dir="${tools.dir}"
  -      includes="*-tasks.properties"/>
  -    <fileset dir="." file="org/apache/axis.xml"/>
       <manifest>
         <section name="org/apache/axis/tools">
           <attribute name="Implementation-Title" value="Apache Axis"/>
  
  
  
  1.1                  ws-axis/java/tools/log4j.properties
  
  Index: log4j.properties
  ===================================================================
  # Set root category priority to INFO and its only appender to CONSOLE.
  log4j.rootCategory=INFO, CONSOLE
  #log4j.rootCategory=INFO, CONSOLE, LOGFILE
  
  # Set the enterprise logger category to FATAL and its only appender to CONSOLE.
  log4j.logger.org.apache.axis.enterprise=FATAL, CONSOLE
  
  # CONSOLE is set to be a ConsoleAppender using a PatternLayout.
  log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
  log4j.appender.CONSOLE.Threshold=INFO
  log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
  log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n
  
  # LOGFILE is set to be a File appender using a PatternLayout.
  log4j.appender.LOGFILE=org.apache.log4j.FileAppender
  log4j.appender.LOGFILE.File=axis.log
  log4j.appender.LOGFILE.Append=true
  log4j.appender.LOGFILE.Threshold=INFO
  log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
  log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
  
  
  
  1.19      +3 -1      ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
  
  Index: Wsdl2javaAntTask.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Wsdl2javaAntTask.java	10 May 2004 17:25:43 -0000	1.18
  +++ Wsdl2javaAntTask.java	23 Jul 2004 11:46:40 -0000	1.19
  @@ -279,7 +279,9 @@
                   traceParams(Project.MSG_INFO);
                   t.printStackTrace();
               }
  -            throw new BuildException("Error while processing WSDL in Wsdl2javaAntTask for " + url, t);
  +            //now throw an exception that includes the error text of the caught exception.
  +            throw new BuildException("WSDL processing error for "
  +                    + url +" :\n "+t.getMessage() , t);
           }
   
       }