db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r798784 - /db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
Date Wed, 29 Jul 2009 05:11:07 GMT
Author: myrnavl
Date: Wed Jul 29 05:11:06 2009
New Revision: 798784

URL: http://svn.apache.org/viewvc?rev=798784&view=rev
Log:
DERBY-4305; Make changes to test harness class j9_foundation11 to support newer version of
IBM's JSR169 implementation
  merging revision 795095 from trunk

Modified:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java?rev=798784&r1=798783&r2=798784&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
Wed Jul 29 05:11:06 2009
@@ -25,7 +25,7 @@
 import java.util.Properties;
 
 /**
-  <p>This class is for IBM's J9 jdk 1.3., foundation class library; v 2.3 (weme6.1)
+  <p>This class is for IBM's J9 jdk 1.3., foundation class library; v 2.4 (weme6.2)
 
  */
 public class j9_foundation11 extends jvm {
@@ -53,7 +53,7 @@
 	{
 		String wshome = guessWSHome();
 		// note, may have to use separator instead of hardcoding the slashes...
-		setJavaCmd(wshome+"/weme6.1/bin/j9");
+		setJavaCmd(wshome+"/weme6.2/bin/j9");
 	}
 	else
 		setJavaCmd("j9");
@@ -82,7 +82,7 @@
         String srvJvm = sp.getProperty("serverJvm");
         // if we're coming in to be the server jvm for networkserver testing on j9,
         // bootcp is null, so we need to try to setup the bootclasspath from scratch
-        // for now, assume we're only interested in doing this for weme6.1_foundation, worry
about
+        // for now, assume we're only interested in doing this for weme6.2_foundation, worry
about
         // newer versions, multiple class libraries, or multiple releases later.
         sb.append(" -jcl:foun11");
 
@@ -90,12 +90,12 @@
         {
             String pathsep = System.getProperty("path.separator");
             String wshome = guessWSHome();
-            // note, assuming jclFoundation classes sit under weme6.1/lib/jclFoundation11
-            //       and that jdbc.jar sits under weme6.1/lib
+            // note, assuming jclFoundation classes sit under weme6.2/lib/jclFoundation11
+            //       and that jdbc.jar sits under weme6.2/lib
             // note, may have to switch to sep instead of hardcoding the slashes...
-            sb.append(" -Xbootclasspath/a:" + wshome + "/weme6.1/lib/jclFoundation11/classes.zip"
-                + pathsep + wshome + "/weme6.1/lib/jclFoundation11/locale.zip"
-                + pathsep + wshome + "/weme6.1/lib/jdbc.jar");
+            sb.append(" -Xbootclasspath/a:" + wshome + "/weme6.2/lib/jclFoundation11/classes.zip"
+                + pathsep + wshome + "/weme6.2/lib/jclFoundation11/locale.zip"
+                + pathsep + wshome + "/weme6.2/lib/jdbc.jar");
         } 
         else
             sb.append(" -Xbootclasspath/a:" + bootcp);



Mime
View raw message