cvs commit: jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async SimpleAsync2TestCase.java

[hammant]

hammant     2003/01/05 02:37:11

  Modified:    altrmi   build.xml
               altrmi/src/test/org/apache/excalibur/altrmi/test/async
                        SimpleAsync2TestCase.java
  Log:
  Better way to get Java_Home
  
  Revision  Changes    Path
  1.60      +5 -3      jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml 4 Jan 2003 21:31:45 -0000       1.59
  +++ build.xml 5 Jan 2003 10:37:10 -0000       1.60
  @@ -9,6 +9,9 @@
       <property file="${basedir}/default.properties"/>
       <property file="${user.home}/.ant.properties"/>
       <property file="default.properties"/>
  +    <property name="test.filter" value="*TestCase"/>
  +    
  +    
       
       <property name ="jetty.rel"    value="4.2.2"/>
   
  @@ -286,8 +289,6 @@
   
           <mkdir dir="${build.tests}"/>
   
  -        <echo message="${java.home}" file="build/tests/java_home"/>
  -
           <!-- Plain tests -->
           
           <echo message="Test For Jetty" file="build/Jetty.txt"/>        
  @@ -303,7 +304,7 @@
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
   
  -                    <include name="**/test/**/*TestCase.class"/>
  +                    <include name="**/test/**/${test.filter}.class"/>
   
   <!--
   
  @@ -331,6 +332,7 @@
   
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
  +                    <include name="**/test2/**/${test.filter}.class"/>
                       <include name="**/test2/**/*TestCase.class-"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.3       +2 -6      
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsync2TestCase.java
  
  Index: SimpleAsync2TestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsync2TestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleAsync2TestCase.java 4 Jan 2003 19:57:54 -0000       1.2
  +++ SimpleAsync2TestCase.java 5 Jan 2003 10:37:11 -0000       1.3
  @@ -46,12 +46,8 @@
           String FS = File.separator;
           String PS = File.pathSeparator;
   
  -        LineNumberReader lineNumberReader = new LineNumberReader(new 
FileReader(
  -                new File("java_home")));
  -
  -        File javaHome = new File(lineNumberReader.readLine());
  -
  -        String javaHomeString = javaHome.getAbsolutePath();
  +        String javaHomeString = System.getProperty("java.home");
  +        File javaHome = new File(javaHomeString);
           if (javaHomeString.endsWith(FS+"jre"))
           {
               javaHome = javaHome.getParentFile();
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>