You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/10/21 10:29:59 UTC

svn commit: r827952 [4/7] - in /incubator/kato/branches/experimental/thirdview/org.apache.kato: kato.api/src/main/java/javax/tools/diagnostics/ kato.api/src/main/java/javax/tools/diagnostics/image/ kato.api/src/main/java/javax/tools/diagnostics/runtime...

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getChar.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -39,8 +39,8 @@
 	float floatValue = (float)5.0;
 	double doubleValue = (double)6;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -48,8 +48,8 @@
 	}
 	
 	public void testMaxCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxCharField = getJavaField(thisJavaObject, "maxChar");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxCharField = getJavaField(thisJavaObject, "maxChar");
 		
 		char maxCharValue = maxCharField.getChar(thisJavaObject);
 		
@@ -57,8 +57,8 @@
 	}
 	
 	public void testMinCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minCharField = getJavaField(thisJavaObject, "minChar");
+		JVMObject thisJavaObject = getThis();
+		JVMField minCharField = getJavaField(thisJavaObject, "minChar");
 		
 		char minCharValue = minCharField.getChar(thisJavaObject);
 		
@@ -66,8 +66,8 @@
 	}
 
 	public void testStaticMinCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minCharField = getJavaField(thisJavaObject, "staticMinChar");
+		JVMObject thisJavaObject = getThis();
+		JVMField minCharField = getJavaField(thisJavaObject, "staticMinChar");
 		
 		char minCharValue = minCharField.getChar(null);
 		
@@ -75,8 +75,8 @@
 	}
 	
 	public void testZeroCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroCharField = getJavaField(thisJavaObject, "zeroChar");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroCharField = getJavaField(thisJavaObject, "zeroChar");
 		
 		char zeroCharValue = zeroCharField.getChar(thisJavaObject);
 		
@@ -84,8 +84,8 @@
 	}
 	
 	public void testPosCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posCharField = getJavaField(thisJavaObject, "posChar");
+		JVMObject thisJavaObject = getThis();
+		JVMField posCharField = getJavaField(thisJavaObject, "posChar");
 		
 		char posCharValue = posCharField.getChar(thisJavaObject);
 		
@@ -94,8 +94,8 @@
 
 
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			char aDoubleValue = doubleValueField.getChar(thisJavaObject);
@@ -106,8 +106,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			char aFloatValue = floatValueField.getChar(thisJavaObject);
@@ -118,8 +118,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			char aLongValue = longValueField.getChar(thisJavaObject);
@@ -130,8 +130,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			char aIntValue = intValueField.getChar(thisJavaObject);
@@ -142,8 +142,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			char aByteValue = byteValueField.getChar(thisJavaObject);
@@ -154,8 +154,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortValueField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortValueField = getJavaField(thisJavaObject, "shortValue");
 
 		try{
 			char aShortValue = shortValueField.getChar(thisJavaObject);
@@ -165,8 +165,8 @@
 		}	
 	}
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			char aBooleanValue = booleanValueField.getChar(thisJavaObject);
@@ -177,8 +177,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			char anObjectReference = objectReferenceField.getChar(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDeclaringClass.java Wed Oct 21 10:29:55 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -29,19 +29,19 @@
 	public static String staticField = new String("hope");
 	
 	public void testInstanceField() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaClass thisJavaClass = thisJavaObject.getJavaClass();
+		JVMObject thisJavaObject = getThis();
+		JVMClass thisJavaClass = thisJavaObject.getJavaClass();
 		
-		JavaField instanceFieldField = getJavaField(thisJavaClass, "instanceField");
+		JVMField instanceFieldField = getJavaField(thisJavaClass, "instanceField");
 		
 		assertEquals(thisJavaClass, instanceFieldField.getDeclaringClass());		
 	}
 	
 	public void testStaticField() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaClass thisJavaClass = thisJavaObject.getJavaClass();
+		JVMObject thisJavaObject = getThis();
+		JVMClass thisJavaClass = thisJavaObject.getJavaClass();
 		
-		JavaField staticFieldField = getJavaField(thisJavaClass, "staticField");
+		JVMField staticFieldField = getJavaField(thisJavaClass, "staticField");
 		
 		assertEquals(thisJavaClass, staticFieldField.getDeclaringClass());
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getDouble.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -41,8 +41,8 @@
 	long longValue = 0x37faf57a57fad7fal;
 
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -50,8 +50,8 @@
 	}
 	
 	public void testMaxDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxDoubleField = getJavaField(thisJavaObject, "maxDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxDoubleField = getJavaField(thisJavaObject, "maxDouble");
 		
 		double maxDoubleValue = maxDoubleField.getDouble(thisJavaObject);
 		
@@ -59,8 +59,8 @@
 	}
 	
 	public void testMinDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minDoubleField = getJavaField(thisJavaObject, "minDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField minDoubleField = getJavaField(thisJavaObject, "minDouble");
 		
 		double minDoubleValue = minDoubleField.getDouble(thisJavaObject);
 		
@@ -68,8 +68,8 @@
 	}
 
 	public void testStaticMinDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minDoubleField = getJavaField(thisJavaObject, "staticMinDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField minDoubleField = getJavaField(thisJavaObject, "staticMinDouble");
 		
 		double minDoubleValue = minDoubleField.getDouble(null);
 		
@@ -77,8 +77,8 @@
 	}
 	
 	public void testZeroDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroDoubleField = getJavaField(thisJavaObject, "zeroDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroDoubleField = getJavaField(thisJavaObject, "zeroDouble");
 		
 		double zeroDoubleValue = zeroDoubleField.getDouble(thisJavaObject);
 		
@@ -86,8 +86,8 @@
 	}
 	
 	public void testNegDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negDoubleField = getJavaField(thisJavaObject, "negDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField negDoubleField = getJavaField(thisJavaObject, "negDouble");
 		
 		double negDoubleValue = negDoubleField.getDouble(thisJavaObject);
 		
@@ -95,8 +95,8 @@
 	}	
 	
 	public void testPosDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posDoubleField = getJavaField(thisJavaObject, "posDouble");
+		JVMObject thisJavaObject = getThis();
+		JVMField posDoubleField = getJavaField(thisJavaObject, "posDouble");
 		
 		double posDoubleValue = posDoubleField.getDouble(thisJavaObject);
 		
@@ -104,8 +104,8 @@
 	}
 
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			double aFloatValue = floatValueField.getDouble(thisJavaObject);
@@ -115,8 +115,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			double aLongValue = longValueField.getDouble(thisJavaObject);
@@ -126,8 +126,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			double aIntValue = intValueField.getDouble(thisJavaObject);
@@ -137,8 +137,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			double aByteValue = byteValueField.getDouble(thisJavaObject);
@@ -148,8 +148,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			double aCharValue = charValueField.getDouble(thisJavaObject);
@@ -159,8 +159,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "shortValue");
 
 		try{
 			double aShortValue = doubleValueField.getDouble(thisJavaObject);
@@ -171,8 +171,8 @@
 
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			double aBooleanValue = booleanValueField.getDouble(thisJavaObject);
@@ -183,8 +183,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			double anObjectReference = objectReferenceField.getDouble(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getFloat.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -40,8 +40,8 @@
 	long longValue = 0x37faf57a57fad7fal;
 	double doubleValue = (double)6;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -49,8 +49,8 @@
 	}
 	
 	public void testMaxFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxFloatField = getJavaField(thisJavaObject, "maxFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxFloatField = getJavaField(thisJavaObject, "maxFloat");
 		
 		float maxFloatValue = maxFloatField.getFloat(thisJavaObject);
 		
@@ -58,8 +58,8 @@
 	}
 	
 	public void testMinFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minFloatField = getJavaField(thisJavaObject, "minFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField minFloatField = getJavaField(thisJavaObject, "minFloat");
 		
 		float minFloatValue = minFloatField.getFloat(thisJavaObject);
 		
@@ -67,8 +67,8 @@
 	}
 
 	public void testStaticMinFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minFloatField = getJavaField(thisJavaObject, "staticMinFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField minFloatField = getJavaField(thisJavaObject, "staticMinFloat");
 		
 		float minFloatValue = minFloatField.getFloat(null);
 		
@@ -76,8 +76,8 @@
 	}
 	
 	public void testZeroFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroFloatField = getJavaField(thisJavaObject, "zeroFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroFloatField = getJavaField(thisJavaObject, "zeroFloat");
 		
 		float zeroFloatValue = zeroFloatField.getFloat(thisJavaObject);
 		
@@ -85,8 +85,8 @@
 	}
 	
 	public void testNegFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negFloatField = getJavaField(thisJavaObject, "negFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField negFloatField = getJavaField(thisJavaObject, "negFloat");
 		
 		float negFloatValue = negFloatField.getFloat(thisJavaObject);
 		
@@ -94,8 +94,8 @@
 	}	
 	
 	public void testPosFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posFloatField = getJavaField(thisJavaObject, "posFloat");
+		JVMObject thisJavaObject = getThis();
+		JVMField posFloatField = getJavaField(thisJavaObject, "posFloat");
 		
 		float posFloatValue = posFloatField.getFloat(thisJavaObject);
 		
@@ -104,8 +104,8 @@
 
 
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			float aDoubleValue = doubleValueField.getFloat(thisJavaObject);
@@ -116,8 +116,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			float aLongValue = longValueField.getFloat(thisJavaObject);
@@ -127,8 +127,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			float aIntValue = intValueField.getFloat(thisJavaObject);
@@ -138,8 +138,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			float aByteValue = byteValueField.getFloat(thisJavaObject);
@@ -149,8 +149,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			float aCharValue = charValueField.getFloat(thisJavaObject);
@@ -160,8 +160,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			float aShortValue = floatValueField.getFloat(thisJavaObject);
@@ -172,8 +172,8 @@
 	
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			float aBooleanValue = booleanValueField.getFloat(thisJavaObject);
@@ -184,8 +184,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			float anObjectReference = objectReferenceField.getFloat(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getInt.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -39,8 +39,8 @@
 	float floatValue = (float)5.0;
 	double doubleValue = (double)6;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -48,8 +48,8 @@
 	}
 	
 	public void testMaxIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxIntegerField = getJavaField(thisJavaObject, "maxInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxIntegerField = getJavaField(thisJavaObject, "maxInteger");
 		
 		int maxIntegerValue = maxIntegerField.getInt(thisJavaObject);
 		
@@ -57,8 +57,8 @@
 	}
 	
 	public void testMinIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minIntegerField = getJavaField(thisJavaObject, "minInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField minIntegerField = getJavaField(thisJavaObject, "minInteger");
 		
 		int minIntegerValue = minIntegerField.getInt(thisJavaObject);
 		
@@ -66,8 +66,8 @@
 	}
 
 	public void testStaticMinIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minIntegerField = getJavaField(thisJavaObject, "staticMinInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField minIntegerField = getJavaField(thisJavaObject, "staticMinInteger");
 		
 		int minIntegerValue = minIntegerField.getInt(null);
 		
@@ -75,8 +75,8 @@
 	}
 	
 	public void testZeroIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroIntegerField = getJavaField(thisJavaObject, "zeroInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroIntegerField = getJavaField(thisJavaObject, "zeroInteger");
 		
 		int zeroIntegerValue = zeroIntegerField.getInt(thisJavaObject);
 		
@@ -84,8 +84,8 @@
 	}
 	
 	public void testNegIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negIntegerField = getJavaField(thisJavaObject, "negInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField negIntegerField = getJavaField(thisJavaObject, "negInteger");
 		
 		int negIntegerValue = negIntegerField.getInt(thisJavaObject);
 		
@@ -93,8 +93,8 @@
 	}	
 	
 	public void testPosIntegerValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posIntegerField = getJavaField(thisJavaObject, "posInteger");
+		JVMObject thisJavaObject = getThis();
+		JVMField posIntegerField = getJavaField(thisJavaObject, "posInteger");
 		
 		int posIntegerValue = posIntegerField.getInt(thisJavaObject);
 		
@@ -103,8 +103,8 @@
 
 
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			int aDoubleValue = doubleValueField.getInt(thisJavaObject);
@@ -115,8 +115,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			int aFloatValue = floatValueField.getInt(thisJavaObject);
@@ -127,8 +127,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			int aLongValue = longValueField.getInt(thisJavaObject);
@@ -139,8 +139,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			int aByteValue = byteValueField.getInt(thisJavaObject);
@@ -150,8 +150,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			int aCharValue = charValueField.getInt(thisJavaObject);
@@ -161,8 +161,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortValueField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortValueField = getJavaField(thisJavaObject, "shortValue");
 
 		try{
 			int aShortValue = shortValueField.getInt(thisJavaObject);
@@ -172,8 +172,8 @@
 	}
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			int aBooleanValue = booleanValueField.getInt(thisJavaObject);
@@ -184,8 +184,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			int anObjectReference = objectReferenceField.getInt(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getLong.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -39,8 +39,8 @@
 	float floatValue = (float)5.0;
 	double doubleValue = (double)6;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -48,8 +48,8 @@
 	}
 	
 	public void testMaxLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxLongField = getJavaField(thisJavaObject, "maxLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxLongField = getJavaField(thisJavaObject, "maxLong");
 		
 		long maxLongValue = maxLongField.getLong(thisJavaObject);
 		
@@ -57,8 +57,8 @@
 	}
 	
 	public void testMinLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minLongField = getJavaField(thisJavaObject, "minLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField minLongField = getJavaField(thisJavaObject, "minLong");
 		
 		long minLongValue = minLongField.getLong(thisJavaObject);
 		
@@ -66,8 +66,8 @@
 	}
 
 	public void testStaticMinLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minLongField = getJavaField(thisJavaObject, "staticMinLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField minLongField = getJavaField(thisJavaObject, "staticMinLong");
 		
 		long minLongValue = minLongField.getLong(null);
 		
@@ -75,8 +75,8 @@
 	}
 	
 	public void testZeroLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroLongField = getJavaField(thisJavaObject, "zeroLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroLongField = getJavaField(thisJavaObject, "zeroLong");
 		
 		long zeroLongValue = zeroLongField.getLong(thisJavaObject);
 		
@@ -84,8 +84,8 @@
 	}
 	
 	public void testNegLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negLongField = getJavaField(thisJavaObject, "negLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField negLongField = getJavaField(thisJavaObject, "negLong");
 		
 		long negLongValue = negLongField.getLong(thisJavaObject);
 		
@@ -93,8 +93,8 @@
 	}	
 	
 	public void testPosLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posLongField = getJavaField(thisJavaObject, "posLong");
+		JVMObject thisJavaObject = getThis();
+		JVMField posLongField = getJavaField(thisJavaObject, "posLong");
 		
 		long posLongValue = posLongField.getLong(thisJavaObject);
 		
@@ -102,8 +102,8 @@
 	}
 
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			long aDoubleValue = doubleValueField.getLong(thisJavaObject);
@@ -114,8 +114,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			long aFloatValue = floatValueField.getLong(thisJavaObject);
@@ -126,8 +126,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			long aIntValue = intValueField.getLong(thisJavaObject);
@@ -137,8 +137,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			long aByteValue = byteValueField.getLong(thisJavaObject);
@@ -148,8 +148,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			long aCharValue = charValueField.getLong(thisJavaObject);
@@ -159,8 +159,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortValueField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortValueField = getJavaField(thisJavaObject, "shortValue");
 
 		try{
 			long aShortValue = shortValueField.getLong(thisJavaObject);
@@ -170,8 +170,8 @@
 	}
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			long aBooleanValue = booleanValueField.getLong(thisJavaObject);
@@ -182,8 +182,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			long anObjectReference = objectReferenceField.getLong(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getModifiers.java Wed Oct 21 10:29:55 2009
@@ -15,8 +15,8 @@
 
 import java.lang.reflect.Modifier;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -34,8 +34,8 @@
 	static private volatile transient byte staticPrivateVolatileTransientField = 23;
 	final protected int finalProtectedField = 74;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -44,52 +44,52 @@
 	}
 
 	public void testFinalField() throws Exception {
-		JavaField field = getJavaField(getThis(), "finalField");
+		JVMField field = getJavaField(getThis(), "finalField");
 		assertEquals(Modifier.FINAL, field.getModifiers() & 0xFF);
 	}
 	
 	public void testPrivateField() throws Exception {
-		JavaField field = getJavaField(getThis(), "privateField");
+		JVMField field = getJavaField(getThis(), "privateField");
 		assertEquals(Modifier.PRIVATE, field.getModifiers() & 0xFF);
 	}	
 	
 	public void testProtectedField() throws Exception {
-		JavaField field = getJavaField(getThis(), "protectedField");
+		JVMField field = getJavaField(getThis(), "protectedField");
 		assertEquals(Modifier.PROTECTED, field.getModifiers() & 0xFF);
 	}
 	
 	public void testPublicField() throws Exception {
-		JavaField field = getJavaField(getThis(), "publicField");
+		JVMField field = getJavaField(getThis(), "publicField");
 		assertEquals(Modifier.PUBLIC, field.getModifiers() & 0xFF);
 	}
 	
 	public void testStaticField() throws Exception {
-		JavaField field = getJavaField(getThis(), "staticField");
+		JVMField field = getJavaField(getThis(), "staticField");
 		assertEquals(Modifier.STATIC, field.getModifiers() & 0xFF);
 	}
 	
 	public void testTransientField() throws Exception {
-		JavaField field = getJavaField(getThis(), "transientField");
+		JVMField field = getJavaField(getThis(), "transientField");
 		assertEquals(Modifier.TRANSIENT, field.getModifiers() & 0xFF);
 	}
 	
 	public void testVolatileField() throws Exception {
-		JavaField field = getJavaField(getThis(), "volatileField");
+		JVMField field = getJavaField(getThis(), "volatileField");
 		assertEquals(Modifier.VOLATILE, field.getModifiers() & 0xFF);
 	}
 	
 	public void testDefaultField() throws Exception {
-		JavaField field = getJavaField(getThis(), "defaultField");
+		JVMField field = getJavaField(getThis(), "defaultField");
 		assertEquals(0, field.getModifiers() & 0xFF);
 	}
 	
 	public void testStaticPrivateVolatileTransientField() throws Exception {
-		JavaField field = getJavaField(getThis(), "staticPrivateVolatileTransientField");
+		JVMField field = getJavaField(getThis(), "staticPrivateVolatileTransientField");
 		assertEquals(Modifier.STATIC| Modifier.PRIVATE| Modifier.VOLATILE| Modifier.TRANSIENT
 				, field.getModifiers() & 0xFF);
 	}
 	public void testFinalProtectedField() throws Exception {
-		JavaField field = getJavaField(getThis(), "finalProtectedField");
+		JVMField field = getJavaField(getThis(), "finalProtectedField");
 		assertEquals( Modifier.FINAL | Modifier.PROTECTED, field.getModifiers() & 0xFF);
 	}
 	

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getName.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -26,8 +26,8 @@
 	byte thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah=47;
 	static byte thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah_static=23;
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -35,8 +35,8 @@
 	}
 	
 	public void testUnicodeName() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField unicodeField = getJavaField(thisJavaObject, "\u0412\u043e\u0434\u043a\u0430");
+		JVMObject thisJavaObject = getThis();
+		JVMField unicodeField = getJavaField(thisJavaObject, "\u0412\u043e\u0434\u043a\u0430");
 		
 		assertNotNull("Unable to find the field \u0412\u043e\u0434\u043a\u0430", unicodeField);
 		
@@ -46,8 +46,8 @@
 	}
 	
 	public void testStaticUnicodeName() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField unicodeField = getJavaField(thisJavaObject, "\u0412\u043e\u0434\u043a\u0430_static");
+		JVMObject thisJavaObject = getThis();
+		JVMField unicodeField = getJavaField(thisJavaObject, "\u0412\u043e\u0434\u043a\u0430_static");
 		
 		assertNotNull("Unable to find the field \u0412\u043e\u0434\u043a\u0430_static", unicodeField);
 		
@@ -57,8 +57,8 @@
 	}
 	
 	public void testLongName() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longField = getJavaField(thisJavaObject, "thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah");
+		JVMObject thisJavaObject = getThis();
+		JVMField longField = getJavaField(thisJavaObject, "thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah");
 		
 		assertNotNull("Unable to find the field thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah", longField);
 		
@@ -68,8 +68,8 @@
 	}
 	
 	public void testLongStaticName() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longField = getJavaField(thisJavaObject, "thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah_static");
+		JVMObject thisJavaObject = getThis();
+		JVMField longField = getJavaField(thisJavaObject, "thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah_static");
 		
 		assertNotNull("Unable to find the field thisIsAnIncrediblyLongNameBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah_static", longField);
 		

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getShort.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -39,8 +39,8 @@
 	long longValue = 4l;
 	float floatValue = (float)5.0;
 	double doubleValue = (double)6;
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -48,8 +48,8 @@
 	}
 	
 	public void testMaxShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxShortField = getJavaField(thisJavaObject, "maxShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxShortField = getJavaField(thisJavaObject, "maxShort");
 		
 		short maxShortValue = maxShortField.getShort(thisJavaObject);
 		
@@ -57,8 +57,8 @@
 	}
 	
 	public void testMinShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minShortField = getJavaField(thisJavaObject, "minShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField minShortField = getJavaField(thisJavaObject, "minShort");
 		
 		short minShortValue = minShortField.getShort(thisJavaObject);
 		
@@ -66,8 +66,8 @@
 	}
 
 	public void testStaticMinShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minShortField = getJavaField(thisJavaObject, "staticMinShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField minShortField = getJavaField(thisJavaObject, "staticMinShort");
 		
 		short minShortValue = minShortField.getShort(null);
 		
@@ -75,8 +75,8 @@
 	}
 	
 	public void testZeroShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroShortField = getJavaField(thisJavaObject, "zeroShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroShortField = getJavaField(thisJavaObject, "zeroShort");
 		
 		short zeroShortValue = zeroShortField.getShort(thisJavaObject);
 		
@@ -84,8 +84,8 @@
 	}
 	
 	public void testNegShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negShortField = getJavaField(thisJavaObject, "negShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField negShortField = getJavaField(thisJavaObject, "negShort");
 		
 		short negShortValue = negShortField.getShort(thisJavaObject);
 		
@@ -93,8 +93,8 @@
 	}	
 	
 	public void testPosShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posShortField = getJavaField(thisJavaObject, "posShort");
+		JVMObject thisJavaObject = getThis();
+		JVMField posShortField = getJavaField(thisJavaObject, "posShort");
 		
 		short posShortValue = posShortField.getShort(thisJavaObject);
 		
@@ -103,8 +103,8 @@
 
 
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			short aDoubleValue = doubleValueField.getShort(thisJavaObject);
@@ -115,8 +115,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			short aFloatValue = floatValueField.getShort(thisJavaObject);
@@ -127,8 +127,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			short aLongValue = longValueField.getShort(thisJavaObject);
@@ -139,8 +139,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			short aIntValue = intValueField.getShort(thisJavaObject);
@@ -151,8 +151,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteValueField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteValueField = getJavaField(thisJavaObject, "byteValue");
 
 		try{
 			short aByteValue = byteValueField.getShort(thisJavaObject);
@@ -162,8 +162,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			short aShortValue = charValueField.getShort(thisJavaObject);
@@ -174,8 +174,8 @@
 	}
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			short aBooleanValue = booleanValueField.getShort(thisJavaObject);
@@ -186,8 +186,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			short anObjectReference = objectReferenceField.getShort(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getSignature.java Wed Oct 21 10:29:55 2009
@@ -13,9 +13,9 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -56,8 +56,8 @@
 
 	String unicodeClassName = Class_\u0412\u043e\u0434\u043a\u0430_Value.class.getName().replace('.','/');
 
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -67,156 +67,156 @@
 
 	
 	public void testByteFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "byteField");
+		JVMField field = getJavaField(getThis(), "byteField");
 		
 		assertEquals("B", field.getSignature());
 	}
 	
 	public void testShortFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "shortField");
+		JVMField field = getJavaField(getThis(), "shortField");
 		
 		assertEquals("S", field.getSignature());
 	}
 	
 	public void testCharFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "charField");
+		JVMField field = getJavaField(getThis(), "charField");
 		
 		assertEquals("C", field.getSignature());
 	}
 	
 	public void testIntFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "intField");
+		JVMField field = getJavaField(getThis(), "intField");
 		
 		assertEquals("I", field.getSignature());
 	}
 	
 	public void testLongFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "longField");
+		JVMField field = getJavaField(getThis(), "longField");
 		
 		assertEquals("J", field.getSignature());
 	}
 	
 	public void testFloatFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "floatField");
+		JVMField field = getJavaField(getThis(), "floatField");
 		
 		assertEquals("F", field.getSignature());
 	}
 	
 	public void testDoubleFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "doubleField");
+		JVMField field = getJavaField(getThis(), "doubleField");
 		
 		assertEquals("D", field.getSignature());
 	}
 	
 	public void testObjectFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "objectField");
+		JVMField field = getJavaField(getThis(), "objectField");
 		
 		assertEquals("Ljava/lang/String;", field.getSignature());
 	}
 	
 	public void testByteArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "byteArrayArrayField");
+		JVMField field = getJavaField(getThis(), "byteArrayArrayField");
 		
 		assertEquals("[[B", field.getSignature());
 	}
 	
 	public void testShortArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "shortArrayArrayField");
+		JVMField field = getJavaField(getThis(), "shortArrayArrayField");
 		
 		assertEquals("[[S", field.getSignature());
 	}
 	
 	public void testCharArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "charArrayArrayField");
+		JVMField field = getJavaField(getThis(), "charArrayArrayField");
 		
 		assertEquals("[[C", field.getSignature());
 	}
 	
 	public void testIntArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "intArrayArrayField");
+		JVMField field = getJavaField(getThis(), "intArrayArrayField");
 		
 		assertEquals("[[I", field.getSignature());
 	}
 	
 	public void testLongArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "longArrayArrayField");
+		JVMField field = getJavaField(getThis(), "longArrayArrayField");
 		
 		assertEquals("[[J", field.getSignature());
 	}
 	
 	public void testFloatArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "floatArrayArrayField");
+		JVMField field = getJavaField(getThis(), "floatArrayArrayField");
 		
 		assertEquals("[[F", field.getSignature());
 	}
 	
 	public void testDoubleArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "doubleArrayArrayField");
+		JVMField field = getJavaField(getThis(), "doubleArrayArrayField");
 		
 		assertEquals("[[D", field.getSignature());
 	}
 	
 	public void testObjectArrayArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "objectArrayArrayField");
+		JVMField field = getJavaField(getThis(), "objectArrayArrayField");
 		
 		assertEquals("[[Ljava/lang/String;", field.getSignature());
 	}
 	
 	public void testByteArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "byteArrayField");
+		JVMField field = getJavaField(getThis(), "byteArrayField");
 		
 		assertEquals("[B", field.getSignature());
 	}
 	
 	public void testShortArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "shortArrayField");
+		JVMField field = getJavaField(getThis(), "shortArrayField");
 		
 		assertEquals("[S", field.getSignature());
 	}
 	
 	public void testCharArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "charArrayField");
+		JVMField field = getJavaField(getThis(), "charArrayField");
 		
 		assertEquals("[C", field.getSignature());
 	}
 	
 	public void testIntArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "intArrayField");
+		JVMField field = getJavaField(getThis(), "intArrayField");
 		
 		assertEquals("[I", field.getSignature());
 	}
 	
 	public void testLongArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "longArrayField");
+		JVMField field = getJavaField(getThis(), "longArrayField");
 		
 		assertEquals("[J", field.getSignature());
 	}
 	
 	public void testFloatArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "floatArrayField");
+		JVMField field = getJavaField(getThis(), "floatArrayField");
 		
 		assertEquals("[F", field.getSignature());
 	}
 	
 	public void testDoubleArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "doubleArrayField");
+		JVMField field = getJavaField(getThis(), "doubleArrayField");
 		
 		assertEquals("[D", field.getSignature());
 	}
 	
 	public void testObjectArrayFieldSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "objectArrayField");
+		JVMField field = getJavaField(getThis(), "objectArrayField");
 		
 		assertEquals("[Ljava/lang/String;", field.getSignature());
 	}
 	
 	public void testUnicodeClassSignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "unicodeClass");
+		JVMField field = getJavaField(getThis(), "unicodeClass");
 		assertEquals("L"+unicodeClassName+";", field.getSignature());
 	}
 	
 	public void testUnicodeClassArraySignature() throws Exception {
-		JavaField field = getJavaField(getThis(), "unicodeClassArray");
+		JVMField field = getJavaField(getThis(), "unicodeClassArray");
 		assertEquals("[L"+unicodeClassName+";", field.getSignature());
 	}
 }

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getString.java Wed Oct 21 10:29:55 2009
@@ -14,9 +14,9 @@
 package org.apache.kato.tck.tests.javaruntime;
 
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -49,8 +49,8 @@
 //		cp.checkpoint();
 //	}
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -62,11 +62,11 @@
 	 *  
 	 */
 	public void testLongString() throws Exception {
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 		
 		assertNotNull(thisJavaObject);		
 		
-		JavaField longStringField = getJavaField(thisJavaObject, "longString");		
+		JVMField longStringField = getJavaField(thisJavaObject, "longString");		
 		
 		assertNotNull(longStringField);
 		
@@ -76,11 +76,11 @@
 	}
 	
 	public void testEmptyString() throws Exception {
-	JavaObject thisJavaObject = getThis();
+	JVMObject thisJavaObject = getThis();
 		
 		assertNotNull(thisJavaObject);		
 		
-		JavaField emptyStringField = getJavaField(thisJavaObject, "emptyString");		
+		JVMField emptyStringField = getJavaField(thisJavaObject, "emptyString");		
 		
 		assertNotNull(emptyStringField);
 		
@@ -91,11 +91,11 @@
 	}
 	
 	public void testNullString() throws Exception {
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 
 		assertNotNull(thisJavaObject);		
 
-		JavaField nullStringField = getJavaField(thisJavaObject, "nullString");		
+		JVMField nullStringField = getJavaField(thisJavaObject, "nullString");		
 
 		assertNotNull(nullStringField);
 
@@ -106,11 +106,11 @@
 	}
 	
 	public void testForeignString() throws Exception {
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 
 		assertNotNull(thisJavaObject);		
 
-		JavaField foreignStringField = getJavaField(thisJavaObject, "foreignString");		
+		JVMField foreignStringField = getJavaField(thisJavaObject, "foreignString");		
 
 		assertNotNull(foreignStringField);
 
@@ -121,11 +121,11 @@
 	}
 	
 	public void testNullJavaObjectOnInstanceField() throws Exception {
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 		
 		assertNotNull(thisJavaObject);
 		
-		JavaField longStringField = getJavaField(thisJavaObject, "longString");
+		JVMField longStringField = getJavaField(thisJavaObject, "longString");
 		
 		assertNotNull(longStringField);
 		
@@ -138,11 +138,11 @@
 	}
 	
 	public void testStaticString() throws Exception {		
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 		
 		assertNotNull(thisJavaObject);
 		
-		JavaField staticStringField = getJavaField(thisJavaObject, "staticString");
+		JVMField staticStringField = getJavaField(thisJavaObject, "staticString");
 		
 		String staticStringValue = staticStringField.getString(null);
 		
@@ -150,11 +150,11 @@
 	}
 	
 	public void testNonString() throws Exception {
-		JavaObject thisJavaObject = getThis();
+		JVMObject thisJavaObject = getThis();
 		
 		assertNotNull(thisJavaObject);
 		
-		JavaField nonStringField = getJavaField(thisJavaObject, "nonString");
+		JVMField nonStringField = getJavaField(thisJavaObject, "nonString");
 		
 		try {
 			String nonStringValue = nonStringField.getString(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaHeap_getName.java Wed Oct 21 10:29:55 2009
@@ -16,8 +16,8 @@
 import java.util.Iterator;
 
 import javax.tools.diagnostics.image.CorruptData;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -32,7 +32,7 @@
 	{
 		boolean foundHeaps = false;
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 
 		Iterator heaps = runtime.getHeaps().iterator();
 
@@ -43,7 +43,7 @@
 				break;
 			}
 
-			JavaHeap aJavaHeap = (JavaHeap) nextHeap;
+			JVMHeap aJavaHeap = (JVMHeap) nextHeap;
 			assertTrue("One of the java heaps has a null name.", aJavaHeap.getName()!=null);
 		}
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaMethod_getName.java Wed Oct 21 10:29:55 2009
@@ -15,12 +15,12 @@
 
 import java.util.Iterator;
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 import org.apache.kato.tck.api.ICheckpoint;
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
@@ -35,8 +35,8 @@
 		return "Vodka";
 	}
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -50,14 +50,14 @@
 	 * @throws Exception
 	 */
 	public void testGetDeclaredMethods() throws Exception {
-		JavaClass thisClass = getThis().getJavaClass();
+		JVMClass thisClass = getThis().getJavaClass();
 		
 		assertNotNull("Unable to find this class", thisClass);
 		
 		Iterator methods = thisClass.getDeclaredMethods().iterator();
 		boolean found=false;
 		while(methods.hasNext()) {
-			JavaMethod method = (JavaMethod) methods.next();
+			JVMMethod method = (JVMMethod) methods.next();
 			
 			if (method.getName().equals(methodName)) {
 				found = true;
@@ -77,12 +77,12 @@
 	public void testGetStackMethods() throws Exception {
 		Iterator threads = getJavaRuntime().getThreads().iterator();
 		
-		JavaThread testThread = null;
+		JVMThread testThread = null;
 		while(threads.hasNext()) {
 			Object next = threads.next();
 			
-			if (next instanceof JavaThread) {
-				JavaThread thread = (JavaThread) next;
+			if (next instanceof JVMThread) {
+				JVMThread thread = (JVMThread) next;
 				if (thread.getName().equals(threadName)) {
 					testThread = thread;
 					break;
@@ -100,13 +100,13 @@
 		while(frames.hasNext()) {
 			Object next = frames.next();
 			
-			if(next instanceof JavaStackFrame) {
-				JavaStackFrame frame = (JavaStackFrame) next;
+			if(next instanceof JVMStackFrame) {
+				JVMStackFrame frame = (JVMStackFrame) next;
 				
-				JavaLocation location = frame.getLocation();
+				JVMLocation location = frame.getLocation();
 				
 				if (location != null) {
-					JavaMethod method = location.getMethod();
+					JVMMethod method = location.getMethod();
 					
 					if(method != null) {
 						if (methodName.equals(method.getName())) {