svn commit: r356492 - in /db/derby/code/trunk/java: client/org/apache/derby/client/ClientPooledConnection40.java testing/org/apache/derbyTesting/functionTests/harness/ibm15.java

[fu...@apache.org]

Author: fuzzylogic
Date: Mon Dec 12 23:00:53 2005
New Revision: 356492

URL: http://svn.apache.org/viewcvs?rev=356492&view=rev
Log:
Add ibm15 class to the test harness.

Committed for Rajesh Kartha <ka...@source-zone.org>

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java
Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java?rev=356492&r1=356491&r2=356492&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java Mon Dec 12 23:00:53 2005
@@ -20,7 +20,6 @@
 
 package org.apache.derby.client;
 import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.net.NetLogWriter;
 import org.apache.derby.jdbc.ClientDataSource;
 import javax.sql.StatementEventListener;
 

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java?rev=356492&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java Mon Dec 12 23:00:53 2005
@@ -0,0 +1,98 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.harness.ibm15
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+/**
+  <p>This class is for IBM's jdk 1.5.
+
+  @author ames
+ */
+public class ibm15 extends jvm {
+
+	public String getName(){return "ibm15";}
+    public ibm15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+    long ss, long oss, long ms, long mx, String classpath, String prof,
+    boolean verify, boolean noverify, boolean nojit, Vector D) {
+        super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+		verify,noverify,nojit,D);
+    }
+    // more typical use:
+    public ibm15(String classpath, Vector D) {
+        super(classpath,D);
+    }
+    // more typical use:
+    public ibm15(long ms, long mx, String classpath, Vector D) {
+        super(ms,mx,classpath,D);
+    }
+    // actual use
+    public ibm15() { }
+
+    // return the command line to invoke this VM.  The caller then adds
+    // the class and program arguments.
+    public Vector getCommandLine()
+    {
+        StringBuffer sb = new StringBuffer();
+        Vector v = super.getCommandLine();
+        appendOtherFlags(sb);
+        String s = sb.toString();
+        StringTokenizer st = new StringTokenizer(s);
+        while (st.hasMoreTokens())
+        {
+            v.addElement(st.nextToken());
+        }
+        return v;
+	}
+
+	public void appendOtherFlags(StringBuffer sb)
+	{
+        if (noasyncgc) warn("ibm15 does not support noasyncgc");
+        if (verbosegc) sb.append(" -verbose:gc");
+        if (noclassgc) sb.append(" -Xnoclassgc");
+        if (ss>=0) warn("ibm15 does not support ss");
+        if (oss>=0) warn("ibm15 does not support oss");
+        if (ms>=0) {
+          sb.append(" -ms");
+          sb.append(ms);
+        }
+        if (mx>=0) {
+          sb.append(" -mx");
+          sb.append(mx);
+        }
+        if (classpath!=null) {
+          sb.append(" -classpath ");
+          sb.append(classpath);
+        }
+        if (prof!=null) warn("ibm15 does not support prof");
+        if (verify) warn("ibm15 does not support verify");
+        if (noverify) warn("ibm15 does not support noverify");
+        if (nojit) sb.append(" -Djava.compiler=NONE");
+        if (D != null)
+          for (int i=0; i<D.size();i++) {
+	        sb.append(" -D");
+	        sb.append((String)(D.elementAt(i)));
+          }
+    }
+	public String getDintro() { return "-D"; }
+}
+