axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/test build_functional_tests.xml
Date Tue, 11 Dec 2001 13:16:38 GMT
dims        01/12/11 05:16:38

  Modified:    java/src/org/apache/axis/utils/compiler CompilerFactory.java
                        Javac.java Jikes.java
               java/test build_functional_tests.xml
  Log:
  - Tested axis.Compiler switch for using jikes in functional-tests
  - Added code for debugging compile errors.
  
  Revision  Changes    Path
  1.2       +8 -1      xml-axis/java/src/org/apache/axis/utils/compiler/CompilerFactory.java
  
  Index: CompilerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/CompilerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompilerFactory.java	2001/12/10 22:25:53	1.1
  +++ CompilerFactory.java	2001/12/11 13:16:38	1.2
  @@ -55,17 +55,22 @@
   
   package org.apache.axis.utils.compiler;
   
  +import org.apache.log4j.Category;
  +
   /**
    * This class implements a factory to instantiate a Compiler.
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1 $ $Date: 2001/12/10 22:25:53 $
  + * @version $Revision: 1.2 $ $Date: 2001/12/11 13:16:38 $
    * @since 2.0
    */
   public class CompilerFactory {
  +    static Category category =
  +            Category.getInstance(CompilerFactory.class.getName());
           public static Compiler getCompiler()
           {
               String compilerClassName = System.getProperty("axis.Compiler");
  +            category.debug("axis.Compiler:" + compilerClassName);
               if (compilerClassName != null) {
                   try {
                       Class compilerClass = Class.forName(compilerClassName);
  @@ -75,8 +80,10 @@
                       // If something goes wrong here, should we just fall
                       // through and use the default one?
                       e.printStackTrace(System.err);
  +                    category.error(e.getLocalizedMessage(),e);
                   }
               }
  +            category.debug("Using default compiler Javac");
               Compiler compiler = new Javac();
               return compiler;
           }
  
  
  
  1.2       +4 -1      xml-axis/java/src/org/apache/axis/utils/compiler/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/Javac.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Javac.java	2001/12/10 22:25:53	1.1
  +++ Javac.java	2001/12/11 13:16:38	1.2
  @@ -73,7 +73,7 @@
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1 $ $Date: 2001/12/10 22:25:53 $
  + * @version $Revision: 1.2 $ $Date: 2001/12/11 13:16:38 $
    * @since 2.0
    */
   
  @@ -104,6 +104,7 @@
               throw new RuntimeException("No compiler found in your classpath. Make sure
you added 'tools.jar'");
           }
       }
  +    category.debug("Javac compiler class: " + (modern?MODERN_CLASS:CLASSIC_CLASS));
     }
   
     /**
  @@ -166,6 +167,7 @@
               }
               return errors;
           }
  +        category.debug(line);
           buffer.append(line);
           buffer.append('\n');
         } while (!line.endsWith("^"));
  @@ -223,6 +225,7 @@
         // each error has 3 lines
         for (int i = 0; i < 3 ; i++) {
           if ((line = input.readLine()) == null) return errors;
  +        category.debug(line);
           buffer.append(line);
           buffer.append('\n');
         }
  
  
  
  1.2       +3 -1      xml-axis/java/src/org/apache/axis/utils/compiler/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/Jikes.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Jikes.java	2001/12/10 22:25:53	1.1
  +++ Jikes.java	2001/12/11 13:16:38	1.2
  @@ -72,7 +72,7 @@
    * NOTE: inspired by the Apache Jasper implementation.
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1 $ $Date: 2001/12/10 22:25:53 $
  + * @version $Revision: 1.2 $ $Date: 2001/12/11 13:16:38 $
    * @since 2.0
    */
   
  @@ -221,6 +221,7 @@
               // first line is not space-starting
               if (line == null) line = input.readLine();
               if (line == null) return errors;
  +            category.debug(line);
               buffer.append(line);
   
               // all other space-starting lines are one error
  @@ -232,6 +233,7 @@
                   // Continuation of previous error starts with ' '
                   if (line.length() > 0 && line.charAt(0) != ' ')
                       break;
  +                category.debug(line);
                   buffer.append('\n');
                   buffer.append(line);
               }
  
  
  
  1.26      +4 -1      xml-axis/java/test/build_functional_tests.xml
  
  Index: build_functional_tests.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build_functional_tests.xml	2001/12/10 23:23:01	1.25
  +++ build_functional_tests.xml	2001/12/11 13:16:38	1.26
  @@ -56,7 +56,10 @@
     <target name="start-functional-test-http-server" if="junit.present">
       <echo message="Starting test http server."/>
       <java classname="org.apache.axis.transport.http.SimpleAxisServer" fork="yes" dir="./build">
  -      <arg line="-p ${test.functional.SimpleAxisPort}" /> <!-- arbitrary port
-->
  +        <!-- Uncomment this to use Jikes instead of Javac for compiling JWS Files  

  +        <jvmarg value="-Daxis.Compiler=org.apache.axis.utils.compiler.Jikes"/>
  +        -->
  +        <arg line="-p ${test.functional.SimpleAxisPort}" /> <!-- arbitrary port
-->
         <classpath refid="test-classpath" />
       </java>
     </target>
  
  
  

Mime
View raw message