hammant 2003/01/04 11:57:54
Modified: altrmi build.xml
altrmi/src/test/org/apache/excalibur/altrmi/test/async
SimpleAsync2TestCase.java
Log:
de hardcode my javahome directory
Revision Changes Path
1.58 +2 -3 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- build.xml 4 Jan 2003 18:46:40 -0000 1.57
+++ build.xml 4 Jan 2003 19:57:54 -0000 1.58
@@ -136,7 +136,8 @@
<target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
<mkdir dir="${build.testsrc}"/>
- <filter token="SPEEDTEST-ITERATIONS" value="${speedtest.iterations}"/>
+ <filter token="SPEEDTEST-ITERATIONS" value="${speedtest.iterations}"/>
+ <echo message="${java.home}" file="build/tests/java_home"/>
<echo>Speed Test Iterations=${speedtest.iterations}</echo>
@@ -287,8 +288,6 @@
<mkdir dir="${build.tests}"/>
<!-- Plain tests -->
-
- <echo message="hi" file="build/hi.txt"/>
<junit fork="true"
haltonfailure="${junit.failonerror}"
1.2 +18 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleAsync2TestCase.java 3 Dec 2002 00:19:57 -0000 1.1
+++ SimpleAsync2TestCase.java 4 Jan 2003 19:57:54 -0000 1.2
@@ -17,6 +17,9 @@
import junit.framework.TestCase;
import java.io.File;
+import java.io.StringReader;
+import java.io.FileReader;
+import java.io.LineNumberReader;
public class SimpleAsync2TestCase extends TestCase
{
@@ -40,7 +43,21 @@
JavacDynamicGeneratorClassRetriever cr = new
JavacDynamicGeneratorClassRetriever(
this.getClass().getClassLoader());
cr.setClassGenDir(".");
- cr.setAltrmiClasspath("..\\build\\classes;C:\\j2sdk1.4.1\\lib\\tools.jar");
+ 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();
+ if (javaHomeString.endsWith(FS+"jre"))
+ {
+ javaHome = javaHome.getParentFile();
+ }
+ System.out.println("javaHome=" + javaHome.getAbsolutePath());
+ cr.setAltrmiClasspath(".."+FS+"build"+FS+"classes"+PS+
javaHome.getAbsolutePath() +FS+"lib"+FS+"tools.jar");
cr.setSrcGenDir(".");
server.setClassRetriever(cr);
asyncTestImpl = new AsyncTestImpl();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
